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

Bug 1597585 - Remove WidgetRenderingContext's unused field mCompositor. r=mattwoodrow 

The only use of this was inside Android's nsWindow::PreRender.
That method was removed in changeset 81de9d1439b0e352729142f6aa2914674073da03 (bug 1335895).

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

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

gfx/layers/composite/LayerManagerComposite.cpp

+0 −2
Original line number Diff line number Diff line
@@ -1104,8 +1104,6 @@ bool LayerManagerComposite::Render(const nsIntRegion& aInvalidRegion, 
  mozilla::widget::WidgetRenderingContext widgetContext;

#if defined(XP_MACOSX)

  widgetContext.mLayerManager = this;

#elif defined(MOZ_WIDGET_ANDROID)

  widgetContext.mCompositor = GetCompositor();

#endif



  {

gfx/webrender_bindings/RendererOGL.cpp

+0 −3
Original line number Diff line number Diff line
@@ -116,9 +116,6 @@ RenderedFrameId RendererOGL::UpdateAndRender( 


#if defined(XP_MACOSX)

  widgetContext.mGL = mCompositor->gl();

// TODO: we don't have a notion of compositor here.

//#elif defined(MOZ_WIDGET_ANDROID)

//  widgetContext.mCompositor = mCompositor;

#endif



  if (!mCompositor->GetWidget()->PreRender(&widgetContext)) {

widget/CompositorWidget.h

+0 −3
Original line number Diff line number Diff line
@@ -78,9 +78,6 @@ class WidgetRenderingContext { 
  WidgetRenderingContext() : mLayerManager(nullptr), mGL(nullptr) {}

  layers::LayerManagerComposite* mLayerManager;

  gl::GLContext* mGL;

#elif defined(MOZ_WIDGET_ANDROID)

  WidgetRenderingContext() : mCompositor(nullptr) {}

  layers::Compositor* mCompositor;

#endif

};