Bug 1803154 - Back out changeset c1b0ce76a51b (bug 1801512) because it seems to have made things worse for a number of users. r=lsalzman

Differential Revision: https://phabricator.services.mozilla.com/D167615
This commit is contained in:
Jonathan Kew 2023-01-24 10:03:49 +00:00
parent 8f2dcce4b8
commit b9dbd7a04b
14 changed files with 23 additions and 39 deletions

View File

@ -24,7 +24,7 @@ fuzzy-if(!useDrawSnapshot,14-14,44-95) == 1524353.html 1524353-ref.html
== bug1523410-translate-scale-snap.html bug1523410-translate-scale-snap-ref.html
== 1523080.html 1523080-ref.html
== 1616444-same-color-different-paths.html 1616444-same-color-different-paths-ref.html
skip-if(!asyncPan||Android) fuzzy-if(winWidget,54-112,2707-3430) fuzzy-if(cocoaWidget,24-24,1190-1200) pref(apz.allow_zooming,true) == picture-caching-on-async-zoom.html picture-caching-on-async-zoom.html?ref
skip-if(!asyncPan||Android) fuzzy-if(winWidget,54-94,2713-3419) fuzzy-if(cocoaWidget,24-24,1190-1200) pref(apz.allow_zooming,true) == picture-caching-on-async-zoom.html picture-caching-on-async-zoom.html?ref
pref(apz.allow_zooming,true) fails-if(useDrawSnapshot) == 1662062-1-no-blurry.html 1662062-1-ref.html
# Bug 1715676: nsBulletFrame has been removed and the new rendering does not use PushRoundedRect that this test is for:
# == 1681610.html 1681610-ref.html

View File

@ -35,9 +35,6 @@
#define ENHANCED_CONTRAST_VALUE_NAME L"EnhancedContrastLevel"
#define CONTROL_PANEL_REGISTRY_KEY HKEY_CURRENT_USER, L"Control Panel\\Desktop"
#define FONT_SMOOTHING_GAMMA_VALUE L"FontSmoothingGamma"
// FIXME: This shouldn't look at constants probably.
static inline DWRITE_FONT_STRETCH DWriteFontStretchFromStretch(
mozilla::FontStretch aStretch) {

View File

@ -211,19 +211,6 @@ void gfxDWriteFont::UpdateClearTypeVars() {
gamma = defaultRenderingParams->GetGamma();
pixelGeometry = defaultRenderingParams->GetPixelGeometry();
renderingMode = defaultRenderingParams->GetRenderingMode();
if (RegOpenKeyExW(CONTROL_PANEL_REGISTRY_KEY, 0, KEY_READ, &hKey) ==
ERROR_SUCCESS) {
DWORD type;
DWORD value;
DWORD valueSize = sizeof(value);
if (RegQueryValueExW(hKey, FONT_SMOOTHING_GAMMA_VALUE, nullptr, &type,
(LPBYTE)&value, &valueSize) == ERROR_SUCCESS &&
type == REG_DWORD) {
gamma = value / 1000.0f;
}
RegCloseKey(hKey);
}
} else {
gfxWarning() << "Failed to create default rendering params";
}

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
fuzzy(0-102,0-2811) fuzzy-if(winWidget,146-153,2866-2866) fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu),50-63,2689-2689) == background-clip-text-1a.html background-clip-text-1-ref.html # Bug 1392106
fuzzy(0-102,0-2811) fuzzy-if(winWidget,146-153,2866-2866) fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu),50-63,2689-2689) == background-clip-text-1b.html background-clip-text-1-ref.html # Bug 1392106
fuzzy(0-102,0-2811) fuzzy-if(winWidget,146-153,2866-2866) fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu),50-63,2689-2689) == background-clip-text-1c.html background-clip-text-1-ref.html # Bug 1392106
fuzzy(0-102,0-2811) fuzzy-if(winWidget,146-153,2866-2866) fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu),50-63,2689-2689) == background-clip-text-1d.html background-clip-text-1-ref.html # Bug 1392106
fuzzy(0-102,0-2811) fuzzy-if(winWidget,146-153,2866-2866) fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu),50-63,2689-2689) == 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) fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu),50-50,2689-2689) == 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) fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu),50-50,2689-2689) == 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) fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu),50-50,2689-2689) == 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) fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu),50-50,2689-2689) == 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) fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu),50-50,2689-2689) == background-clip-text-1e.html background-clip-text-1-ref.html # Bug 1392106
== background-clip-text-2.html background-clip-text-2-ref.html

View File

@ -649,7 +649,7 @@ fails-if(Android&&!asyncPan) == 371561-1.html 371561-1-ref.html
== 372553-1.html 372553-1-ref.html
== 372632-1.html 372632-1-ref.html
== 372768-1.html 372768-1-ref.html
fuzzy-if(winWidget,38-92,1-2) == 373295-1.html 373295-1-ref.html
fuzzy-if(winWidget,46-92,1-2) == 373295-1.html 373295-1-ref.html
== 373298-1.html 373298-1-ref.html
== 373381-1.html 373381-1-ref.html
fuzzy-if(!Android,0-2,0-40) == 373381-2.html 373381-2-ref.html
@ -922,7 +922,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
== 410621-1.html 410621-1-ref.html
== 411059-1.html 411059-1-ref.html
fuzzy-if(winWidget,46-138,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-2.html 411585-2-ref.html
fails == 411585-3.html 411585-3-ref.html # bug 426909
@ -2100,7 +2100,7 @@ skip-if(Android) == 1727172-1.xhtml 1727172-1-ref.html
== 1726663-1.html 1726663-1-ref.html
== 1727016-1.html 1727016-1-ref.html
!= 1730314-1.html 1730314-1-ref.html
fuzzy(0-3,0-3) fuzzy-if(Android,0-3,0-1901) fuzzy-if(winWidget,0-154,0-123) == 1738700-1.html 1738700-1-ref.html
fuzzy(0-3,0-3) fuzzy-if(Android,0-3,0-1901) fuzzy-if(winWidget,0-154,0-118) == 1738700-1.html 1738700-1-ref.html
skip-if(Android||!browserIsFission) fuzzy(255-255,171000-171000) HTTP == 1743533-1.html 1743533-1-ref.html # do not decrease the fuzz! this is a not equal test, the high fuzz minimum is to ensure they differ by enough.
== 1743560-1.html 1743560-1-ref.html
== 1743851-1.html 1743851-1-ref.html

View File

@ -182,7 +182,7 @@ skip-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fuzzy(0-1,0-668) == colrv1-01
skip-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fuzzy(0-1,0-848) == colrv1-01.html#N colrv1-01-ref.html#N
skip-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fuzzy(0-1,0-675) == colrv1-01.html#O colrv1-01-ref.html#O
skip-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == colrv1-01.html#P colrv1-01-ref.html#P
skip-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fuzzy(0-148,0-318) == colrv1-01.html#Q colrv1-01-ref.html#Q
skip-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fuzzy(0-138,0-318) == colrv1-01.html#Q colrv1-01-ref.html#Q
skip-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fuzzy(0-214,0-158) == colrv1-01.html#R colrv1-01-ref.html#R
skip-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fuzzy(0-255,0-156) == colrv1-01.html#S colrv1-01-ref.html#S
skip-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fuzzy(0-237,0-277) == colrv1-01.html#T colrv1-01-ref.html#T

View File

@ -3,7 +3,7 @@ fuzzy-if(winWidget,47-127,221-254) == simple.svg simple-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
fuzzy-if(winWidget,47-166,255-318) fuzzy-if(OSX,0-1,0-1) == simple-anchor-end-bidi.svg simple-anchor-end-bidi-ref.html
fuzzy-if(winWidget,47-144,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
fuzzy-if(winWidget,47-137,181-250) == simple-anchor-end.svg simple-anchor-end-ref.html
fuzzy-if(dwrite,0-104,0-131) fuzzy-if(cocoaWidget,0-143,0-124) fuzzy-if(!(gtkWidget||geckoview),79-200,59-319) == simple-anchor-middle-bidi.svg simple-anchor-middle-bidi-ref.html
fuzzy-if(winWidget,47-138,188-207) == simple-anchor-middle-rtl.svg simple-anchor-middle-rtl-ref.html
@ -199,11 +199,11 @@ needs-focus == deselectAll.svg deselectAll-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-250) needs-focus == selectSubString-3.svg selectSubString-3-ref.svg
fuzzy-if(!geckoview,0-1,0-237) needs-focus fuzzy-if(winWidget,55-165,200-254) == simple-selection.svg simple-selection-ref.html
fuzzy(0-1,0-100) needs-focus fuzzy-if(winWidget,55-165,200-318) == simple-bidi-selection.svg simple-bidi-selection-ref.html
fuzzy(0-1,0-50) needs-focus fuzzy-if(winWidget,55-165,200-254) fuzzy-if(OSX,1-65,19-196) == simple-fill-color-selection.svg simple-fill-color-selection-ref.html
fuzzy(0-1,0-150) needs-focus fuzzy-if(winWidget,125-165,221-254) fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu),55-63,200-200) == simple-underline-selection.svg simple-underline-selection-ref.html # Bug 1392106
fuzzy(0-1,0-300) needs-focus fuzzy-if(Android13&&!swgl,3-3,898-924) fuzzy-if(Android13&&swgl,0-3,0-917) fuzzy-if(winWidget,134-165,432-501) fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu),55-63,382-382) == multiple-text-selection.svg multiple-text-selection-ref.html # Bug 1392106
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-100) needs-focus fuzzy-if(winWidget,55-148,200-318) == simple-bidi-selection.svg simple-bidi-selection-ref.html
fuzzy(0-1,0-50) needs-focus fuzzy-if(winWidget,55-148,200-254) fuzzy-if(OSX,1-65,19-196) == simple-fill-color-selection.svg simple-fill-color-selection-ref.html
fuzzy(0-1,0-150) needs-focus fuzzy-if(winWidget,125-148,221-254) fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu),55-56,200-200) == simple-underline-selection.svg simple-underline-selection-ref.html # Bug 1392106
fuzzy(0-1,0-300) needs-focus fuzzy-if(Android13&&!swgl,3-3,898-924) fuzzy-if(Android13&&swgl,0-3,0-917) fuzzy-if(winWidget,134-152,432-501) fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu),55-56,382-382) == multiple-text-selection.svg multiple-text-selection-ref.html # Bug 1392106
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

View File

@ -2,5 +2,5 @@
expected:
if (os == "android"): PASS
fuzzy:
if (os == "win"): maxDifference=92-94;totalPixels=0-2206
if (os == "win"): maxDifference=92;totalPixels=0-2206
if swgl and (os == "mac"): maxDifference=1-1;totalPixels=1-1

View File

@ -1,4 +1,4 @@
[min-height-106.xht]
fuzzy:
if os == "win": maxDifference=92-94;totalPixels=5487
if os == "win": maxDifference=92;totalPixels=5487
if os == "mac" and swgl: maxDifference=1-1;totalPixels=4-4

View File

@ -1,4 +1,4 @@
[text-emphasis-style-008.html]
bug: Fuzz looks massive but it's just a dot antialiased differently
fuzzy:
if os == "win": maxDifference=0-48;totalPixels=0-54
if os == "win": maxDifference=0-47;totalPixels=0-54

View File

@ -1,3 +1,3 @@
[text-emphasis-style-filled-001.xht]
fuzzy:
if (os == "win"): maxDifference=48;totalPixels=0-54
if (os == "win"): maxDifference=47;totalPixels=0-5

View File

@ -1,3 +1,3 @@
[text-emphasis-style-open-001.xht]
fuzzy:
if (os == "win"): maxDifference=43-47;totalPixels=0-60
if (os == "win"): maxDifference=47;totalPixels=0-5

View File

@ -1,3 +1,3 @@
[text-emphasis-style-shape-001.xht]
fuzzy:
if (os == "win"): maxDifference=47-48;totalPixels=0-54
if (os == "win"): maxDifference=47;totalPixels=0-5

View File

@ -2,4 +2,4 @@
fuzzy:
if os == "android": maxDifference=4;totalPixels=185
if os == "mac": maxDifference=198;totalPixels=308
if os == "win": maxDifference=171-174;totalPixels=240
if os == "win": maxDifference=174;totalPixels=240