Bug 620665 - Part 2: Use fallback when ImageContainer's backend type doesn't match. r=roc a=blocking-beta9

gfx/layers/d3d10/ImageLayerD3D10.cpp

@@ -212,13 +212,16 @@ ImageLayerD3D10::RenderLayer()
   }
 
   if (GetContainer()->Manager() != Manager() ||
+      GetContainer()->GetBackendType() != LayerManager::LAYERS_D3D10 ||
       image->GetFormat() == Image::CAIRO_SURFACE)
   {
     gfxIntSize size;
     bool hasAlpha;
     nsRefPtr<ID3D10ShaderResourceView> srView;
 
-    if (GetContainer()->Manager() != Manager()) {
+    if (GetContainer()->Manager() != Manager() ||
+        GetContainer()->GetBackendType() != LayerManager::LAYERS_D3D10)
+    {
       nsRefPtr<gfxASurface> surf = GetContainer()->GetCurrentAsSurface(&size);
       
       nsRefPtr<ID3D10Texture2D> texture = SurfaceToTexture(device(), surf, size);

gfx/layers/d3d9/ImageLayerD3D9.cpp

@@ -246,7 +246,9 @@ ImageLayerD3D9::RenderLayer()
   
   SetShaderTransformAndOpacity();
 
-  if (Manager() != GetContainer()->Manager()) {
+  if (Manager() != GetContainer()->Manager() ||
+      GetContainer()->GetBackendType() != LayerManager::LAYERS_D3D9)
+  {
     gfxIntSize size;
     nsRefPtr<gfxASurface> surface =
       GetContainer()->GetCurrentAsSurface(&size);