Bug 1335895 - part 9: Update CompositorBridgeParent::LayerTreeState to have pointer to UiCompositorControllerParent r=dvander
MozReview-Commit-ID: HoKywN2ydPg
--- a/gfx/layers/ipc/CompositorBridgeParent.h
+++ b/gfx/layers/ipc/CompositorBridgeParent.h
@@ -35,16 +35,17 @@
#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"
+#include "mozilla/layers/UiCompositorControllerParent.h"
class MessageLoop;
class nsIWidget;
namespace mozilla {
class CancelableRunnable;
@@ -379,16 +380,17 @@ 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;
+ RefPtr<UiCompositorControllerParent> mUiControllerParent;
};
/**
* 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);
@@ -461,16 +463,27 @@ public:
PWebRenderBridgeParent* AllocPWebRenderBridgeParent(const wr::PipelineId& aPipelineId,
const LayoutDeviceIntSize& aSize,
TextureFactoryIdentifier* aTextureFactoryIdentifier,
uint32_t* aIdNamespace) override;
bool DeallocPWebRenderBridgeParent(PWebRenderBridgeParent* aActor) override;
static void SetWebRenderProfilerEnabled(bool aEnabled);
static CompositorBridgeParent* GetCompositorBridgeParentFromLayersId(const uint64_t& aLayersId);
+
+#if defined(MOZ_WIDGET_ANDROID)
+ gfx::IntSize GetEGLSurfaceSize() {
+ return mEGLSurfaceSize;
+ }
+
+ uint64_t GetRootLayerTreeId() {
+ return mRootLayerTreeID;
+ }
+#endif // defined(MOZ_WIDGET_ANDROID)
+
private:
void Initialize();
/**
* Called during destruction in order to release resources as early as possible.
*/
void StopAndClearResources();