diff --git a/layout/reftests/canvas/reftest.list b/layout/reftests/canvas/reftest.list index 682c654c9d8a..41a9a0f918fa 100644 --- a/layout/reftests/canvas/reftest.list +++ b/layout/reftests/canvas/reftest.list @@ -3,7 +3,7 @@ fuzzy-if(Android,8,1000) == size-1.html size-1-ref.html == empty-transaction-1.html empty-transaction-1-ref.html -fails-if(webrender&&!gtkWidget) == image-rendering-test.html image-rendering-ref.html +fails-if(webrender&&winWidget) == image-rendering-test.html image-rendering-ref.html == image-shadow.html image-shadow-ref.html asserts-if(cocoaWidget,0-2) == size-change-1.html size-change-1-ref.html diff --git a/layout/reftests/css-gradients/reftest.list b/layout/reftests/css-gradients/reftest.list index d5ec9976c68d..e6c2c037a61c 100644 --- a/layout/reftests/css-gradients/reftest.list +++ b/layout/reftests/css-gradients/reftest.list @@ -1,5 +1,5 @@ fuzzy-if(!contentSameGfxBackendAsCanvas,4,88500) fuzzy-if(azureSkiaGL||skiaContent,4,89700) == linear-1a.html linear-1-ref.html -fuzzy-if(!contentSameGfxBackendAsCanvas,2,88500) fuzzy-if(azureSkiaGL,2,89997) fuzzy-if(skiaContent,1,16000) fuzzy-if(webrender,1,23905) == linear-keywords-1a.html linear-keywords-1-ref.html +fuzzy-if(!contentSameGfxBackendAsCanvas,2,88500) fuzzy-if(azureSkiaGL,2,89997) fuzzy-if(skiaContent,1,16000) fuzzy-if(webrender,1,23918) == linear-keywords-1a.html linear-keywords-1-ref.html == linear-diagonal-1a.html linear-diagonal-1-ref.html == linear-diagonal-2a.html linear-diagonal-2-ref.html == linear-diagonal-3a.html linear-diagonal-3-ref.html diff --git a/mobile/android/app/mobile.js b/mobile/android/app/mobile.js index 778982e28232..0903d2f83b76 100644 --- a/mobile/android/app/mobile.js +++ b/mobile/android/app/mobile.js @@ -704,9 +704,9 @@ pref("dom.phonenumber.substringmatching.BR", 8); pref("dom.phonenumber.substringmatching.CO", 10); pref("dom.phonenumber.substringmatching.VE", 7); -// Enable hardware-accelerated Skia canvas +// Support, but deprecate, hardware-accelerated Skia canvas pref("gfx.canvas.azure.backends", "skia"); -pref("gfx.canvas.azure.accelerated", true); +pref("gfx.canvas.azure.accelerated", false); pref("gfx.canvas.azure.accelerated.limit", 64); // See ua-update.json.in for the packaged UA override list diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js index 2cedb0a715e6..2a9d307e5f5b 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js @@ -814,8 +814,6 @@ pref("gfx.content.azure.backends", "direct2d1.1,skia,cairo"); #ifdef XP_MACOSX pref("gfx.content.azure.backends", "skia"); pref("gfx.canvas.azure.backends", "skia"); -// Accelerated cg canvas where available (10.7+) -pref("gfx.canvas.azure.accelerated", true); #else pref("gfx.canvas.azure.backends", "skia"); pref("gfx.content.azure.backends", "skia"); diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/too_many_cues.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/too_many_cues.html.ini index 7fa53c034cf8..9357769599b9 100644 --- a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/too_many_cues.html.ini +++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/too_many_cues.html.ini @@ -1,4 +1,3 @@ [too_many_cues.html] expected: - if (os == "mac") and (processor == "x86_64") and (bits == 64): PASS FAIL