Commit 644d1c7d authored by Botond Ballo's avatar Botond Ballo
Browse files

Bug 1761872 - Remove APZSampler::GetGeckoFixedLayerMargins(). r=hiro 

APZCTreeManager::GetGeckoFixedLayerMargins() is also removed,
but the field mGeckoFixedLayerMargins is kept as it's used internally
in WebRender codepaths.

Differential Revision: https://phabricator.services.mozilla.com/D142292
parent ee733433

gfx/layers/apz/public/APZSampler.h

+0 −2
Original line number Diff line number Diff line
@@ -82,8 +82,6 @@ class APZSampler { 
      const LayersId& aLayersId,

      const ScrollableLayerGuid::ViewID& aScrollId) const;



  ScreenMargin GetGeckoFixedLayerMargins() const;



  /**

   * This can be used to assert that the current thread is the

   * sampler thread (which samples the async transform).

gfx/layers/apz/src/APZCTreeManager.cpp

+0 −5
Original line number Diff line number Diff line
@@ -2941,11 +2941,6 @@ already_AddRefed<AsyncPanZoomController> APZCTreeManager::FindZoomableApzc( 
  return GetZoomableTarget(aStart, aStart);

}



ScreenMargin APZCTreeManager::GetGeckoFixedLayerMargins() const {

  RecursiveMutexAutoLock lock(mTreeLock);

  return mGeckoFixedLayerMargins;

}



ScreenMargin APZCTreeManager::GetCompositorFixedLayerMargins() const {

  RecursiveMutexAutoLock lock(mTreeLock);

  return mCompositorFixedLayerMargins;

gfx/layers/apz/src/APZCTreeManager.h

+0 −2
Original line number Diff line number Diff line
@@ -558,8 +558,6 @@ class APZCTreeManager : public IAPZCTreeManager, public APZInputBridge { 
  already_AddRefed<AsyncPanZoomController> FindZoomableApzc(

      AsyncPanZoomController* aStart) const;



  ScreenMargin GetGeckoFixedLayerMargins() const;



  ScreenMargin GetCompositorFixedLayerMargins() const;



  APZScrollGeneration NewAPZScrollGeneration() {

gfx/layers/apz/src/APZSampler.cpp

+0 −7
Original line number Diff line number Diff line
@@ -122,13 +122,6 @@ AsyncTransform APZSampler::GetCurrentAsyncTransform( 
                                        aComponents);

}



ScreenMargin APZSampler::GetGeckoFixedLayerMargins() const {

  MOZ_ASSERT(CompositorThreadHolder::IsInCompositorThread());

  AssertOnSamplerThread();



  return mApz->GetGeckoFixedLayerMargins();

}



ParentLayerRect APZSampler::GetCompositionBounds(

    const LayersId& aLayersId,

    const ScrollableLayerGuid::ViewID& aScrollId) const {