From 2bffd8531c9f001bf753fd9173d2ed58d6a43e9f Mon Sep 17 00:00:00 2001
From: Chris Jones <jones.chris.g@gmail.com>
Date: Wed, 6 Jul 2011 13:29:27 -0400
Subject: [PATCH] Bug 648484, part E: Hook d3d9 shadow layers up to new system.
 r=BenWa

---
 gfx/layers/d3d9/LayerManagerD3D9.h | 3 +++
 layout/ipc/RenderFrameParent.cpp   | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/gfx/layers/d3d9/LayerManagerD3D9.h b/gfx/layers/d3d9/LayerManagerD3D9.h
index a4b8c4b4c4ef..3d8cf1df3f6c 100644
--- a/gfx/layers/d3d9/LayerManagerD3D9.h
+++ b/gfx/layers/d3d9/LayerManagerD3D9.h
@@ -121,6 +121,9 @@ public:
    */
   virtual void Destroy();
 
+  virtual ShadowLayerManager* AsShadowManager()
+  { return this; }
+
   virtual void BeginTransaction();
 
   virtual void BeginTransactionWithTarget(gfxContext* aTarget);
diff --git a/layout/ipc/RenderFrameParent.cpp b/layout/ipc/RenderFrameParent.cpp
index 9ce7b5dad1d3..e06dfb70e982 100644
--- a/layout/ipc/RenderFrameParent.cpp
+++ b/layout/ipc/RenderFrameParent.cpp
@@ -731,7 +731,7 @@ RenderFrameParent::AllocPLayers(LayerManager::LayersBackend* aBackendType)
   LayerManager* lm = GetLayerManager();
   ShadowLayerManager* slm = lm->AsShadowManager();
   if (!slm) {
-     NS_WARNING("shadow layers no sprechen D3D backend yet");
+    *aBackendType = LayerManager::LAYERS_NONE;
      return nsnull;
   }
   *aBackendType = lm->GetBackendType();