Bug 1804457 - Restore branch in ClassifyCompositorOptionsChange() to …

…support APZ enablement change on a best-effort basis. r=dlrobertson Depends on D164162 Differential Revision: https://phabricator.services.mozilla.com/D164163
Brli · Dec 8, 2022 · 29fcc71 · 29fcc71
1 parent 488594e
commit 29fcc71
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/gfx/ipc/CompositorOptions.h b/gfx/ipc/CompositorOptions.h
@@ -61,16 +61,19 @@ class CompositorOptions {
     mNeedFastSnaphot = aNeedFastSnaphot;
   }
 
-  bool operator==(const CompositorOptions& aOther) const {
-    return mUseAPZ == aOther.mUseAPZ &&
-           mUseSoftwareWebRender == aOther.mUseSoftwareWebRender &&
+  bool EqualsIgnoringApzEnablement(const CompositorOptions& aOther) const {
+    return mUseSoftwareWebRender == aOther.mUseSoftwareWebRender &&
            mAllowSoftwareWebRenderD3D11 ==
                aOther.mAllowSoftwareWebRenderD3D11 &&
            mAllowSoftwareWebRenderOGL == aOther.mAllowSoftwareWebRenderOGL &&
            mInitiallyPaused == aOther.mInitiallyPaused &&
            mNeedFastSnaphot == aOther.mNeedFastSnaphot;
   }
 
+  bool operator==(const CompositorOptions& aOther) const {
+    return mUseAPZ == aOther.mUseAPZ && EqualsIgnoringApzEnablement(aOther);
+  }
+
   friend struct IPC::ParamTraits<CompositorOptions>;
 
  private:

diff --git a/gfx/layers/ipc/CompositorBridgeParent.cpp b/gfx/layers/ipc/CompositorBridgeParent.cpp
@@ -971,6 +971,9 @@ static CompositorOptionsChangeKind ClassifyCompositorOptionsChange(
   if (aOld == aNew) {
     return CompositorOptionsChangeKind::eSupported;
   }
+  if (aOld.EqualsIgnoringApzEnablement(aNew)) {
+    return CompositorOptionsChangeKind::eBestEffort;
+  }
   return CompositorOptionsChangeKind::eUnsupported;
 }