Bug 546514: Address D3D10 Layers backend review comments. r=jrmuizel

gfx/layers/d3d10/ColorLayerD3D10.h

@@ -51,7 +51,7 @@ public:
   ColorLayerD3D10(LayerManagerD3D10 *aManager);
 
   /* LayerD3D10 implementation */
-  Layer* GetLayer();
+  virtual Layer* GetLayer();
   virtual void RenderLayer(float aOpacity, const gfx3DMatrix &aTransform);
 };
 

gfx/layers/d3d10/ContainerLayerD3D10.h

@@ -59,12 +59,12 @@ public:
   virtual void RemoveChild(Layer* aChild);
 
   /* LayerD3D10 implementation */
-  Layer* GetLayer();
+  virtual Layer* GetLayer();
 
-  LayerD3D10* GetFirstChildD3D10();
+  virtual LayerD3D10* GetFirstChildD3D10();
 
-  void RenderLayer(float aOpacity, const gfx3DMatrix &aTransform);
-  void Validate();
+  virtual void RenderLayer(float aOpacity, const gfx3DMatrix &aTransform);
+  virtual void Validate();
 
   virtual void LayerManagerDestroyed();
 

gfx/layers/d3d10/LayerManagerD3D10.cpp

@@ -492,8 +492,10 @@ LayerManagerD3D10::PaintToTarget()
                         gfxASurface::ImageFormatARGB32);
 
   mTarget->SetSource(tmpSurface);
-  mTarget->SetOperator(gfxContext::OPERATOR_SOURCE);
+  mTarget->SetOperator(gfxContext::OPERATOR_OVER);
   mTarget->Paint();
+
+  readTexture->Unmap(0);
 }
 
 LayerD3D10::LayerD3D10(LayerManagerD3D10 *aManager)

gfx/layers/d3d10/ThebesLayerD3D10.h

@@ -58,7 +58,7 @@ public:
   void InvalidateRegion(const nsIntRegion& aRegion);
 
   /* LayerD3D10 implementation */
-  Layer* GetLayer();
+  virtual Layer* GetLayer();
   virtual void RenderLayer(float aOpacity, const gfx3DMatrix &aTransform);
   virtual void Validate();
   virtual void LayerManagerDestroyed();

gfx/layers/d3d10/genshaders.sh

@@ -0,0 +1 @@
+fxc LayerManagerD3D10.fx -nologo -FhLayerManagerD3D10Effect.h -Tfx_4_0