diff --git a/dom/base/nsDOMWindowUtils.cpp b/dom/base/nsDOMWindowUtils.cpp index 0ed772e098d9..12cbf4139a2a 100644 --- a/dom/base/nsDOMWindowUtils.cpp +++ b/dom/base/nsDOMWindowUtils.cpp @@ -2330,26 +2330,6 @@ nsDOMWindowUtils::GetLayerManagerRemote(bool* retval) return NS_OK; } -NS_IMETHODIMP -nsDOMWindowUtils::GetUsingAdvancedLayers(bool* retval) -{ - nsCOMPtr widget = GetWidget(); - if (!widget) { - return NS_ERROR_FAILURE; - } - - LayerManager *mgr = widget->GetLayerManager(); - if (!mgr) { - return NS_ERROR_FAILURE; - } - - *retval = false; - if (KnowsCompositor* fwd = mgr->AsKnowsCompositor()) { - *retval = fwd->GetTextureFactoryIdentifier().mUsingAdvancedLayers; - } - return NS_OK; -} - NS_IMETHODIMP nsDOMWindowUtils::GetSupportsHardwareH264Decoding(JS::MutableHandle aPromise) { diff --git a/dom/interfaces/base/nsIDOMWindowUtils.idl b/dom/interfaces/base/nsIDOMWindowUtils.idl index ccc2dfa09f2a..8df27b017c87 100644 --- a/dom/interfaces/base/nsIDOMWindowUtils.idl +++ b/dom/interfaces/base/nsIDOMWindowUtils.idl @@ -1416,11 +1416,6 @@ interface nsIDOMWindowUtils : nsISupports { */ readonly attribute boolean layerManagerRemote; - /** - * True if advanced layers is enabled on this window, false otherwise. - */ - readonly attribute boolean usingAdvancedLayers; - /** * Returns a Promise that will be resolved with a string once the capabilities * of the h264 decoder have been determined. diff --git a/gfx/layers/CompositorTypes.h b/gfx/layers/CompositorTypes.h index 4b0e4c1b5102..fd67cbedf265 100644 --- a/gfx/layers/CompositorTypes.h +++ b/gfx/layers/CompositorTypes.h @@ -175,7 +175,6 @@ struct TextureFactoryIdentifier bool mSupportsPartialUploads; bool mSupportsComponentAlpha; bool mSupportsBackdropCopyForComponentAlpha; - bool mUsingAdvancedLayers; SyncHandle mSyncHandle; explicit TextureFactoryIdentifier(LayersBackend aLayersBackend = LayersBackend::LAYERS_NONE, @@ -194,7 +193,6 @@ struct TextureFactoryIdentifier , mSupportsPartialUploads(aSupportsPartialUploads) , mSupportsComponentAlpha(aSupportsComponentAlpha) , mSupportsBackdropCopyForComponentAlpha(true) - , mUsingAdvancedLayers(false) , mSyncHandle(aSyncHandle) {} }; diff --git a/gfx/layers/ipc/LayersMessageUtils.h b/gfx/layers/ipc/LayersMessageUtils.h index 81bc9b9a3204..d6869875c5fd 100644 --- a/gfx/layers/ipc/LayersMessageUtils.h +++ b/gfx/layers/ipc/LayersMessageUtils.h @@ -304,7 +304,6 @@ struct ParamTraits WriteParam(aMsg, aParam.mSupportsPartialUploads); WriteParam(aMsg, aParam.mSupportsComponentAlpha); WriteParam(aMsg, aParam.mSupportsBackdropCopyForComponentAlpha); - WriteParam(aMsg, aParam.mUsingAdvancedLayers); WriteParam(aMsg, aParam.mSyncHandle); } @@ -318,7 +317,6 @@ struct ParamTraits ReadParam(aMsg, aIter, &aResult->mSupportsPartialUploads) && ReadParam(aMsg, aIter, &aResult->mSupportsComponentAlpha) && ReadParam(aMsg, aIter, &aResult->mSupportsBackdropCopyForComponentAlpha) && - ReadParam(aMsg, aIter, &aResult->mUsingAdvancedLayers) && ReadParam(aMsg, aIter, &aResult->mSyncHandle); return result; } diff --git a/gfx/layers/mlgpu/LayerManagerMLGPU.cpp b/gfx/layers/mlgpu/LayerManagerMLGPU.cpp index 34af706ba426..e04c002ca4d7 100644 --- a/gfx/layers/mlgpu/LayerManagerMLGPU.cpp +++ b/gfx/layers/mlgpu/LayerManagerMLGPU.cpp @@ -183,7 +183,6 @@ LayerManagerMLGPU::GetTextureFactoryIdentifier() ident = mDevice->GetTextureFactoryIdentifier(); } ident.mSupportsBackdropCopyForComponentAlpha = SupportsBackdropCopyForComponentAlpha(); - ident.mUsingAdvancedLayers = true; return ident; } diff --git a/toolkit/content/aboutSupport.js b/toolkit/content/aboutSupport.js index dcb3a477bd78..e3ca404f0709 100644 --- a/toolkit/content/aboutSupport.js +++ b/toolkit/content/aboutSupport.js @@ -393,22 +393,16 @@ var snapshotFormatters = { } // graphics-features-tbody - let compositor = ""; - if (data.windowLayerManagerRemote) { - compositor = data.windowLayerManagerType; - if (data.windowUsingAdvancedLayers) { - compositor += " (Advanced Layers)"; - } - } else { - compositor = "BasicLayers (" + strings.GetStringFromName("mainThreadNoOMTC") + ")"; - } + + let compositor = data.windowLayerManagerRemote + ? data.windowLayerManagerType + : "BasicLayers (" + strings.GetStringFromName("mainThreadNoOMTC") + ")"; addRow("features", "compositing", compositor); delete data.windowLayerManagerRemote; delete data.windowLayerManagerType; delete data.numTotalWindows; delete data.numAcceleratedWindows; delete data.numAcceleratedWindowsMessage; - delete data.windowUsingAdvancedLayers; addRow("features", "asyncPanZoom", apzInfo.length diff --git a/toolkit/modules/Troubleshoot.jsm b/toolkit/modules/Troubleshoot.jsm index dc70dd12043c..c214b9a3ede8 100644 --- a/toolkit/modules/Troubleshoot.jsm +++ b/toolkit/modules/Troubleshoot.jsm @@ -365,7 +365,6 @@ var dataProviders = { data.numTotalWindows++; data.windowLayerManagerType = winUtils.layerManagerType; data.windowLayerManagerRemote = winUtils.layerManagerRemote; - data.windowUsingAdvancedLayers = winUtils.usingAdvancedLayers; } catch (e) { continue; } diff --git a/toolkit/modules/tests/browser/browser_Troubleshoot.js b/toolkit/modules/tests/browser/browser_Troubleshoot.js index 25fd42801c9d..0d671567b37c 100644 --- a/toolkit/modules/tests/browser/browser_Troubleshoot.js +++ b/toolkit/modules/tests/browser/browser_Troubleshoot.js @@ -252,9 +252,6 @@ const SNAPSHOT_SCHEMA = { windowLayerManagerRemote: { type: "boolean", }, - windowUsingAdvancedLayers: { - type: "boolean", - }, currentAudioBackend: { type: "string", },