Backed out changeset b346ea98c29a (bug 1329796) for reftest failures.

dom/canvas/CanvasRenderingContext2D.cpp

@@ -566,9 +566,7 @@ public:
   explicit AdjustedTarget(CanvasRenderingContext2D* aCtx,
                           const gfx::Rect *aBounds = nullptr)
   {
-    // There are operations that can invalidate aCtx->mTarget along the way,
-    // so don't cache the pointer to it too soon.
-    mTarget = nullptr;
+    mTarget = aCtx->mTarget;
 
     // All rects in this function are in the device space of ctx->mTarget.
 
@@ -597,7 +595,7 @@ public:
     // are used.
     if (aCtx->NeedToDrawShadow()) {
       mShadowTarget = MakeUnique<AdjustedTargetForShadow>(
-        aCtx, aCtx->mTarget, boundsAfterFilter, op);
+        aCtx, mTarget, boundsAfterFilter, op);
       mTarget = mShadowTarget->DT();
       offsetToFinalDT = mShadowTarget->OffsetToFinalDT();
 
@@ -612,19 +610,13 @@ public:
 
       gfx::IntRect intBounds;
       if (!bounds.ToIntRect(&intBounds)) {
-        if (!mTarget) {
-          mTarget = static_cast<DrawTarget *>(aCtx->mTarget);
-        }
         return;
       }
       mFilterTarget = MakeUnique<AdjustedTargetForFilter>(
-        aCtx, aCtx->mTarget, offsetToFinalDT, intBounds,
+        aCtx, mTarget, offsetToFinalDT, intBounds,
         gfx::RoundedToInt(boundsAfterFilter), op);
       mTarget = mFilterTarget->DT();
     }
-    if (!mTarget) {
-      mTarget = static_cast<DrawTarget *>(aCtx->mTarget);
-    }
   }
 
   ~AdjustedTarget()