diff --git a/browser/extensions/report-site-issue/background.js b/browser/extensions/report-site-issue/background.js index 9662f378464c..f4039db9bf43 100644 --- a/browser/extensions/report-site-issue/background.js +++ b/browser/extensions/report-site-issue/background.js @@ -188,7 +188,7 @@ async function openWebCompatTab(compatInfo) { } delete details.frameworks; - if (details["gfx.webrender.all"] || details["gfx.webrender.enabled"]) { + if (details["gfx.webrender.all"]) { params.extra_labels.push("type-webrender-enabled"); } if (compatInfo.hasTrackingContentBlocked) { diff --git a/browser/extensions/report-site-issue/experimentalAPIs/browserInfo.js b/browser/extensions/report-site-issue/experimentalAPIs/browserInfo.js index 661423f187cd..ca444692dcce 100644 --- a/browser/extensions/report-site-issue/experimentalAPIs/browserInfo.js +++ b/browser/extensions/report-site-issue/experimentalAPIs/browserInfo.js @@ -125,7 +125,6 @@ this.browserInfo = class extends ExtensionAPI { "layers.acceleration.force-enabled": false, "gfx.webrender.all": false, "gfx.webrender.blob-images": true, - "gfx.webrender.enabled": false, })) { prefs[name] = Services.prefs.getBoolPref(name, dflt); } diff --git a/browser/extensions/report-site-issue/test/browser/browser_report_site_issue.js b/browser/extensions/report-site-issue/test/browser/browser_report_site_issue.js index 637a1bc987aa..7c40429aa604 100644 --- a/browser/extensions/report-site-issue/test/browser/browser_report_site_issue.js +++ b/browser/extensions/report-site-issue/test/browser/browser_report_site_issue.js @@ -204,10 +204,6 @@ add_task(async function test_opened_page() { typeof details["gfx.webrender.blob-images"] == "boolean", "Details has gfx.webrender.blob-images." ); - ok( - typeof details["gfx.webrender.enabled"] == "boolean", - "Details has gfx.webrender.enabled." - ); is( preview.innerText, diff --git a/gfx/thebes/gfxPlatform.cpp b/gfx/thebes/gfxPlatform.cpp index 989e4f6a570d..ddf4dfb0cbb8 100644 --- a/gfx/thebes/gfxPlatform.cpp +++ b/gfx/thebes/gfxPlatform.cpp @@ -2574,8 +2574,7 @@ void gfxPlatform::InitCompositorAccelerationPrefs() { /*static*/ bool gfxPlatform::WebRenderPrefEnabled() { - return StaticPrefs::gfx_webrender_all_AtStartup() || - StaticPrefs::gfx_webrender_enabled_AtStartup_DoNotUseDirectly(); + return StaticPrefs::gfx_webrender_all_AtStartup(); } /*static*/ diff --git a/gfx/webrender_bindings/README.webrender b/gfx/webrender_bindings/README.webrender index a42c33092df4..e4c0d5f60b1e 100644 --- a/gfx/webrender_bindings/README.webrender +++ b/gfx/webrender_bindings/README.webrender @@ -7,7 +7,7 @@ To build and run WebRender in Gecko: 2. Build using |mach build|. You don't need anything special in your mozconfig for local builds; webrender will be built by default. 3. Run with |MOZ_WEBRENDER=1| in your environment. e.g. |MOZ_WEBRENDER=1 ./mach run|. - Alternatively, you can set the gfx.webrender.enabled pref to true (browser restart required). + Alternatively, you can set the gfx.webrender.all pref to true (browser restart required). Note that on Linux, acceleration is disabled by default and it needs to be enabled for WebRender to work. On Linux you can enable acceleration by putting |MOZ_ACCELERATED=1| in your environment, or setting layers.acceleration.force-enabled to true in about:config. 4. Verify WebRender is enabled. You can do this by going to about:support and checking the "Compositing" line in the Graphics section. It should say "WebRender". diff --git a/layout/svg/crashtests/invalid_url.html b/layout/svg/crashtests/invalid_url.html index ac8671b1ce0e..fdd0ee6d89a6 100644 --- a/layout/svg/crashtests/invalid_url.html +++ b/layout/svg/crashtests/invalid_url.html @@ -3,8 +3,7 @@
diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml index 5b9767bc6dbe..5e355bfb63f8 100644 --- a/modules/libpref/init/StaticPrefList.yaml +++ b/modules/libpref/init/StaticPrefList.yaml @@ -6382,21 +6382,12 @@ value: false mirror: once -# We expose two prefs: gfx.webrender.all and gfx.webrender.enabled. -# The first enables WR+additional features, and the second just enables WR. -# For developer convenience, building with --enable-webrender=true or just -# --enable-webrender will set gfx.webrender.enabled to true by default. +# Whether to use the WebRender hardware backend - name: gfx.webrender.all type: bool value: false mirror: once -- name: gfx.webrender.enabled - type: bool - value: false - mirror: once - do_not_use_directly: true - #ifdef XP_WIN - name: gfx.webrender.force-angle type: bool