Bug 1335895 - part 8: Update CompositorBridgeParent::LayerTreeState to have pointer to UiCompositorControllerParent r=dvander draft
authorRandall Barker <rbarker@mozilla.com>
Mon, 27 Mar 2017 10:42:25 -0700
changeset 558750 2535390f0d9216cd5686f6d8fa2325b659352b91
parent 558749 083faa6e25e739da0b891cd576bd8a312cef384f
child 558751 3576c7c58a13565be4823e94669460ae65e398ab
push id52941
push userbmo:rbarker@mozilla.com
push dateFri, 07 Apr 2017 23:43:33 +0000
reviewersdvander
bugs1335895
milestone55.0a1
Bug 1335895 - part 8: Update CompositorBridgeParent::LayerTreeState to have pointer to UiCompositorControllerParent r=dvander
gfx/layers/ipc/CompositorBridgeParent.h
--- a/gfx/layers/ipc/CompositorBridgeParent.h
+++ b/gfx/layers/ipc/CompositorBridgeParent.h
@@ -35,16 +35,19 @@
 #include "mozilla/layers/LayersMessages.h"  // for TargetConfig
 #include "mozilla/layers/MetricsSharingController.h"
 #include "mozilla/layers/PCompositorBridgeParent.h"
 #include "mozilla/layers/APZTestData.h"
 #include "mozilla/webrender/WebRenderTypes.h"
 #include "mozilla/widget/CompositorWidget.h"
 #include "nsISupportsImpl.h"
 #include "ThreadSafeRefcountingWithMainThreadDestruction.h"
+#if defined(MOZ_WIDGET_ANDROID)
+#include "mozilla/layers/UiCompositorControllerParent.h"
+#endif // defined(MOZ_WIDGET_ANDROID)
 
 class MessageLoop;
 class nsIWidget;
 
 namespace mozilla {
 
 class CancelableRunnable;
 
@@ -373,16 +376,19 @@ public:
     // this is needed in case a device reset occurs in between allocating a
     // RefLayer id on the parent, and allocating a PLayerTransaction on the
     // child.
     Maybe<uint64_t> mPendingCompositorUpdate;
 
     CompositorController* GetCompositorController() const;
     MetricsSharingController* CrossProcessSharingController() const;
     MetricsSharingController* InProcessSharingController() const;
+#if defined(MOZ_WIDGET_ANDROID)
+    RefPtr<UiCompositorControllerParent> mUiControllerParent;
+#endif // defined(MOZ_WIDGET_ANDROID)
   };
 
   /**
    * Lookup the indirect shadow tree for |aId| and return it if it
    * exists.  Otherwise null is returned.  This must only be called on
    * the compositor thread.
    */
   static LayerTreeState* GetIndirectShadowTree(uint64_t aId);
@@ -620,14 +626,26 @@ protected:
   // being defered due to a scroll operation.
   bool mDeferPluginWindows;
   // indicates if the plugin windows were hidden, and need to be made
   // visible again even if their geometry has not changed.
   bool mPluginWindowsHidden;
 #endif
 
   DISALLOW_EVIL_CONSTRUCTORS(CompositorBridgeParent);
+#if defined(MOZ_WIDGET_ANDROID)
+public:
+  gfx::IntSize GetEGLSurfaceSize()
+  {
+    return mEGLSurfaceSize;
+  }
+
+  uint64_t GetRootLayerTreeId()
+  {
+    return mRootLayerTreeID;
+  }
+#endif // defined(MOZ_WIDGET_ANDROID)
 };
 
 } // namespace layers
 } // namespace mozilla
 
 #endif // mozilla_layers_CompositorBridgeParent_h