Backed out changeset 9394e6901453 (bug 958008) for causing bug 960224.

gfx/thebes/gfxAndroidPlatform.cpp

@@ -148,19 +148,6 @@ gfxAndroidPlatform::CreateOffscreenSurface(const IntSize& size,
     return newSurface.forget();
 }
 
-already_AddRefed<gfxASurface>
-gfxAndroidPlatform::OptimizeImage(gfxImageSurface *aSurface,
-                                  gfxImageFormat format)
-{
-    /* Android/Gonk have no special offscreen surfaces so we can avoid a copy */
-    if (OptimalFormatForContent(gfxASurface::ContentFromFormat(format)) ==
-        format) {
-        return nullptr;
-    }
-
-    return gfxPlatform::OptimizeImage(aSurface, format);
-}
-
 static bool
 IsJapaneseLocale()
 {

gfx/thebes/gfxAndroidPlatform.h

@@ -35,9 +35,6 @@ public:
     virtual already_AddRefed<gfxASurface>
     CreateOffscreenSurface(const IntSize& size,
                            gfxContentType contentType);
-    virtual already_AddRefed<gfxASurface>
-    OptimizeImage(gfxImageSurface *aSurface,
-                  gfxImageFormat format) MOZ_OVERRIDE;
     
     virtual gfxImageFormat GetOffscreenFormat() { return mOffscreenFormat; }