Backed out changeset b1f8f86bbda8 (bug 1565785) for causing bustages in nsWindow.h CLOSED TREE

gfx/layers/ipc/CompositorBridgeChild.cpp

@@ -720,13 +720,6 @@ bool CompositorBridgeChild::SendResume() {
   return PCompositorBridgeChild::SendResume();
 }
 
-bool CompositorBridgeChild::SendResumeAsync() {
-  if (!mCanSend) {
-    return false;
-  }
-  return PCompositorBridgeChild::SendResumeAsync();
-}
-
 bool CompositorBridgeChild::SendNotifyChildCreated(
     const LayersId& id, CompositorOptions* aOptions) {
   if (!mCanSend) {

gfx/layers/ipc/CompositorBridgeChild.h

@@ -146,7 +146,6 @@ class CompositorBridgeChild final : public PCompositorBridgeChild,
   bool SendWillClose();
   bool SendPause();
   bool SendResume();
-  bool SendResumeAsync();
   bool SendNotifyChildCreated(const LayersId& id, CompositorOptions* aOptions);
   bool SendAdoptChild(const LayersId& id);
   bool SendMakeSnapshot(const SurfaceDescriptor& inSnapshot,

gfx/layers/ipc/CompositorBridgeParent.cpp

@@ -538,11 +538,6 @@ mozilla::ipc::IPCResult CompositorBridgeParent::RecvResume() {
   return IPC_OK();
 }
 
-mozilla::ipc::IPCResult CompositorBridgeParent::RecvResumeAsync() {
-  ResumeComposition();
-  return IPC_OK();
-}
-
 mozilla::ipc::IPCResult CompositorBridgeParent::RecvMakeSnapshot(
     const SurfaceDescriptor& aInSnapshot, const gfx::IntRect& aRect) {
   RefPtr<DrawTarget> target =

gfx/layers/ipc/CompositorBridgeParent.h

@@ -254,7 +254,6 @@ class CompositorBridgeParentBase : public PCompositorBridgeParent,
   virtual mozilla::ipc::IPCResult RecvWillClose() = 0;
   virtual mozilla::ipc::IPCResult RecvPause() = 0;
   virtual mozilla::ipc::IPCResult RecvResume() = 0;
-  virtual mozilla::ipc::IPCResult RecvResumeAsync() = 0;
   virtual mozilla::ipc::IPCResult RecvNotifyChildCreated(
       const LayersId& id, CompositorOptions* compositorOptions) = 0;
   virtual mozilla::ipc::IPCResult RecvMapAndNotifyChildCreated(
@@ -321,7 +320,6 @@ class CompositorBridgeParent final : public CompositorBridgeParentBase,
   mozilla::ipc::IPCResult RecvWillClose() override;
   mozilla::ipc::IPCResult RecvPause() override;
   mozilla::ipc::IPCResult RecvResume() override;
-  mozilla::ipc::IPCResult RecvResumeAsync() override;
   mozilla::ipc::IPCResult RecvNotifyChildCreated(
       const LayersId& child, CompositorOptions* aOptions) override;
   mozilla::ipc::IPCResult RecvMapAndNotifyChildCreated(
@@ -687,7 +685,6 @@ class CompositorBridgeParent final : public CompositorBridgeParentBase,
   void ResumeComposition();
   void ResumeCompositionAndResize(int x, int y, int width, int height);
   void Invalidate();
-  bool IsPaused() { return mPaused; }
 
  protected:
   void ForceComposition();

gfx/layers/ipc/ContentCompositorBridgeParent.h

@@ -43,7 +43,6 @@ class ContentCompositorBridgeParent final : public CompositorBridgeParentBase {
   mozilla::ipc::IPCResult RecvWillClose() override { return IPC_OK(); }
   mozilla::ipc::IPCResult RecvPause() override { return IPC_OK(); }
   mozilla::ipc::IPCResult RecvResume() override { return IPC_OK(); }
-  mozilla::ipc::IPCResult RecvResumeAsync() override { return IPC_OK(); }
   mozilla::ipc::IPCResult RecvNotifyChildCreated(
       const LayersId& child, CompositorOptions* aOptions) override;
   mozilla::ipc::IPCResult RecvMapAndNotifyChildCreated(

gfx/layers/ipc/PCompositorBridge.ipdl

@@ -181,7 +181,6 @@ parent:
   // the compositor needs to pause/resume in lockstep with the application.
   sync Pause();
   sync Resume();
-  async ResumeAsync();
 
   // See bug 1316632 comment #33 for why this has to be sync. Otherwise,
   // there are ordering issues with SendPLayerTransactionConstructor.

gfx/layers/wr/WebRenderBridgeParent.cpp

@@ -1941,15 +1941,6 @@ void WebRenderBridgeParent::MaybeGenerateFrame(VsyncId aId,
   // This function should only get called in the root WRBP
   MOZ_ASSERT(IsRootWebRenderBridgeParent());
 
-  if (CompositorBridgeParent* cbp = GetRootCompositorBridgeParent()) {
-    // Skip WR render during paused state.
-    if (cbp->IsPaused()) {
-      TimeStamp now = TimeStamp::Now();
-      cbp->NotifyPipelineRendered(mPipelineId, mWrEpoch, VsyncId(), now, now,
-                                  now);
-    }
-  }
-
   TimeStamp start = TimeStamp::Now();
   mAsyncImageManager->SetCompositionTime(start);
 

widget/gtk/nsWindow.cpp

@@ -2108,7 +2108,6 @@ void nsWindow::WaylandEGLSurfaceForceRedraw() {
     if (mCompositorWidgetDelegate) {
       mNeedsUpdatingEGLSurface = false;
       mCompositorWidgetDelegate->RequestsUpdatingEGLSurface();
-      remoteRenderer->SendResumeAsync();
     }
     remoteRenderer->SendForcePresent();
   }

widget/gtk/nsWindow.h

@@ -409,9 +409,7 @@ class nsWindow final : public nsBaseWidget {
                                     GtkWidget* aOldContainer);
 
   virtual void RegisterTouchWindow() override;
-  virtual bool CompositorInitiallyPaused() override {
-    return mNeedsUpdatingEGLSurface;
-  }
+
   nsCOMPtr<nsIWidget> mParent;
   // Is this a toplevel window?
   bool mIsTopLevel;

widget/nsBaseWidget.cpp

@@ -1269,8 +1269,6 @@ already_AddRefed<LayerManager> nsBaseWidget::CreateCompositorSession(
     if (!GetNativeData(NS_JAVA_SURFACE)) {
       options.SetInitiallyPaused(true);
     }
-#else
-    options.SetInitiallyPaused(CompositorInitiallyPaused());
 #endif
 
     RefPtr<LayerManager> lm;

widget/nsBaseWidget.h

@@ -470,7 +470,6 @@ class nsBaseWidget : public nsIWidget, public nsSupportsWeakReference {
     return true;
   }
   virtual uint32_t GetGLFrameBufferFormat();
-  virtual bool CompositorInitiallyPaused() { return false; }
 
  protected:
   void ResolveIconName(const nsAString& aIconName, const nsAString& aIconSuffix,