corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backed out changeset 2f15b6efa248 (bug 1910138) for causing reftest failures CLOSED TREE

Browse Source
This commit is contained in:
Sandor Molnar
2024-07-27 12:13:07 +03:00
parent eca69e46cb
commit 43188bc6ac
11 changed files with 28 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gfx/ipc/CanvasRenderThread.cpp
View File

@@ -53,13 +53,8 @@ void CanvasRenderThread::Start() {
sCanvasRenderThreadEverStarted = true; sCanvasRenderThreadEverStarted = true;
#endif #endif
// If remote canvas is disabled, then ignore the worker threads setting so as
// not to interfere with Accelerated Canvas2D.
int32_t threadPref = int32_t threadPref =
gfxVars::RemoteCanvasEnabled() StaticPrefs::gfx_canvas_remote_worker_threads_AtStartup();
? StaticPrefs::gfx_canvas_remote_worker_threads_AtStartup()
: 0;
uint32_t threadLimit; uint32_t threadLimit;
if (threadPref < 0) { if (threadPref < 0) {
// Given that the canvas workers are receiving instructions from // Given that the canvas workers are receiving instructions from

2
gfx/tests/reftest/reftest.list
View File

@@ -42,7 +42,7 @@ pref(layout.css.backdrop-filter.enabled,true) == 1765862.html 1765862-ref.html
== 1801588-1.html 1801588-1-ref.html == 1801588-1.html 1801588-1-ref.html
skip-if(!cocoaWidget) != 1806140.html 1806140-notref.html skip-if(!cocoaWidget) != 1806140.html 1806140-notref.html
fuzzy(0-1,0-240) == 1812341.html 1812341-ref.html fuzzy(0-1,0-240) == 1812341.html 1812341-ref.html
random-if(gtkWidget) fuzzy-if(Android,0-125,0-106) fuzzy-if(winWidget,0-255,0-44) == 1845828-1.html 1845828-1-ref.html # Result on Linux depends on font configuration/hinting/etc, affecting whether subpixel positioning is used random-if(gtkWidget) fuzzy-if(Android,0-125,0-106) == 1845828-1.html 1845828-1-ref.html # Result on Linux depends on font configuration/hinting/etc, affecting whether subpixel positioning is used
fuzzy-if(!winWidget,0-1,0-4) fuzzy-if(winWidget,14-14,245-314) == 1853216-1.html 1853216-1-ref.html fuzzy-if(!winWidget,0-1,0-4) fuzzy-if(winWidget,14-14,245-314) == 1853216-1.html 1853216-1-ref.html
fuzzy-if(winWidget,0-1,0-13) == 1873708-emoji-canvas-filter.html 1873708-emoji-canvas-filter-ref.html fuzzy-if(winWidget,0-1,0-13) == 1873708-emoji-canvas-filter.html 1873708-emoji-canvas-filter-ref.html
!= 1870240-colrv1-cycle.html 1870240-colrv1-cycle-notref.html != 1870240-colrv1-cycle.html 1870240-colrv1-cycle-notref.html

18
gfx/thebes/gfxPlatform.cpp
View File

@@ -2517,17 +2517,6 @@ void gfxPlatform::InitAcceleration() {
"FEATURE_REMOTE_CANVAS_NO_GPU_PROCESS"_ns); "FEATURE_REMOTE_CANVAS_NO_GPU_PROCESS"_ns);
} }
#if defined(XP_WIN) && defined(NIGHTLY_BUILD)
// If D2D is explicitly disabled on Windows, then don't use remote canvas.
// This prevents it from interfering with Accelerated Canvas2D.
if (StaticPrefs::gfx_direct2d_disabled_AtStartup() &&
!StaticPrefs::gfx_direct2d_force_enabled_AtStartup()) {
gfxConfig::ForceDisable(Feature::REMOTE_CANVAS, FeatureStatus::Blocked,
"Disabled without Directed2D",
"FEATURE_REMOTE_CANVAS_NO_DIRECT2D"_ns);
}
#endif
#ifndef XP_WIN #ifndef XP_WIN
gfxConfig::ForceDisable(Feature::REMOTE_CANVAS, FeatureStatus::Blocked, gfxConfig::ForceDisable(Feature::REMOTE_CANVAS, FeatureStatus::Blocked,
"Platform not supported", "Platform not supported",
@@ -3336,9 +3325,10 @@ static void AcceleratedCanvas2DPrefChangeCallback(const char*, void*) {
feature.Disable(FeatureStatus::Blocklisted, message.get(), failureId); feature.Disable(FeatureStatus::Blocklisted, message.get(), failureId);
} }
if (gfxVars::RemoteCanvasEnabled()) { if (StaticPrefs::gfx_canvas_remote_worker_threads_AtStartup() != 0) {
feature.ForceDisable(FeatureStatus::Failed, "Disabled by Remote Canvas", feature.ForceDisable(FeatureStatus::Failed,
"FEATURE_FAILURE_DISABLED_BY_REMOTE_CANVAS"_ns); "Disabled with non-zero canvas worker threads",
"FEATURE_FAILURE_DISABLE_BY_CANVAS_WORKER_THREADS"_ns);
} }
gfxVars::SetUseAcceleratedCanvas2D(feature.IsEnabled()); gfxVars::SetUseAcceleratedCanvas2D(feature.IsEnabled());

10
layout/reftests/backgrounds/reftest.list
View File

@@ -171,11 +171,11 @@ fuzzy(0-31,0-474) fails-if(useDrawSnapshot) == background-tiling-zoom-1.html bac
skip-if(!cocoaWidget) == background-repeat-resampling.html background-repeat-resampling-ref.html skip-if(!cocoaWidget) == background-repeat-resampling.html background-repeat-resampling-ref.html
fuzzy(0-102,0-2811) fuzzy-if(winWidget,147-153,2866-2866) == background-clip-text-1a.html background-clip-text-1-ref.html # Bug 1392106 fuzzy(0-102,0-2811) fuzzy-if(winWidget,153-153,2866-2866) == background-clip-text-1a.html background-clip-text-1-ref.html # Bug 1392106
fuzzy(0-102,0-2811) fuzzy-if(winWidget,147-153,2866-2866) == background-clip-text-1b.html background-clip-text-1-ref.html # Bug 1392106 fuzzy(0-102,0-2811) fuzzy-if(winWidget,153-153,2866-2866) == background-clip-text-1b.html background-clip-text-1-ref.html # Bug 1392106
fuzzy(0-102,0-2811) fuzzy-if(winWidget,147-153,2866-2866) == background-clip-text-1c.html background-clip-text-1-ref.html # Bug 1392106 fuzzy(0-102,0-2811) fuzzy-if(winWidget,153-153,2866-2866) == background-clip-text-1c.html background-clip-text-1-ref.html # Bug 1392106
fuzzy(0-102,0-2811) fuzzy-if(winWidget,147-153,2866-2866) == background-clip-text-1d.html background-clip-text-1-ref.html # Bug 1392106 fuzzy(0-102,0-2811) fuzzy-if(winWidget,153-153,2866-2866) == background-clip-text-1d.html background-clip-text-1-ref.html # Bug 1392106
fuzzy(0-102,0-2811) fuzzy-if(winWidget,147-153,2866-2866) == background-clip-text-1e.html background-clip-text-1-ref.html # Bug 1392106 fuzzy(0-102,0-2811) fuzzy-if(winWidget,153-153,2866-2866) == background-clip-text-1e.html background-clip-text-1-ref.html # Bug 1392106
== background-clip-text-2.html background-clip-text-2-ref.html == background-clip-text-2.html background-clip-text-2-ref.html

6
layout/reftests/bugs/reftest.list
View File

@@ -920,7 +920,7 @@ fuzzy-if(winWidget,0-123,0-1600) fuzzy-if(swgl,0-1,0-39) == 409659-1a.html 40965
fuzzy-if(winWidget,0-123,0-1900) fuzzy-if(swgl,0-1,0-39) == 409659-1d.html 409659-1-ref.html # Bug 1128229 fuzzy-if(winWidget,0-123,0-1900) fuzzy-if(swgl,0-1,0-39) == 409659-1d.html 409659-1-ref.html # Bug 1128229
== 410621-1.html 410621-1-ref.html == 410621-1.html 410621-1-ref.html
pref(layout.css.letter-spacing.model,0) == 411059-1.html 411059-1-ref.html pref(layout.css.letter-spacing.model,0) == 411059-1.html 411059-1-ref.html
fuzzy-if(winWidget,46-144,652-770) == 411334-1.xml 411334-1-ref.xml fuzzy-if(winWidget,46-129,652-770) == 411334-1.xml 411334-1-ref.xml
== 411585-1.html 411585-1-ref.html == 411585-1.html 411585-1-ref.html
== 411585-2.html 411585-2-ref.html == 411585-2.html 411585-2-ref.html
fails == 411585-3.html 411585-3-ref.html # bug 426909 fails == 411585-3.html 411585-3-ref.html # bug 426909
@@ -2096,7 +2096,7 @@ skip-if(Android) == 1727172-1.xhtml 1727172-1-ref.html
== 1726663-1.html 1726663-1-ref.html == 1726663-1.html 1726663-1-ref.html
== 1727016-1.html 1727016-1-ref.html == 1727016-1.html 1727016-1-ref.html
!= 1730314-1.html 1730314-1-ref.html != 1730314-1.html 1730314-1-ref.html
fuzzy(0-3,0-19) fuzzy-if(Android,0-11,0-1901) fuzzy-if(winWidget,0-154,0-350) fuzzy-if(cocoaWidget,0-23,0-230) == 1738700-1.html 1738700-1-ref.html fuzzy(0-3,0-19) fuzzy-if(Android,0-11,0-1901) fuzzy-if(winWidget,0-154,0-340) fuzzy-if(cocoaWidget,0-23,0-230) == 1738700-1.html 1738700-1-ref.html
# Have to skip android because it doesn't set up example.org as a local host, # Have to skip android because it doesn't set up example.org as a local host,
# so the test crashes there. # so the test crashes there.
@@ -2134,7 +2134,7 @@ pref(layout.css.prefers-color-scheme.content-override,2) == 1787127.html 1787127
skip-if(!winWidget) == 1798297-1.html 1798297-1-ref.html skip-if(!winWidget) == 1798297-1.html 1798297-1-ref.html
skip-if(!winWidget) != 1798297-1.html 1798297-1-notref.html skip-if(!winWidget) != 1798297-1.html 1798297-1-notref.html
== 1799425-1.html 1799425-1-ref.html == 1799425-1.html 1799425-1-ref.html
fuzzy-if(winWidget,111-114,572-572) == 1800437-1.html 1800437-1-ref.html fuzzy-if(winWidget,114-114,572-572) == 1800437-1.html 1800437-1-ref.html
== 1803999-1.html 1803999-1-ref.html == 1803999-1.html 1803999-1-ref.html
# testing the same bug but we can hit it via a few different code paths, 1 is raster image, 2 is vector image, 3 is vector image with an image restriction region # testing the same bug but we can hit it via a few different code paths, 1 is raster image, 2 is vector image, 3 is vector image with an image restriction region
pref(image.downscale-during-decode.enabled,true) == 1804872-1.html 1804872-1-ref.html pref(image.downscale-during-decode.enabled,true) == 1804872-1.html 1804872-1-ref.html

2
layout/reftests/canvas/reftest.list
View File

@@ -103,7 +103,7 @@ fuzzy(0-1,0-43) == 1201272-1.html 1201272-1-ref.html
== 1238795-1.html 1238795-1-ref.html == 1238795-1.html 1238795-1-ref.html
== 1303534-1.html 1303534-1-ref.html == 1303534-1.html 1303534-1-ref.html
fuzzy-if(cocoaWidget,0-1,0-1410) fuzzy-if(winWidget,0-1,0-1410) == 1304353-text-global-alpha-1.html 1304353-text-global-alpha-1-ref.html fuzzy-if(cocoaWidget,0-1,0-1410) == 1304353-text-global-alpha-1.html 1304353-text-global-alpha-1-ref.html
fuzzy(0-1,0-1410) == 1304353-text-global-alpha-2.html 1304353-text-global-alpha-2-ref.html fuzzy(0-1,0-1410) == 1304353-text-global-alpha-2.html 1304353-text-global-alpha-2-ref.html
fuzzy-if(winWidget,0-94,0-1575) fuzzy-if(cocoaWidget,0-1,0-34) == 1304353-text-global-composite-op-1.html 1304353-text-global-composite-op-1-ref.html fuzzy-if(winWidget,0-94,0-1575) fuzzy-if(cocoaWidget,0-1,0-34) == 1304353-text-global-composite-op-1.html 1304353-text-global-composite-op-1-ref.html

4
layout/reftests/image-element/reftest.list
View File

@@ -5,9 +5,9 @@ random == bug-364968.html bug-364968-ref.html
== mozsetimageelement-02.html about:blank == mozsetimageelement-02.html about:blank
== image-outside-document-invalidate.html about:blank == image-outside-document-invalidate.html about:blank
== canvas-outside-document-invalidate-01.html about:blank == canvas-outside-document-invalidate-01.html about:blank
fails-if(!winWidget) fails-if(winWidget&&(swgl||!d2d)) == canvas-outside-document-invalidate-02.html about:blank # See bug 666800 fails-if(!winWidget) fails-if(swgl&&winWidget) == canvas-outside-document-invalidate-02.html about:blank # See bug 666800
#fails with Skia due to Skia bug http://code.google.com/p/skia/issues/detail?id=568 #fails with Skia due to Skia bug http://code.google.com/p/skia/issues/detail?id=568
fuzzy-if(winWidget,47-132,47-54) == element-paint-simple.html element-paint-simple-ref.html fuzzy-if(winWidget,47-129,47-54) == element-paint-simple.html element-paint-simple-ref.html
== element-paint-repeated.html element-paint-repeated-ref.html == element-paint-repeated.html element-paint-repeated-ref.html
== element-paint-recursion.html element-paint-recursion-ref.html == element-paint-recursion.html element-paint-recursion-ref.html
== element-paint-continuation.html element-paint-continuation-ref.html == element-paint-continuation.html element-paint-continuation-ref.html

2
layout/reftests/svg/as-image/reftest.list
View File

@@ -41,7 +41,7 @@ fuzzy(0-192,0-2151) == canvas-drawImage-scale-2b.html canvas-drawImage-scale-2-r
fuzzy(0-1,0-10000) == canvas-drawImage-alpha-1.html canvas-drawImage-alpha-1-ref.html fuzzy(0-1,0-10000) == canvas-drawImage-alpha-1.html canvas-drawImage-alpha-1-ref.html
#Same as scale-2a but with globalAlpha: #Same as scale-2a but with globalAlpha:
fuzzy(0-1,0-40000) fuzzy-if(winWidget&&!swgl,1-73,180-40000) fuzzy-if(Android&&device,0-48,0-39989) == canvas-drawImage-alpha-2.html canvas-drawImage-alpha-2-ref.html fuzzy(0-1,0-40000) fuzzy-if(winWidget&&!swgl,1-73,600-40000) fuzzy-if(Android&&device,0-48,0-39989) == canvas-drawImage-alpha-2.html canvas-drawImage-alpha-2-ref.html
== canvas-drawImage-slice-1a.html lime100x100-ref.html == canvas-drawImage-slice-1a.html lime100x100-ref.html
== canvas-drawImage-slice-1b.html lime100x100-ref.html == canvas-drawImage-slice-1b.html lime100x100-ref.html

2
layout/reftests/svg/filters/reftest.list
View File

@@ -113,7 +113,7 @@ fuzzy(0-1,0-400) == feDisplacementMap-alpha-01.svg pass.svg
fuzzy(0-2,0-500) == feDisplacementMap-colour-01.svg feDisplacementMap-colour-01-ref.svg fuzzy(0-2,0-500) == feDisplacementMap-colour-01.svg feDisplacementMap-colour-01-ref.svg
== feDisplacementMap-scale-01.svg pass.svg == feDisplacementMap-scale-01.svg pass.svg
fuzzy-if(winWidget,0-2,0-25) fuzzy-if(!useDrawSnapshot,55-98,14033-16467) fuzzy-if(gfxSVGFEDropShadow&&!gfxSVGFEOffset,97-98,21500-22951) fuzzy-if(gfxSVGFEOffset,0-2,0-1000000) == feDropShadow-01.svg feDropShadow-01-ref.svg fuzzy-if(winWidget,0-2,0-25) fuzzy-if(!useDrawSnapshot,55-98,14033-16467) fuzzy-if(gfxSVGFEDropShadow&&!gfxSVGFEOffset,97-98,21507-22951) fuzzy-if(gfxSVGFEOffset,0-2,0-1000000) == feDropShadow-01.svg feDropShadow-01-ref.svg
== feFlood-color-01.svg pass.svg == feFlood-color-01.svg pass.svg

16
layout/reftests/svg/text/reftest.list
View File

@@ -1,6 +1,6 @@
fuzzy-if(winWidget,47-132,221-254) == simple.svg simple-ref.html fuzzy-if(winWidget,47-127,221-254) == simple.svg simple-ref.html
== simple-2.svg simple.svg == simple-2.svg simple.svg
fuzzy-if(winWidget,47-132,221-254) == simple-underline.svg simple-underline-ref.html fuzzy-if(winWidget,47-127,221-254) == simple-underline.svg simple-underline-ref.html
== simple-underline-scaled.svg simple-underline-scaled-ref.svg == simple-underline-scaled.svg simple-underline-scaled-ref.svg
fuzzy-if(winWidget,47-166,255-318) fuzzy-if(cocoaWidget,0-1,0-1) == simple-anchor-end-bidi.svg simple-anchor-end-bidi-ref.html fuzzy-if(winWidget,47-166,255-318) fuzzy-if(cocoaWidget,0-1,0-1) == simple-anchor-end-bidi.svg simple-anchor-end-bidi-ref.html
fuzzy-if(winWidget,47-139,181-204) == simple-anchor-end-rtl.svg simple-anchor-end-rtl-ref.html fuzzy-if(winWidget,47-139,181-204) == simple-anchor-end-rtl.svg simple-anchor-end-rtl-ref.html
@@ -30,7 +30,7 @@ fuzzy-if(winWidget,47-129,221-254) fuzzy-if(cocoaWidget,23-65,195-196) == simple
== simple-fill-none.svg simple.svg == simple-fill-none.svg simple.svg
== simple-pointer-events.svg simple.svg == simple-pointer-events.svg simple.svg
fuzzy-if(winWidget,47-132,221-254) == simple-multiple-dx.svg simple-multiple-dx-ref.html fuzzy-if(winWidget,47-127,221-254) == simple-multiple-dx.svg simple-multiple-dx-ref.html
== simple-multiple-dx-2.svg simple-multiple-dx.svg == simple-multiple-dx-2.svg simple-multiple-dx.svg
== simple-multiple-dx-anchor-end-bidi.svg simple-multiple-dx-anchor-end-bidi-ref.svg == simple-multiple-dx-anchor-end-bidi.svg simple-multiple-dx-anchor-end-bidi-ref.svg
== simple-multiple-dx-anchor-middle-bidi.svg simple-multiple-dx-anchor-middle-bidi-ref.svg == simple-multiple-dx-anchor-middle-bidi.svg simple-multiple-dx-anchor-middle-bidi-ref.svg
@@ -200,11 +200,11 @@ needs-focus == deselectAll.svg deselectAll-ref.svg
fuzzy(0-1,0-250) needs-focus == selectSubString.svg selectSubString-ref.svg fuzzy(0-1,0-250) needs-focus == selectSubString.svg selectSubString-ref.svg
fuzzy(0-1,0-600) needs-focus == selectSubString-2.svg selectSubString-2-ref.svg fuzzy(0-1,0-600) needs-focus == selectSubString-2.svg selectSubString-2-ref.svg
fuzzy(0-1,0-250) needs-focus == selectSubString-3.svg selectSubString-3-ref.svg fuzzy(0-1,0-250) needs-focus == selectSubString-3.svg selectSubString-3-ref.svg
fuzzy-if(!geckoview,0-1,0-237) needs-focus fuzzy-if(winWidget,55-163,200-254) == simple-selection.svg simple-selection-ref.html fuzzy-if(!geckoview,0-1,0-237) needs-focus fuzzy-if(winWidget,55-148,200-254) == simple-selection.svg simple-selection-ref.html
fuzzy(0-1,0-575) needs-focus fuzzy-if(winWidget,55-163,200-318) == simple-bidi-selection.svg simple-bidi-selection-ref.html fuzzy(0-1,0-575) needs-focus fuzzy-if(winWidget,55-148,200-318) == simple-bidi-selection.svg simple-bidi-selection-ref.html
fuzzy(0-1,0-237) needs-focus fuzzy-if(winWidget,55-163,200-254) fuzzy-if(cocoaWidget,1-65,19-196) == simple-fill-color-selection.svg simple-fill-color-selection-ref.html fuzzy(0-1,0-237) needs-focus fuzzy-if(winWidget,55-148,200-254) fuzzy-if(cocoaWidget,1-65,19-196) == simple-fill-color-selection.svg simple-fill-color-selection-ref.html
fuzzy(0-1,0-222) needs-focus fuzzy-if(winWidget,125-163,221-254) == simple-underline-selection.svg simple-underline-selection-ref.html # Bug 1392106 fuzzy(0-1,0-222) needs-focus fuzzy-if(winWidget,125-148,221-254) == simple-underline-selection.svg simple-underline-selection-ref.html # Bug 1392106
fuzzy(0-1,0-934) needs-focus fuzzy-if(Android13,0-3,0-926) fuzzy-if(winWidget,134-163,432-501) == multiple-text-selection.svg multiple-text-selection-ref.html # Bug 1392106 fuzzy(0-1,0-934) needs-focus fuzzy-if(Android13,0-3,0-926) fuzzy-if(winWidget,134-152,432-501) == multiple-text-selection.svg multiple-text-selection-ref.html # Bug 1392106
needs-focus == multiple-chunks-selection.svg multiple-chunks-selection-ref.svg needs-focus == multiple-chunks-selection.svg multiple-chunks-selection-ref.svg
fuzzy(0-1,0-200) needs-focus == textpath-selection.svg textpath-selection-ref.svg fuzzy(0-1,0-200) needs-focus == textpath-selection.svg textpath-selection-ref.svg

4
modules/libpref/init/StaticPrefList.yaml
View File

@@ -5790,8 +5790,6 @@
value: true value: true
#elif defined(MOZ_WIDGET_ANDROID) #elif defined(MOZ_WIDGET_ANDROID)
value: true value: true
#elif defined(XP_WIN)
value: @IS_NIGHTLY_BUILD@
#else #else
value: false value: false
#endif #endif
@@ -6151,7 +6149,7 @@
# Whether to disable the automatic detection and use of direct2d. # Whether to disable the automatic detection and use of direct2d.
- name: gfx.direct2d.disabled - name: gfx.direct2d.disabled
type: bool type: bool
value: @IS_NIGHTLY_BUILD@ value: false
mirror: once mirror: once
# Whether to attempt to enable Direct2D regardless of automatic detection or # Whether to attempt to enable Direct2D regardless of automatic detection or