1576499 - More Compositor cleanup

Status: RESOLVED FIXED

(Core :: Graphics: Layers, task)

Comment 1

[Markus Stange [:mstange]]

Attachment: Bug 1576499 - Improve various rect things in BeginFrame implementations, no functional changes. r=mattwoodrow

Comment 2

[Markus Stange [:mstange]]

Attachment: Bug 1576499 - Change where aClipRectOut is set, in two BeginFrame implementations. r=mattwoodrow

There are three circumstances that make these transformations equivalent:

• aClipRectIn and aClipRectOut are never both non-null.
• The value of *aClipRectOut is ignored if *aRenderBoundsOut is empty.
• aRenderBounds.TopLeft() is always (0, 0) because the ClientLayerManager
  calls targetBounds.MoveTo(0, 0) on the rect that eventually becomes
  aRenderBounds.
  (targetBounds -> Transaction::mTargetBounds -> TargetConfig::naturalBounds()
  -> LayerManagerComposite::mRenderBounds)

Depends on D43367

Comment 3

[Markus Stange [:mstange]]

Attachment: Bug 1576499 - Remove aClipRectOut parameter from Compositor::BeginFrame(). r=mattwoodrow

Whenever *aRenderBoundsOut was non-empty and aClipRectOut was non-null,
*aClipRectOut was set to the same value as *aRenderBoundsOut.

Depends on D43368

Comment 4

[Markus Stange [:mstange]]

Attachment: Bug 1576499 - Eliminate bounds variable from LayerManagerComposite::Render. r=mattwoodrow

Depends on D43369

Comment 5

[Markus Stange [:mstange]]

Attachment: Bug 1576499 - Make clipRect an untyped IntRect. r=mattwoodrow

Depends on D43370

Comment 6

[Markus Stange [:mstange]]

Attachment: Bug 1576499 - Combine the two calls to BeginFrame. r=mattwoodrow

Depends on D43371

Comment 7

[Markus Stange [:mstange]]

Attachment: Bug 1576499 - Turn aClipRectIn into a Maybe and rename it to aClipRect, now that aClipRectOut is gone. r=mattwoodrow

Depends on D43372

Comment 8

[Markus Stange [:mstange]]

Attachment: Bug 1576499 - Another random rect simplification. r=mattwoodrow

Depends on D43373

Comment 9

[Markus Stange [:mstange]]

Attachment: Bug 1576499 - Rename actualBounds to bounds. r=mattwoodrow

Depends on D43374

Comment 10

[Markus Stange [:mstange]]

Attachment: Bug 1576499 - Turn aRenderBoundsOut outparam into a Maybe<> return value. r=mattwoodrow

Depends on D43375

Comment 11

[Markus Stange [:mstange]]

Attachment: Bug 1576499 - Move all mFullWindowRenderTarget maintenance to NormalDrawingDone(). r=mattwoodrow

It turns out there's not much benefit to creating the DrawTarget at the beginning of the frame.
It's only needed between NormalDrawingDone() and EndFrame().

Depends on D43376

Comment 12

[Markus Stange [:mstange]]

Attachment: Bug 1576499 - Don't call TryToEndRemoteDrawing() in EndFrame when rendering to a copy target. r=mattwoodrow

None of the three main if branches in TryToEndRemoteDrawing were entered in that case:

• if (!aForceToEnd && !mTarget && NeedsToDeferEndRemoteDrawing()) wasn't entered because
  mTarget was non-null.
• if (mRenderTarget->mDrawTarget != mDrawTarget) wasn't entered because mTarget
  drawing doesn't use a back buffer.
• if (aForceToEnd || !mTarget) wasn't entered because aForceToEnd was false and
  mTarget was non-null.

Depends on D43377

Comment 13

[Markus Stange [:mstange]]

Attachment: Bug 1576499 - Split off EndRemoteDrawing from TryToEndRemoteDrawing and call it directly instead of calling TryToEndRemoteDrawing(true). r=mattwoodrow

This eliminates a boolean parameter whose meaning is not immediately obvious at the call site.

Depends on D43378

Comment 14

[Markus Stange [:mstange]]

Attachment: Bug 1576499 - Move back buffer creation out of CreateRenderTargetForWindow into BeginFrame. r=mattwoodrow

This makes it clear that only one of the possible call paths of
CreateRenderTargetForWindow can use a back buffer.
It causes some unfortunate duplication of the clear region computation.

Depends on D43379

Comment 15

[Markus Stange [:mstange]]

Attachment: Bug 1576499 - Use mRenderTarget->mDrawTarget to create similar draw targets in CreateDrawTarget. r=mattwoodrow

This removes one user of mDrawTarget.

This change only makes a difference when we have a backbuffer; now we will create
DrawTargets that are similar to the back buffer instead of the front buffer.

Depends on D43380

Comment 16

[Markus Stange [:mstange]]

Attachment: Bug 1576499 - Eliminate mDrawTarget and mDrawTargetBounds. Add mFrontBuffer which is only used when drawing to a back buffer. r=mattwoodrow

Depends on D43381

Comment 17

[Markus Stange [:mstange]]

Attachment: Bug 1576499 - Two random cleanups. r=mattwoodrow

Depends on D43382

Comment 18

[Markus Stange [:mstange]]

Attachment: Bug 1576499 - Clarify dest and buffer a little. r=mattwoodrow

The old code was making an autoRestoreTransform around dest and then quickly
overwriting dest with something new. I prefer creating the autoRestoreTransform
for buffer, which doesn't change over the course of this function.

Depends on D43383

Comment 19

[Markus Stange [:mstange]]

https://treeherder.mozilla.org/#/jobs?repo=try&revision=67613b82cda4d38902b41134c681ea59910b3ad9
https://treeherder.mozilla.org/#/jobs?repo=try&revision=4967e275c69fc7c8c1ff5c3fa43618b5e8b5bf58

Comment 20

[Markus Stange [:mstange]]

Attachment: Bug 1576499 - Remove BasicCompositor::mInvalidRect. r=mattwoodrow

It was only used in BeginFrame.

Depends on D43384

Comment 21

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/d07fa3716e8e
Improve various rect things in BeginFrame implementations, no functional changes. r=mattwoodrow
https://hg.mozilla.org/integration/autoland/rev/9978f0fc0cd4
Change where aClipRectOut is set, in two BeginFrame implementations. r=mattwoodrow
https://hg.mozilla.org/integration/autoland/rev/31c30f46d367
Remove aClipRectOut parameter from Compositor::BeginFrame(). r=mattwoodrow
https://hg.mozilla.org/integration/autoland/rev/32817ced1d52
Eliminate bounds variable from LayerManagerComposite::Render. r=mattwoodrow
https://hg.mozilla.org/integration/autoland/rev/f2ff20d5af92
Make clipRect an untyped IntRect. r=mattwoodrow
https://hg.mozilla.org/integration/autoland/rev/11dda086945d
Combine the two calls to BeginFrame. r=mattwoodrow
https://hg.mozilla.org/integration/autoland/rev/f55c80b421a9
Turn aClipRectIn into a Maybe and rename it to aClipRect, now that aClipRectOut is gone. r=mattwoodrow
https://hg.mozilla.org/integration/autoland/rev/03bdb2c6d8ce
Another random rect simplification. r=mattwoodrow
https://hg.mozilla.org/integration/autoland/rev/a659e96ceed9
Rename actualBounds to bounds. r=mattwoodrow
https://hg.mozilla.org/integration/autoland/rev/433509fe5892
Turn aRenderBoundsOut outparam into a Maybe<> return value. r=mattwoodrow
https://hg.mozilla.org/integration/autoland/rev/4c9cb18479d2
Move all mFullWindowRenderTarget maintenance to NormalDrawingDone(). r=mattwoodrow
https://hg.mozilla.org/integration/autoland/rev/18ee06f7326a
Don't call TryToEndRemoteDrawing() in EndFrame when rendering to a copy target. r=mattwoodrow
https://hg.mozilla.org/integration/autoland/rev/4c4cf1a9bd7a
Split off EndRemoteDrawing from TryToEndRemoteDrawing and call it directly instead of calling TryToEndRemoteDrawing(true). r=mattwoodrow
https://hg.mozilla.org/integration/autoland/rev/8db81887ada8
Move back buffer creation out of CreateRenderTargetForWindow into BeginFrame. r=mattwoodrow
https://hg.mozilla.org/integration/autoland/rev/4bba5287a59d
Use mRenderTarget->mDrawTarget to create similar draw targets in CreateDrawTarget. r=mattwoodrow
https://hg.mozilla.org/integration/autoland/rev/5857954dc2a1
Eliminate mDrawTarget and mDrawTargetBounds. Add mFrontBuffer which is only used when drawing to a back buffer. r=mattwoodrow
https://hg.mozilla.org/integration/autoland/rev/0c2e876254cb
Two random cleanups. r=mattwoodrow
https://hg.mozilla.org/integration/autoland/rev/b80e328a4f86
Clarify dest and buffer a little. r=mattwoodrow
https://hg.mozilla.org/integration/autoland/rev/f3f1c60d1991
Remove BasicCompositor::mInvalidRect. r=mattwoodrow

Comment 22

[Razvan Maries]

https://hg.mozilla.org/mozilla-central/rev/d07fa3716e8e
https://hg.mozilla.org/mozilla-central/rev/9978f0fc0cd4
https://hg.mozilla.org/mozilla-central/rev/31c30f46d367
https://hg.mozilla.org/mozilla-central/rev/32817ced1d52
https://hg.mozilla.org/mozilla-central/rev/f2ff20d5af92
https://hg.mozilla.org/mozilla-central/rev/11dda086945d
https://hg.mozilla.org/mozilla-central/rev/f55c80b421a9
https://hg.mozilla.org/mozilla-central/rev/03bdb2c6d8ce
https://hg.mozilla.org/mozilla-central/rev/a659e96ceed9
https://hg.mozilla.org/mozilla-central/rev/433509fe5892
https://hg.mozilla.org/mozilla-central/rev/4c9cb18479d2
https://hg.mozilla.org/mozilla-central/rev/18ee06f7326a
https://hg.mozilla.org/mozilla-central/rev/4c4cf1a9bd7a
https://hg.mozilla.org/mozilla-central/rev/8db81887ada8
https://hg.mozilla.org/mozilla-central/rev/4bba5287a59d
https://hg.mozilla.org/mozilla-central/rev/5857954dc2a1
https://hg.mozilla.org/mozilla-central/rev/0c2e876254cb
https://hg.mozilla.org/mozilla-central/rev/b80e328a4f86
https://hg.mozilla.org/mozilla-central/rev/f3f1c60d1991