Commit 28d283ab authored by Markus Stange's avatar Markus Stange
Browse files

Bug 1574592 - Remove now-unused CompositorWidget::DoCompositorCleanup again. r=mattwoodrow 

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

--HG--
extra : moz-landing-system : lando
parent e0e54098

gfx/layers/Compositor.cpp

+0 −1
Original line number Diff line number Diff line
@@ -77,7 +77,6 @@ Compositor::Compositor(widget::CompositorWidget* aWidget, 
Compositor::~Compositor() { ReadUnlockTextures(); }



void Compositor::Destroy() {

  mWidget->DoCompositorCleanup();

  mWidget = nullptr;



  TextureSourceProvider::Destroy();

gfx/webrender_bindings/RendererOGL.cpp

+0 −1
Original line number Diff line number Diff line
@@ -79,7 +79,6 @@ RendererOGL::~RendererOGL() { 
    mNativeLayerForEntireWindow = nullptr;

    mNativeLayerRoot = nullptr;

  }

  mCompositor->GetWidget()->DoCompositorCleanup();

  wr_renderer_delete(mRenderer);

}

widget/CompositorWidget.h

+0 −7
Original line number Diff line number Diff line
@@ -117,13 +117,6 @@ class CompositorWidget { 
   */

  virtual void PostRender(WidgetRenderingContext* aContext) {}



  /**

   * Called on the same thread as PreRender/PostRender during destruction.

   * This method gives the widget a chance to do any cleanup for state that it

   * created during PreRender / PostRender.

   */

  virtual void DoCompositorCleanup() {}



  /**

   * Called before the first composite. If the result is non-null, one or more

   * native layers will be placed on the window and used for compositing.

widget/InProcessCompositorWidget.cpp

+0 −4
Original line number Diff line number Diff line
@@ -44,10 +44,6 @@ void InProcessCompositorWidget::PostRender(WidgetRenderingContext* aContext) { 
  mWidget->PostRender(aContext);

}



void InProcessCompositorWidget::DoCompositorCleanup() {

  mWidget->DoCompositorCleanup();

}



RefPtr<layers::NativeLayerRoot>

InProcessCompositorWidget::GetNativeLayerRoot() {

  return mWidget->GetNativeLayerRoot();

widget/InProcessCompositorWidget.h

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ class InProcessCompositorWidget : public CompositorWidget { 


  virtual bool PreRender(WidgetRenderingContext* aManager) override;

  virtual void PostRender(WidgetRenderingContext* aManager) override;

  virtual void DoCompositorCleanup() override;

  virtual RefPtr<layers::NativeLayerRoot> GetNativeLayerRoot() override;

  virtual void DrawWindowUnderlay(WidgetRenderingContext* aContext,

                                  LayoutDeviceIntRect aRect) override;