Backout changeset dc809c612dee due to permaorange in mochitest-other

content/canvas/src/nsCanvasRenderingContext2DAzure.cpp

@@ -605,10 +605,6 @@ protected:
     */
   PRPackedBool mPredictManyRedrawCalls;
 
-  // This is stored after GetThebesSurface has been called once to avoid
-  // excessive ThebesSurface initialization overhead.
-  nsRefPtr<gfxASurface> mThebesSurface;
-
   /**
     * We also have a device space pathbuilder. The reason for this is as
     * follows, when a path is being built, but the transform changes, we
@@ -4242,22 +4238,11 @@ nsCanvasRenderingContext2DAzure::GetThebesSurface(gfxASurface **surface)
     *surface = tmpSurf.forget().get();
     return NS_OK;
   }
+    
+  nsRefPtr<gfxASurface> newSurf =
+    gfxPlatform::GetPlatform()->GetThebesSurfaceForDrawTarget(mTarget);    
 
-  if (!mThebesSurface) {
-    mThebesSurface =
-      gfxPlatform::GetPlatform()->GetThebesSurfaceForDrawTarget(mTarget);    
-
-    if (!mThebesSurface) {
-      return NS_ERROR_FAILURE;
-    }
-  } else {
-    // Normally GetThebesSurfaceForDrawTarget will handle the flush, when
-    // we're returning a cached ThebesSurface we need to flush here.
-    mTarget->Flush();
-  }
-
-  mThebesSurface->AddRef();
-  *surface = mThebesSurface;
+  *surface = newSurf.forget().get();
 
   return NS_OK;
 }

gfx/thebes/gfxPlatform.h

@@ -181,11 +181,6 @@ public:
     virtual mozilla::RefPtr<mozilla::gfx::ScaledFont>
       GetScaledFontForFont(gfxFont *aFont);
 
-    /**
-     * This should return a 'live' surface for the drawtarget, not a snapshot,
-     * if the draw target changes (and those changes are flushed), they will
-     * affect the content of the surface and vice versa.
-     */
     virtual already_AddRefed<gfxASurface>
       GetThebesSurfaceForDrawTarget(mozilla::gfx::DrawTarget *aTarget);