Backed out changeset 7e2fc94f5be9 (bug 1409871)

gfx/layers/PaintThread.cpp

@@ -30,7 +30,7 @@ struct MOZ_STACK_CLASS AutoCapturedPaintSetup
 {
   AutoCapturedPaintSetup(CapturedPaintState* aState, CompositorBridgeChild* aBridge)
   : mState(aState)
-  , mTarget(aState->mTargetDual)
+  , mTarget(aState->mTarget)
   , mRestorePermitsSubpixelAA(mTarget->GetPermitSubpixelAA())
   , mOldTransform(mTarget->GetTransform())
   , mBridge(aBridge)
@@ -186,7 +186,7 @@ PaintThread::AsyncPaintContents(CompositorBridgeChild* aBridge,
   MOZ_ASSERT(IsOnPaintThread());
   MOZ_ASSERT(aState);
 
-  DrawTarget* target = aState->mTargetDual;
+  DrawTarget* target = aState->mTarget;
   DrawTargetCapture* capture = aState->mCapture;
 
   AutoCapturedPaintSetup setup(aState, aBridge);

gfx/layers/PaintThread.h

@@ -28,14 +28,12 @@ class CapturedPaintState {
   NS_INLINE_DECL_THREADSAFE_REFCOUNTING(CapturedPaintState)
 public:
   CapturedPaintState(nsIntRegion& aRegionToDraw,
-                     gfx::DrawTarget* aTargetDual,
                      gfx::DrawTarget* aTarget,
                      gfx::DrawTarget* aTargetOnWhite,
                      const gfx::Matrix& aTargetTransform,
                      SurfaceMode aSurfaceMode,
                      gfxContentType aContentType)
   : mRegionToDraw(aRegionToDraw)
-  , mTargetDual(aTargetDual)
   , mTarget(aTarget)
   , mTargetOnWhite(aTargetOnWhite)
   , mTargetTransform(aTargetTransform)
@@ -47,7 +45,6 @@ public:
   RefPtr<TextureClient> mTextureClient;
   RefPtr<TextureClient> mTextureClientOnWhite;
   RefPtr<gfx::DrawTargetCapture> mCapture;
-  RefPtr<gfx::DrawTarget> mTargetDual;
   RefPtr<gfx::DrawTarget> mTarget;
   RefPtr<gfx::DrawTarget> mTargetOnWhite;
   gfx::Matrix mTargetTransform;

gfx/layers/client/ClientPaintedLayer.cpp

@@ -224,7 +224,7 @@ ClientPaintedLayer::PaintOffMainThread()
   while (RefPtr<CapturedPaintState> captureState =
           mContentClient->BorrowDrawTargetForRecording(state, &iter))
   {
-    DrawTarget* target = captureState->mTargetDual;
+    DrawTarget* target = captureState->mTarget;
     if (!target || !target->IsValid()) {
       if (target) {
         mContentClient->ReturnDrawTargetToBuffer(target);

gfx/layers/client/ContentClient.cpp

@@ -253,7 +253,7 @@ ContentClient::BorrowDrawTargetForPainting(ContentClient::PaintState& aPaintStat
     return nullptr;
   }
 
-  return capturedState->mTargetDual;
+  return capturedState->mTarget;
 }
 
 RefPtr<CapturedPaintState>
@@ -282,7 +282,6 @@ ContentClient::BorrowDrawTargetForRecording(ContentClient::PaintState& aPaintSta
   RefPtr<CapturedPaintState> state =
     new CapturedPaintState(regionToDraw,
                            result,
-                           mBuffer->GetDTBuffer(),
                            mBuffer->GetDTBufferOnWhite(),
                            transform,
                            aPaintState.mMode,