Bug 1443301 - Stop exposing mApzcTreeManager from CompositorBridgeParent. r?botond
MozReview-Commit-ID: 5Dq0HzLImTz
--- a/gfx/layers/composite/AsyncCompositionManager.cpp
+++ b/gfx/layers/composite/AsyncCompositionManager.cpp
@@ -34,17 +34,16 @@
#include "nsRect.h" // for mozilla::gfx::IntRect
#include "nsRegion.h" // for nsIntRegion
#include "nsTArray.h" // for nsTArray, nsTArray_Impl, etc
#include "nsTArrayForwardDeclare.h" // for InfallibleTArray
#include "UnitTransforms.h" // for TransformTo
#include "gfxPrefs.h"
#if defined(MOZ_WIDGET_ANDROID)
# include <android/log.h>
-# include "apz/src/APZCTreeManager.h"
# include "mozilla/layers/UiCompositorControllerParent.h"
# include "mozilla/widget/AndroidCompositorWidget.h"
#endif
#include "GeckoProfiler.h"
#include "FrameUniformityData.h"
#include "TreeTraversal.h" // for ForEachNode, BreadthFirstSearch
#include "VsyncSource.h"
@@ -935,17 +934,17 @@ AsyncCompositionManager::ApplyAsyncConte
if (!(*aOutFoundRoot)) {
*aOutFoundRoot = metrics.IsRootContent() || /* RCD */
(layer->GetParent() == nullptr && /* rootmost metrics */
i + 1 >= layer->GetScrollMetadataCount());
if (*aOutFoundRoot) {
mRootScrollableId = metrics.GetScrollId();
Compositor* compositor = mLayerManager->GetCompositor();
if (CompositorBridgeParent* bridge = compositor->GetCompositorBridgeParent()) {
- AndroidDynamicToolbarAnimator* animator = bridge->GetAPZCTreeManager()->GetAndroidDynamicToolbarAnimator();
+ AndroidDynamicToolbarAnimator* animator = bridge->GetAndroidDynamicToolbarAnimator();
MOZ_ASSERT(animator);
if (mIsFirstPaint) {
animator->UpdateRootFrameMetrics(metrics);
animator->FirstPaint();
mIsFirstPaint = false;
}
if (mLayersUpdated) {
animator->NotifyLayersUpdated();
@@ -1402,17 +1401,17 @@ AsyncCompositionManager::TransformShadow
MOZ_ASSERT(aVsyncRate != TimeDuration::Forever());
if (aVsyncRate != TimeDuration::Forever()) {
nextFrame += aVsyncRate;
}
#if defined(MOZ_WIDGET_ANDROID)
Compositor* compositor = mLayerManager->GetCompositor();
if (CompositorBridgeParent* bridge = compositor->GetCompositorBridgeParent()) {
- AndroidDynamicToolbarAnimator* animator = bridge->GetAPZCTreeManager()->GetAndroidDynamicToolbarAnimator();
+ AndroidDynamicToolbarAnimator* animator = bridge->GetAndroidDynamicToolbarAnimator();
MOZ_ASSERT(animator);
wantNextFrame |= animator->UpdateAnimation(nextFrame);
}
#endif // defined(MOZ_WIDGET_ANDROID)
// Reset the previous time stamp if we don't already have any running
// animations to avoid using the time which is far behind for newly
// started animations.
--- a/gfx/layers/composite/LayerManagerComposite.cpp
+++ b/gfx/layers/composite/LayerManagerComposite.cpp
@@ -52,17 +52,16 @@
#include "nsDebug.h" // for NS_WARNING, etc
#include "nsISupportsImpl.h" // for Layer::AddRef, etc
#include "nsPoint.h" // for nsIntPoint
#include "nsRect.h" // for mozilla::gfx::IntRect
#include "nsRegion.h" // for nsIntRegion, etc
#if defined(MOZ_WIDGET_ANDROID)
#include <android/log.h>
#include <android/native_window.h>
-#include "apz/src/APZCTreeManager.h"
#include "mozilla/widget/AndroidCompositorWidget.h"
#include "opengl/CompositorOGL.h"
#include "GLConsts.h"
#include "GLContextEGL.h"
#include "GLContextProvider.h"
#include "mozilla/Unused.h"
#include "mozilla/widget/AndroidCompositorWidget.h"
#include "ScopedGLHelpers.h"
@@ -1167,33 +1166,33 @@ LayerManagerComposite::GetContentShiftFo
{
ScreenCoord result(0.0f);
// If GetTargetContext return is not null we are not drawing to the screen so there will not be any content offset.
if (mCompositor->GetTargetContext() != nullptr) {
return result;
}
if (CompositorBridgeParent* bridge = mCompositor->GetCompositorBridgeParent()) {
- AndroidDynamicToolbarAnimator* animator = bridge->GetAPZCTreeManager()->GetAndroidDynamicToolbarAnimator();
+ AndroidDynamicToolbarAnimator* animator = bridge->GetAndroidDynamicToolbarAnimator();
MOZ_RELEASE_ASSERT(animator);
result.value = (float)animator->GetCurrentContentOffset().value;
}
return result;
}
void
LayerManagerComposite::RenderToolbar()
{
// If GetTargetContext return is not null we are not drawing to the screen so don't draw the toolbar.
if (mCompositor->GetTargetContext() != nullptr) {
return;
}
if (CompositorBridgeParent* bridge = mCompositor->GetCompositorBridgeParent()) {
- AndroidDynamicToolbarAnimator* animator = bridge->GetAPZCTreeManager()->GetAndroidDynamicToolbarAnimator();
+ AndroidDynamicToolbarAnimator* animator = bridge->GetAndroidDynamicToolbarAnimator();
MOZ_RELEASE_ASSERT(animator);
animator->UpdateToolbarSnapshotTexture(mCompositor->AsCompositorOGL());
int32_t toolbarHeight = animator->GetCurrentToolbarHeight();
if (toolbarHeight == 0) {
return;
}
--- a/gfx/layers/ipc/CompositorBridgeParent.cpp
+++ b/gfx/layers/ipc/CompositorBridgeParent.cpp
@@ -1183,22 +1183,16 @@ bool
CompositorBridgeParent::DeallocPAPZParent(PAPZParent* aActor)
{
RemoteContentController* controller = static_cast<RemoteContentController*>(aActor);
controller->Release();
return true;
}
#if defined(MOZ_WIDGET_ANDROID)
-RefPtr<APZCTreeManager>
-CompositorBridgeParent::GetAPZCTreeManager()
-{
- return mApzcTreeManager;
-}
-
AndroidDynamicToolbarAnimator*
CompositorBridgeParent::GetAndroidDynamicToolbarAnimator()
{
return mApzcTreeManager ? mApzcTreeManager->GetAndroidDynamicToolbarAnimator() : nullptr;
}
#endif
RefPtr<APZSampler>
--- a/gfx/layers/ipc/CompositorBridgeParent.h
+++ b/gfx/layers/ipc/CompositorBridgeParent.h
@@ -459,17 +459,16 @@ public:
void AllocateAPZCTreeManagerParent(const MonitorAutoLock& aProofOfLayerTreeStateLock,
const uint64_t& aLayersId,
LayerTreeState& aLayerTreeStateToUpdate);
PAPZParent* AllocPAPZParent(const uint64_t& aLayersId) override;
bool DeallocPAPZParent(PAPZParent* aActor) override;
#if defined(MOZ_WIDGET_ANDROID)
- RefPtr<APZCTreeManager> GetAPZCTreeManager();
AndroidDynamicToolbarAnimator* GetAndroidDynamicToolbarAnimator();
#endif
RefPtr<APZSampler> GetAPZSampler();
CompositorOptions GetOptions() const {
return mOptions;
}