Bug 1335895 - part 8: Update CompositorBridgeParent::LayerTreeState to have pointer to UiCompositorControllerParent r=dvander
--- 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