Bug 1739621 - Remove remaining UseAdvancedLayers() r=jrmuizel,gfx-reviewers,bradwerth

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

dom/base/nsDOMWindowUtils.cpp

@@ -2623,25 +2623,6 @@ nsDOMWindowUtils::GetLayerManagerRemote(bool* retval) {
   return NS_OK;
 }
 
-NS_IMETHODIMP
-nsDOMWindowUtils::GetUsingAdvancedLayers(bool* retval) {
-  nsCOMPtr<nsIWidget> widget = GetWidget();
-  if (!widget) {
-    return NS_ERROR_FAILURE;
-  }
-
-  WindowRenderer* renderer = widget->GetWindowRenderer();
-  if (!renderer) {
-    return NS_ERROR_FAILURE;
-  }
-
-  *retval = false;
-  if (KnowsCompositor* fwd = renderer->AsKnowsCompositor()) {
-    *retval = fwd->GetTextureFactoryIdentifier().mUsingAdvancedLayers;
-  }
-  return NS_OK;
-}
-
 NS_IMETHODIMP
 nsDOMWindowUtils::GetIsWebRenderRequested(bool* retval) {
   *retval = gfxPlatform::WebRenderPrefEnabled() ||

dom/interfaces/base/nsIDOMWindowUtils.idl

@@ -1519,11 +1519,6 @@ interface nsIDOMWindowUtils : nsISupports {
    */
   readonly attribute boolean layerManagerRemote;
 
-  /**
-   * True if advanced layers is enabled on this window, false otherwise.
-   */
-  readonly attribute boolean usingAdvancedLayers;
-
   /**
    * True if webrender was requested by the user (via pref or env-var), false
    * otherwise. Note that this doesn't represent whether or not webrender is

gfx/ipc/CompositorOptions.h

@@ -40,7 +40,6 @@ class CompositorOptions {
     return mAllowSoftwareWebRenderD3D11;
   }
   bool AllowSoftwareWebRenderOGL() const { return mAllowSoftwareWebRenderOGL; }
-  bool UseAdvancedLayers() const { return mUseAdvancedLayers; }
   bool InitiallyPaused() const { return mInitiallyPaused; }
 
   void SetUseAPZ(bool aUseAPZ) { mUseAPZ = aUseAPZ; }
@@ -53,10 +52,6 @@ class CompositorOptions {
     mAllowSoftwareWebRenderOGL = aAllowSoftwareWebRenderOGL;
   }
 
-  void SetUseAdvancedLayers(bool aUseAdvancedLayers) {
-    mUseAdvancedLayers = aUseAdvancedLayers;
-  }
-
   bool UseWebGPU() const { return mUseWebGPU; }
   void SetUseWebGPU(bool aUseWebGPU) { mUseWebGPU = aUseWebGPU; }
 
@@ -70,7 +65,6 @@ class CompositorOptions {
            mAllowSoftwareWebRenderD3D11 ==
                aOther.mAllowSoftwareWebRenderD3D11 &&
            mAllowSoftwareWebRenderOGL == aOther.mAllowSoftwareWebRenderOGL &&
-           mUseAdvancedLayers == aOther.mUseAdvancedLayers &&
            mUseWebGPU == aOther.mUseWebGPU;
   }
 
@@ -81,7 +75,6 @@ class CompositorOptions {
   bool mUseSoftwareWebRender = false;
   bool mAllowSoftwareWebRenderD3D11 = false;
   bool mAllowSoftwareWebRenderOGL = false;
-  bool mUseAdvancedLayers = false;
   bool mUseWebGPU = false;
   bool mInitiallyPaused = false;
 

gfx/layers/CompositorTypes.h

@@ -156,7 +156,6 @@ struct TextureFactoryIdentifier {
   bool mSupportsTextureBlitting;
   bool mSupportsPartialUploads;
   bool mSupportsComponentAlpha;
-  bool mUsingAdvancedLayers;
   SyncHandle mSyncHandle;
 
   explicit TextureFactoryIdentifier(
@@ -180,7 +179,6 @@ struct TextureFactoryIdentifier {
         mSupportsTextureBlitting(aSupportsTextureBlitting),
         mSupportsPartialUploads(aSupportsPartialUploads),
         mSupportsComponentAlpha(aSupportsComponentAlpha),
-        mUsingAdvancedLayers(false),
         mSyncHandle(aSyncHandle) {}
 
   explicit TextureFactoryIdentifier(
@@ -205,7 +203,6 @@ struct TextureFactoryIdentifier {
         mSupportsTextureBlitting(aSupportsTextureBlitting),
         mSupportsPartialUploads(aSupportsPartialUploads),
         mSupportsComponentAlpha(aSupportsComponentAlpha),
-        mUsingAdvancedLayers(false),
         mSyncHandle(aSyncHandle) {}
 
   bool operator==(const TextureFactoryIdentifier& aOther) const {
@@ -222,7 +219,6 @@ struct TextureFactoryIdentifier {
            mSupportsTextureBlitting == aOther.mSupportsTextureBlitting &&
            mSupportsPartialUploads == aOther.mSupportsPartialUploads &&
            mSupportsComponentAlpha == aOther.mSupportsComponentAlpha &&
-           mUsingAdvancedLayers == aOther.mUsingAdvancedLayers &&
            mSyncHandle == aOther.mSyncHandle;
   }
 };

gfx/layers/ipc/CompositorBridgeParent.cpp

@@ -1084,11 +1084,6 @@ static CompositorOptionsChangeKind ClassifyCompositorOptionsChange(
   if (aOld == aNew) {
     return CompositorOptionsChangeKind::eSupported;
   }
-  if (aOld.UseAdvancedLayers() == aNew.UseAdvancedLayers() &&
-      aOld.InitiallyPaused() == aNew.InitiallyPaused()) {
-    // Only APZ enablement changed.
-    return CompositorOptionsChangeKind::eBestEffort;
-  }
   return CompositorOptionsChangeKind::eUnsupported;
 }
 

gfx/layers/ipc/LayersMessageUtils.h

@@ -494,7 +494,6 @@ struct ParamTraits<mozilla::layers::TextureFactoryIdentifier> {
     WriteParam(aMsg, aParam.mSupportsTextureBlitting);
     WriteParam(aMsg, aParam.mSupportsPartialUploads);
     WriteParam(aMsg, aParam.mSupportsComponentAlpha);
-    WriteParam(aMsg, aParam.mUsingAdvancedLayers);
     WriteParam(aMsg, aParam.mSyncHandle);
   }
 
@@ -513,7 +512,6 @@ struct ParamTraits<mozilla::layers::TextureFactoryIdentifier> {
         ReadParam(aMsg, aIter, &aResult->mSupportsTextureBlitting) &&
         ReadParam(aMsg, aIter, &aResult->mSupportsPartialUploads) &&
         ReadParam(aMsg, aIter, &aResult->mSupportsComponentAlpha) &&
-        ReadParam(aMsg, aIter, &aResult->mUsingAdvancedLayers) &&
         ReadParam(aMsg, aIter, &aResult->mSyncHandle);
     return result;
   }
@@ -848,7 +846,6 @@ struct ParamTraits<mozilla::layers::CompositorOptions> {
     WriteParam(aMsg, aParam.mUseSoftwareWebRender);
     WriteParam(aMsg, aParam.mAllowSoftwareWebRenderD3D11);
     WriteParam(aMsg, aParam.mAllowSoftwareWebRenderOGL);
-    WriteParam(aMsg, aParam.mUseAdvancedLayers);
     WriteParam(aMsg, aParam.mInitiallyPaused);
   }
 
@@ -858,7 +855,6 @@ struct ParamTraits<mozilla::layers::CompositorOptions> {
            ReadParam(aMsg, aIter, &aResult->mUseSoftwareWebRender) &&
            ReadParam(aMsg, aIter, &aResult->mAllowSoftwareWebRenderD3D11) &&
            ReadParam(aMsg, aIter, &aResult->mAllowSoftwareWebRenderOGL) &&
-           ReadParam(aMsg, aIter, &aResult->mUseAdvancedLayers) &&
            ReadParam(aMsg, aIter, &aResult->mInitiallyPaused);
   }
 };

gfx/tests/mochitest/test_acceleration.html

@@ -34,7 +34,6 @@ function runTest() {
   var windows = SpecialPowers.Services.ww.getWindowEnumerator();
   var windowutils;
   var acceleratedWindows = 0;
-  var advancedLayersWindows = 0;
   var webrenderWindows = 0;
   var layerManagerLog = [];
   while (windows.hasMoreElements()) {
@@ -47,11 +46,7 @@ function runTest() {
       if (layerManager.startsWith("WebRender")) {
         webrenderWindows++;
       }
-      if (windowutils.usingAdvancedLayers) {
-        advancedLayersWindows++;
-      }
-      layerManagerLog.push(layerManager + ":" +
-                           windowutils.usingAdvancedLayers);
+      layerManagerLog.push(layerManager);
     } catch (e) {
       // The window may not have a layer manager, in which case we get an error.
       // Don't count it as an accelerated window.
@@ -115,27 +110,6 @@ function runTest() {
         shouldGetWR = SpecialPowers.DOMWindowUtils.isWebRenderRequested;
       } catch (e) {}
 
-      var advancedLayersEnabled = false;
-      var advancedLayersEnabledOnWin7 = false;
-      try {
-        advancedLayersEnabled = SpecialPowers.getBoolPref("layers.mlgpu.enabled");
-        advancedLayersEnabledOnWin7 = SpecialPowers.getBoolPref("layers.mlgpu.enable-on-windows7");
-      } catch (e) {}
-      var shouldGetAL = advancedLayersEnabled;
-      if (version < 6.2) {
-        shouldGetAL &= advancedLayersEnabledOnWin7;
-      }
-      if (shouldGetWR) {
-        shouldGetAL = false;
-      }
-
-      if (shouldGetAL) {
-        isnot(advancedLayersWindows, 0, "Advanced Layers enabled on Windows; "
-                                        + layerManagerLog.join(","));
-      } else {
-        is(advancedLayersWindows, 0, "Advanced Layers disabled on Windows");
-      }
-
       if (shouldGetWR) {
         isnot(webrenderWindows, 0, "WebRender enabled on Windows");
       } else {

layout/reftests/border-radius/reftest.list

@@ -54,11 +54,11 @@ fuzzy(0-1,0-77) fuzzy-if(useDrawSnapshot,1-1,97-97) == clipping-5-refc.html clip
 fuzzy(0-21,0-76) fuzzy-if(winWidget,0-144,0-335) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == clipping-6.html clipping-6-ref.html # PaintedLayer and MaskLayer with transforms that aren't identical, bug 1392106
 fuzzy(0-28,0-97) == clipping-7.html clipping-7-ref.html # ColorLayer and MaskLayer with transforms that aren't identical. Reference image rendered without using layers (which causes fuzzy failures).
 fuzzy-if(/^Windows\x20NT\x206\.2/.test(http.oscpu),0-1,0-5) == clipping-and-zindex-1.html clipping-and-zindex-1-ref.html
-fuzzy-if(cocoaWidget,0-1,0-4) fuzzy-if(d2d,0-59,0-342) fuzzy-if(d3d11&&advancedLayers&&!d2d,0-30,0-3) == intersecting-clipping-1-canvas.html intersecting-clipping-1-refc.html
+fuzzy-if(cocoaWidget,0-1,0-4) fuzzy-if(d2d,0-59,0-342) == intersecting-clipping-1-canvas.html intersecting-clipping-1-refc.html
 == intersecting-clipping-1-image.html intersecting-clipping-1-refi.html
 == intersecting-clipping-1-overflow-hidden.html intersecting-clipping-1-ref.html
 fuzzy(0-1,0-300) == intersecting-clipping-1-refi.html intersecting-clipping-1-ref.html
-fuzzy(0-1,0-135) fuzzy-if(d3d11&&advancedLayers,0-81,0-353) skip-if(winWidget) fuzzy-if(useDrawSnapshot,1-1,299-299) == intersecting-clipping-1-refc.html intersecting-clipping-1-ref.html # bug 732535 # Disable on Windows bug 1451808
+fuzzy(0-1,0-135) skip-if(winWidget) fuzzy-if(useDrawSnapshot,1-1,299-299) == intersecting-clipping-1-refc.html intersecting-clipping-1-ref.html # bug 732535 # Disable on Windows bug 1451808
 
 == clipping-preserve-3d.html clipping-preserve-3d-ref.html
 

layout/tools/reftest/manifest.jsm

@@ -507,8 +507,6 @@ function BuildConditionSandbox(aURL) {
       g.windowUtils.layerManagerType.startsWith("WebRender");
     sandbox.layersOMTC =
       g.windowUtils.layerManagerRemote == true;
-    sandbox.advancedLayers =
-      g.windowUtils.usingAdvancedLayers == true;
     sandbox.layerChecksEnabled = !sandbox.webrender;
 
     // Shortcuts for widget toolkits.

toolkit/components/telemetry/docs/data/environment.rst

@@ -237,9 +237,6 @@ Structure:
               gpuProcess: { // Out-of-process compositing ("GPU process") feature
                 status: <string>, // "Available" means currently in use
               },
-              advancedLayers: { // Advanced Layers compositing. Only present if D3D11 enabled.
-                status: <string>,    // See the status codes above.
-              },
               hwCompositing: { // hardware acceleration. i.e. whether we try using the GPU
                 status: <string>
               },

toolkit/content/aboutSupport.js

@@ -638,9 +638,6 @@ var snapshotFormatters = {
     let compositor = "";
     if (data.windowLayerManagerRemote) {
       compositor = data.windowLayerManagerType;
-      if (data.windowUsingAdvancedLayers) {
-        compositor += " (Advanced Layers)";
-      }
     } else {
       let noOMTCString = await document.l10n.formatValue("main-thread-no-omtc");
       compositor = "BasicLayers (" + noOMTCString + ")";
@@ -651,7 +648,6 @@ var snapshotFormatters = {
     delete data.numTotalWindows;
     delete data.numAcceleratedWindows;
     delete data.numAcceleratedWindowsMessage;
-    delete data.windowUsingAdvancedLayers;
 
     addRow(
       "features",

toolkit/modules/Troubleshoot.jsm

@@ -549,7 +549,6 @@ var dataProviders = {
         data.numTotalWindows++;
         data.windowLayerManagerType = winUtils.layerManagerType;
         data.windowLayerManagerRemote = winUtils.layerManagerRemote;
-        data.windowUsingAdvancedLayers = winUtils.usingAdvancedLayers;
       } catch (e) {
         continue;
       }

toolkit/modules/tests/browser/browser_Troubleshoot.js

@@ -535,9 +535,6 @@ const SNAPSHOT_SCHEMA = {
         windowLayerManagerRemote: {
           type: "boolean",
         },
-        windowUsingAdvancedLayers: {
-          type: "boolean",
-        },
         numAcceleratedWindowsMessage: {
           type: "object",
           properties: {