Backed out 4 changesets (bug 1742797) for causing failures on /browse…

…r_ext_getViews.js. CLOSED TREE Backed out changeset c48ff146a33d (bug 1742797) Backed out changeset a692ca1d8401 (bug 1742797) Backed out changeset cfc1f440fb6d (bug 1742797) Backed out changeset 88f60761e884 (bug 1742797)
dothq · Jul 12, 2022 · c97011a · c97011a
1 parent f9dbfd1
commit c97011a
Show file tree

Hide file tree

Showing 11 changed files with 0 additions and 113 deletions.
diff --git a/browser/base/content/test/performance/browser.ini b/browser/base/content/test/performance/browser.ini
@@ -31,9 +31,6 @@ skip-if =
   (os == 'win' && bits == 32)
   (os == 'win' && processor == 'aarch64')
   (os == 'linux' && socketprocess_networking) # Bug 1382809, bug 1369959, Win32 because of intermittent OOM failures, bug 1533141 for aarch64
-[browser_panel_vsync.js]
-support-files =
-  !/browser/components/downloads/test/browser/head.js
 [browser_preferences_usage.js]
 https_first_disabled = true
 skip-if =

diff --git a/browser/base/content/test/performance/browser_panel_vsync.js b/browser/base/content/test/performance/browser_panel_vsync.js
diff --git a/gfx/layers/ipc/PWebRenderBridge.ipdl b/gfx/layers/ipc/PWebRenderBridge.ipdl
@@ -69,7 +69,6 @@ parent:
   sync GetSnapshot(PTexture texture) returns (bool aNeedsYFlip);
   async SetLayersObserverEpoch(LayersObserverEpoch childEpoch);
   async ClearCachedResources();
-  async ClearAnimationResources();
   async SetDefaultClearColor(uint32_t aColor);
   // Invalidate rendered frame
   async InvalidateRenderedFrame();

diff --git a/gfx/layers/wr/WebRenderBridgeParent.cpp b/gfx/layers/wr/WebRenderBridgeParent.cpp
@@ -1893,14 +1893,6 @@ mozilla::ipc::IPCResult WebRenderBridgeParent::RecvClearCachedResources() {
   return IPC_OK();
 }
 
-mozilla::ipc::IPCResult WebRenderBridgeParent::RecvClearAnimationResources() {
-  if (!mDestroyed) {
-    ClearAnimationResources();
-  }
-
-  return IPC_OK();
-}
-
 wr::Epoch WebRenderBridgeParent::UpdateWebRender(
     CompositorVsyncScheduler* aScheduler, RefPtr<wr::WebRenderAPI>&& aApi,
     AsyncImagePipelineManager* aImageMgr,

diff --git a/gfx/layers/wr/WebRenderBridgeParent.h b/gfx/layers/wr/WebRenderBridgeParent.h
@@ -141,7 +141,6 @@ class WebRenderBridgeParent final : public PWebRenderBridgeParent,
       const LayersObserverEpoch& aChildEpoch) override;
 
   mozilla::ipc::IPCResult RecvClearCachedResources() override;
-  mozilla::ipc::IPCResult RecvClearAnimationResources() override;
   mozilla::ipc::IPCResult RecvInvalidateRenderedFrame() override;
   mozilla::ipc::IPCResult RecvScheduleComposite(
       const wr::RenderReasons& aReasons) override;

diff --git a/gfx/layers/wr/WebRenderLayerManager.cpp b/gfx/layers/wr/WebRenderLayerManager.cpp
@@ -622,14 +622,6 @@ void WebRenderLayerManager::ClearCachedResources() {
   WrBridge()->EndClearCachedResources();
 }
 
-void WebRenderLayerManager::ClearAnimationResources() {
-  if (!WrBridge()->IPCOpen()) {
-    gfxCriticalNote << "IPC Channel is already torn down unexpectedly\n";
-    return;
-  }
-  WrBridge()->SendClearAnimationResources();
-}
-
 void WebRenderLayerManager::WrUpdated() {
   ClearAsyncAnimations();
   mStateManager.mAsyncResourceUpdates.reset();

diff --git a/gfx/layers/wr/WebRenderLayerManager.h b/gfx/layers/wr/WebRenderLayerManager.h
@@ -102,7 +102,6 @@ class WebRenderLayerManager final : public WindowRenderer {
                     const mozilla::TimeStamp& aCompositeEnd);
 
   void ClearCachedResources();
-  void ClearAnimationResources();
   void UpdateTextureFactoryIdentifier(
       const TextureFactoryIdentifier& aNewIdentifier);
   TextureFactoryIdentifier GetTextureFactoryIdentifier();

diff --git a/layout/xul/nsMenuPopupFrame.cpp b/layout/xul/nsMenuPopupFrame.cpp
@@ -1098,13 +1098,6 @@ void nsMenuPopupFrame::HidePopup(bool aDeselectMenu, nsPopupState aNewState) {
   mCurrentMenu = nullptr;  // make sure no current menu is set
   mHFlip = mVFlip = false;
 
-  if (auto* widget = GetWidget()) {
-    // Ideally we should call ClearCachedWebrenderResources but there are
-    // intermittent failures (see bug 1748788), so we currently call
-    // ClearWebrenderAnimationResources instead.
-    widget->ClearWebrenderAnimationResources();
-  }
-
   nsView* view = GetView();
   nsViewManager* viewManager = view->GetViewManager();
   viewManager->SetViewVisibility(view, nsViewVisibility_kHide);

diff --git a/widget/nsBaseWidget.cpp b/widget/nsBaseWidget.cpp
@@ -1368,13 +1368,6 @@ void nsBaseWidget::ClearCachedWebrenderResources() {
   mWindowRenderer->AsWebRender()->ClearCachedResources();
 }
 
-void nsBaseWidget::ClearWebrenderAnimationResources() {
-  if (!mWindowRenderer || !mWindowRenderer->AsWebRender()) {
-    return;
-  }
-  mWindowRenderer->AsWebRender()->ClearAnimationResources();
-}
-
 bool nsBaseWidget::SetNeedFastSnaphot() {
   MOZ_ASSERT(XRE_IsParentProcess());
   MOZ_ASSERT(!mCompositorSession);

diff --git a/widget/nsBaseWidget.h b/widget/nsBaseWidget.h
@@ -611,8 +611,6 @@ class nsBaseWidget : public nsIWidget, public nsSupportsWeakReference {
 
   void ClearCachedWebrenderResources() override;
 
-  void ClearWebrenderAnimationResources() override;
-
   bool SetNeedFastSnaphot() override;
 
   /**

diff --git a/widget/nsIWidget.h b/widget/nsIWidget.h
@@ -1998,11 +1998,6 @@ class nsIWidget : public nsISupports {
    */
   virtual void ClearCachedWebrenderResources() {}
 
-  /**
-   * Clear WebRender animation resources
-   */
-  virtual void ClearWebrenderAnimationResources() {}
-
   /**
    * Request fast snapshot at RenderCompositor of WebRender.
    * Since readback of Windows DirectComposition is very slow.
-Original file line number
+Diff line change
@@ Expand Up @@
       void ClearCachedWebrenderResources() override;
-      void ClearWebrenderAnimationResources() override;
       bool SetNeedFastSnaphot() override;
       /**
@@ Expand Down @@