Bug 745148, part 5: Pass the layer tree to ShadowLayersUpdate(). r=ajuma

Brli · Jul 17, 2012 · 49ee683 · 49ee683
1 parent f15a893
commit 49ee683
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 19 deletions.
diff --git a/gfx/layers/ipc/CompositorParent.cpp b/gfx/layers/ipc/CompositorParent.cpp
@@ -525,16 +525,14 @@ CompositorParent::SyncViewportInfo(const nsIntRect& aDisplayPort,
 }
 
 void
-CompositorParent::ShadowLayersUpdated(bool isFirstPaint)
+CompositorParent::ShadowLayersUpdated(ShadowLayersParent* aLayerTree,
+                                      bool isFirstPaint)
 {
   mIsFirstPaint = mIsFirstPaint || isFirstPaint;
   mLayersUpdated = true;
-  const nsTArray<PLayersParent*>& shadowParents = ManagedPLayersParent();
-  NS_ABORT_IF_FALSE(shadowParents.Length() <= 1,
-                    "can only support at most 1 ShadowLayersParent");
-  if (shadowParents.Length()) {
-    Layer* root = static_cast<ShadowLayersParent*>(shadowParents[0])->GetRoot();
-    mLayerManager->SetRoot(root);
+  Layer* root = aLayerTree->GetRoot();
+  mLayerManager->SetRoot(root);
+  if (root) {
     SetShadowProperties(root);
   }
   ScheduleComposition();

diff --git a/gfx/layers/ipc/CompositorParent.h b/gfx/layers/ipc/CompositorParent.h
@@ -68,7 +68,8 @@ class CompositorParent : public PCompositorParent,
   virtual bool RecvPause() MOZ_OVERRIDE;
   virtual bool RecvResume() MOZ_OVERRIDE;
 
-  virtual void ShadowLayersUpdated(bool isFirstPaint) MOZ_OVERRIDE;
+  virtual void ShadowLayersUpdated(ShadowLayersParent* aLayerTree,
+                                   bool isFirstPaint) MOZ_OVERRIDE;
   void Destroy();
 
   LayerManager* GetLayerManager() { return mLayerManager; }

diff --git a/gfx/layers/ipc/ShadowLayersManager.h b/gfx/layers/ipc/ShadowLayersManager.h
@@ -8,20 +8,16 @@
 #define mozilla_layers_ShadowLayersManager_h
 
 namespace mozilla {
-
-namespace layout {
-class RenderFrameParent;
-}
-
 namespace layers {
 
-class CompositorParent;
+class ShadowLayersParent;
 
 class ShadowLayersManager
 {
-
 public:
-  virtual void ShadowLayersUpdated(bool isFirstPaint) = 0;
+    virtual void ShadowLayersUpdated(ShadowLayersParent* aLayerTree,
+                                     // FIXME nuke this
+                                     bool isFirstPaint) = 0;
 };
 
 } // layers

diff --git a/gfx/layers/ipc/ShadowLayersParent.cpp b/gfx/layers/ipc/ShadowLayersParent.cpp
@@ -397,7 +397,7 @@ ShadowLayersParent::RecvUpdate(const InfallibleTArray<Edit>& cset,
   // other's buffer contents.
   ShadowLayerManager::PlatformSyncBeforeReplyUpdate();
 
-  mShadowLayersManager->ShadowLayersUpdated(isFirstPaint);
+  mShadowLayersManager->ShadowLayersUpdated(this, isFirstPaint);
 
 #ifdef COMPOSITOR_PERFORMANCE_WARNING
   int compositeTime = (int)(mozilla::TimeStamp::Now() - updateStart).ToMilliseconds();

diff --git a/layout/ipc/RenderFrameParent.cpp b/layout/ipc/RenderFrameParent.cpp
@@ -489,7 +489,8 @@ RenderFrameParent::ContentViewScaleChanged(nsContentView* aView)
 }
 
 void
-RenderFrameParent::ShadowLayersUpdated(bool isFirstPaint)
+RenderFrameParent::ShadowLayersUpdated(ShadowLayersParent* aLayerTree,
+                                       bool isFirstPaint)
 {
   mFrameLoader->SetCurrentRemoteFrame(this);
 

diff --git a/layout/ipc/RenderFrameParent.h b/layout/ipc/RenderFrameParent.h
@@ -53,7 +53,8 @@ class RenderFrameParent : public PRenderFrameParent,
 
   void ContentViewScaleChanged(nsContentView* aView);
 
-  virtual void ShadowLayersUpdated(bool isFirstPaint) MOZ_OVERRIDE;
+  virtual void ShadowLayersUpdated(ShadowLayersParent* aLayerTree,
+                                   bool isFirstPaint) MOZ_OVERRIDE;
 
   NS_IMETHOD BuildDisplayList(nsDisplayListBuilder* aBuilder,
                               nsSubDocumentFrame* aFrame,