Commit d3a4eb59 authored by Markus Stange's avatar Markus Stange
Browse files

Bug 1576390 - Remove now-unused DrawWindowOverlay and WindowOverlayChanged methods. r=mattwoodrow 

Differential Revision: https://phabricator.services.mozilla.com/D52748

--HG--
extra : moz-landing-system : lando
parent 8b245c09

gfx/layers/composite/LayerManagerComposite.cpp

+1 −7
Original line number Diff line number Diff line
@@ -116,7 +116,6 @@ HostLayerManager::HostLayerManager() 
    : mDebugOverlayWantsNextFrame(false),

      mWarningLevel(0.0f),

      mCompositorBridgeID(0),

      mWindowOverlayChanged(false),

      mLastPaintTime(TimeDuration::Forever()),

      mRenderStartTime(TimeStamp::Now()) {}
@@ -618,7 +617,7 @@ void LayerManagerComposite::UpdateAndRender() { 
    invalid = mInvalidRegion;

  }



  if (invalid.IsEmpty() && !mWindowOverlayChanged) {

  if (invalid.IsEmpty()) {

    // Composition requested, but nothing has changed. Don't do any work.

    mClonedLayerTreeProperties = LayerProperties::CloneFrom(GetRoot());

    mProfilerScreenshotGrabber.NotifyEmptyFrame();
@@ -646,7 +645,6 @@ void LayerManagerComposite::UpdateAndRender() { 


  if (!mTarget && rendered) {

    mInvalidRegion.SetEmpty();

    mWindowOverlayChanged = false;

  }



  // Update cached layer tree information.
@@ -1274,10 +1272,6 @@ bool LayerManagerComposite::Render(const nsIntRegion& aInvalidRegion, 
  if (usingNativeLayers) {

    UpdateDebugOverlayNativeLayers();

  } else {

    // Allow widget to render a custom foreground.

    mCompositor->GetWidget()->DrawWindowOverlay(

        &widgetContext, LayoutDeviceIntRect::FromUnknownRect(bounds));



#if defined(MOZ_WIDGET_ANDROID)

    if (AndroidDynamicToolbarAnimator::IsEnabled()) {

      // Depending on the content shift the toolbar may be rendered on top of

gfx/layers/composite/LayerManagerComposite.h

+0 −6
Original line number Diff line number Diff line
@@ -160,11 +160,6 @@ class HostLayerManager : public LayerManager { 
    }

  }



  // Indicate that we need to composite even if nothing in our layers has

  // changed, so that the widget can draw something different in its window

  // overlay.

  void SetWindowOverlayChanged() { mWindowOverlayChanged = true; }



  void SetPaintTime(const TimeDuration& aPaintTime) {

    mLastPaintTime = aPaintTime;

  }
@@ -223,7 +218,6 @@ class HostLayerManager : public LayerManager { 
  UniquePtr<Diagnostics> mDiagnostics;

  uint64_t mCompositorBridgeID;



  bool mWindowOverlayChanged;

  TimeDuration mLastPaintTime;

  TimeStamp mRenderStartTime;

  UniquePtr<CompositionRecorder> mCompositionRecorder = nullptr;

gfx/layers/ipc/LayerTransactionParent.cpp

+0 −4
Original line number Diff line number Diff line
@@ -263,10 +263,6 @@ mozilla::ipc::IPCResult LayerTransactionParent::RecvUpdate( 
            edit.get_OpSetDiagnosticTypes().diagnostics());

        break;

      }

      case Edit::TOpWindowOverlayChanged: {

        mLayerManager->SetWindowOverlayChanged();

        break;

      }

      // Tree ops

      case Edit::TOpSetRoot: {

        MOZ_LAYERS_LOG(("[ParentSide] SetRoot"));

gfx/layers/ipc/LayersMessages.ipdlh

+1 −3
Original line number Diff line number Diff line
@@ -428,7 +428,6 @@ struct OpRepositionChild { LayerHandle container; LayerHandle childLayer; Layer 
struct OpRaiseToTopChild  { LayerHandle container; LayerHandle childLayer; };



struct OpSetDiagnosticTypes { DiagnosticTypes diagnostics; };

struct OpWindowOverlayChanged { };



struct ShmemSection {

  Shmem shmem;
@@ -558,7 +557,6 @@ union Edit { 
  OpCreateRefLayer;



  OpSetDiagnosticTypes;

  OpWindowOverlayChanged;

  

  OpSetRoot;

  OpInsertAfter;

gfx/layers/ipc/ShadowLayers.cpp

+0 −6
Original line number Diff line number Diff line
@@ -192,7 +192,6 @@ ShadowLayerForwarder::ShadowLayerForwarder( 
      mMessageLoop(MessageLoop::current()),

      mDiagnosticTypes(DiagnosticTypes::NO_DIAGNOSTIC),

      mIsFirstPaint(false),

      mWindowOverlayChanged(false),

      mNextLayerHandle(1) {

  mTxn = new Transaction();

  if (TabGroup* tabGroup = mClientLayerManager->GetTabGroup()) {
@@ -565,9 +564,6 @@ bool ShadowLayerForwarder::EndTransaction( 
    mDiagnosticTypes = diagnostics;

    mTxn->AddEdit(OpSetDiagnosticTypes(diagnostics));

  }

  if (mWindowOverlayChanged) {

    mTxn->AddEdit(OpWindowOverlayChanged());

  }



  AutoTxnEnd _(mTxn);
@@ -660,8 +656,6 @@ bool ShadowLayerForwarder::EndTransaction( 
    return true;

  }



  mWindowOverlayChanged = false;



  info.cset() = std::move(mTxn->mCset);

  info.setSimpleAttrs() = std::move(setSimpleAttrs);

  info.setAttrs() = std::move(setAttrs);