--- a/image/src/ClippedImage.cpp
+++ b/image/src/ClippedImage.cpp
@@ -230,30 +230,39 @@ ClippedImage::GetFrameInternal(const nsI
 
   float frameToDraw = InnerImage()->GetFrameIndex(aWhichFrame);
   if (!mCachedSurface || !mCachedSurface->Matches(aViewportSize,
                                                   aSVGContext,
                                                   frameToDraw,
                                                   aFlags)) {
     // Create a surface to draw into.
     mozilla::RefPtr<mozilla::gfx::DrawTarget> target;
-    target = gfxPlatform::GetPlatform()->
-      CreateOffscreenCanvasDrawTarget(gfx::IntSize(mClip.width, mClip.height),
-                                      gfx::FORMAT_B8G8R8A8);
-    nsRefPtr<gfxASurface> surface = gfxPlatform::GetPlatform()->
-      GetThebesSurfaceForDrawTarget(target);
+    nsRefPtr<gfxContext> ctx;
+
+    if (gfxPlatform::GetPlatform()->SupportsAzureContent()) {
+      target = gfxPlatform::GetPlatform()->
+        CreateOffscreenContentDrawTarget(gfx::IntSize(mClip.width, mClip.height),
+                                        gfx::FORMAT_B8G8R8A8);
+      ctx = new gfxContext(target);
+    } else {
+      target = gfxPlatform::GetPlatform()->
+        CreateOffscreenCanvasDrawTarget(gfx::IntSize(mClip.width, mClip.height),
+                                        gfx::FORMAT_B8G8R8A8);
+      nsRefPtr<gfxASurface> surface = gfxPlatform::GetPlatform()->
+        GetThebesSurfaceForDrawTarget(target);
+      ctx = new gfxContext(surface);
+    }
 
     // Create our callback.
     nsRefPtr<gfxDrawingCallback> drawTileCallback =
       new DrawSingleTileCallback(this, mClip, aViewportSize, aSVGContext, aWhichFrame, aFlags);
     nsRefPtr<gfxDrawable> drawable =
       new gfxCallbackDrawable(drawTileCallback, mClip.Size());
 
     // Actually draw. The callback will end up invoking DrawSingleTile.
-    nsRefPtr<gfxContext> ctx = new gfxContext(surface);
     gfxRect imageRect(0, 0, mClip.width, mClip.height);
     gfxUtils::DrawPixelSnapped(ctx, drawable, gfxMatrix(),
                                imageRect, imageRect, imageRect, imageRect,
                                gfxImageFormatARGB32,
                                GraphicsFilter::FILTER_FAST);
 
     // Cache the resulting surface.
     mCachedSurface = new ClippedImageCachedSurface(target,