Bug 990752 - Make ImageLayerD3D9/ImageLayerD3D10::Render() use mSourceSurface instead of mDeprecatedSurface (Moz2D migration). r=mattwoodrow

gfx/layers/d3d10/ImageLayerD3D10.cpp

@@ -219,8 +219,8 @@ ImageLayerD3D10::RenderLayer()
       image->GetFormat() == ImageFormat::REMOTE_IMAGE_DXGI_TEXTURE ||
       image->GetFormat() == ImageFormat::D3D9_RGB32_TEXTURE) {
     NS_ASSERTION(image->GetFormat() != ImageFormat::CAIRO_SURFACE ||
-                 !static_cast<CairoImage*>(image)->mDeprecatedSurface ||
-                 static_cast<CairoImage*>(image)->mDeprecatedSurface->GetContentType() != gfxContentType::ALPHA,
+                 !static_cast<CairoImage*>(image)->mSourceSurface ||
+                 static_cast<CairoImage*>(image)->mSourceSurface->GetFormat() != SurfaceFormat::A8,
                  "Image layer has alpha image");
     bool hasAlpha = false;
 

gfx/layers/d3d9/ImageLayerD3D9.cpp

@@ -415,8 +415,8 @@ ImageLayerD3D9::RenderLayer()
       image->GetFormat() == ImageFormat::D3D9_RGB32_TEXTURE)
   {
     NS_ASSERTION(image->GetFormat() != ImageFormat::CAIRO_SURFACE ||
-                 !static_cast<CairoImage*>(image)->mDeprecatedSurface ||
-                 static_cast<CairoImage*>(image)->mDeprecatedSurface->GetContentType() != gfxContentType::ALPHA,
+                 !static_cast<CairoImage*>(image)->mSourceSurface ||
+                 static_cast<CairoImage*>(image)->mSourceSurface->GetFormat() != SurfaceFormat::A8,
                  "Image layer has alpha image");
 
     bool hasAlpha = false;