Bug 1449641 - Remove extraneous "if (mRenderTarget->mDrawTarget != mDrawTarget)". r=sotaro
authorMarkus Stange <mstange@themasta.com>
Wed, 28 Mar 2018 13:13:03 -0400
changeset 779687 ac980a443965c8ab42fbe370f2300b8f09c43c8e
parent 779686 cfc4cc67701f0cb1e371cfa5bea33e9f9c24a288
child 779688 67fabb2e4990654fbd0eede355bc09ae6f911bb9
push id105836
push userbmo:ato@sny.no
push dateTue, 10 Apr 2018 12:07:22 +0000
reviewerssotaro
bugs1449641
milestone61.0a1
Bug 1449641 - Remove extraneous "if (mRenderTarget->mDrawTarget != mDrawTarget)". r=sotaro The same condition is checked just before this if, so it's always true. MozReview-Commit-ID: 9Vscnkz7AoY
gfx/layers/basic/BasicCompositor.cpp
--- a/gfx/layers/basic/BasicCompositor.cpp
+++ b/gfx/layers/basic/BasicCompositor.cpp
@@ -1033,22 +1033,17 @@ BasicCompositor::TryToEndRemoteDrawing(b
                              [self]() { self->TryToEndRemoteDrawing(); });
     MessageLoop::current()->PostDelayedTask(runnable.forget(), retryMs);
     return;
   }
 
   if (mRenderTarget->mDrawTarget != mDrawTarget) {
     // Note: Most platforms require us to buffer drawing to the widget surface.
     // That's why we don't draw to mDrawTarget directly.
-    RefPtr<SourceSurface> source;
-    if (mRenderTarget->mDrawTarget != mDrawTarget) {
-      source = mWidget->EndBackBufferDrawing();
-    } else {
-      source = mRenderTarget->mDrawTarget->Snapshot();
-    }
+    RefPtr<SourceSurface> source = mWidget->EndBackBufferDrawing();
     RefPtr<DrawTarget> dest(mTarget ? mTarget : mDrawTarget);
 
     nsIntPoint offset = mTarget ? mTargetBounds.TopLeft() : nsIntPoint();
 
     // The source DrawTarget is clipped to the invalidation region, so we have
     // to copy the individual rectangles in the region or else we'll draw blank
     // pixels.
     for (auto iter = mInvalidRegion.RectIter(); !iter.Done(); iter.Next()) {