Changeset 250912 in webkit

Timestamp:

Oct 9, 2019 7:38:45 AM (5 years ago)

Author:

Chris Dumez

Message:

[iOS] REGRESSION (r250398) Layout Test fast/history/page-cache-element-state-focused.html is failing
​https://bugs.webkit.org/show_bug.cgi?id=202712
<rdar://problem/56082428>

Reviewed by Antti Koivisto.

The test was failing depending on the order in which the tests were executed. The reason is that
elements would either use the full UA stylesheet (html.css) or the simple one in CSSDefaultStyleSheets.cpp.
Unfortunately, the outline-width was different on iOS between the simple stylesheet and the full one, causing
the test output to look different depending on which stylesheet was used.

Address the issue by making sure that the outline-width is 3px on IOS_FAMILY in the simple stylesheet, to
be consistent with the value in the full stylesheet (html.css).

• css/CSSDefaultStyleSheets.cpp:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/CSSDefaultStyleSheets.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-10-09  Chris Dumez  <cdumez@apple.com>
+
+        [iOS] REGRESSION (r250398) Layout Test fast/history/page-cache-element-state-focused.html is failing
+        https://bugs.webkit.org/show_bug.cgi?id=202712
+        <rdar://problem/56082428>
+
+        Reviewed by Antti Koivisto.
+
+        The test was failing depending on the order in which the tests were executed. The reason is that
+        elements would either use the full UA stylesheet (html.css) or the simple one in CSSDefaultStyleSheets.cpp.
+        Unfortunately, the outline-width was different on iOS between the simple stylesheet and the full one, causing
+        the test output to look different depending on which stylesheet was used.
+
+        Address the issue by making sure that the outline-width is 3px on IOS_FAMILY in the simple stylesheet, to
+        be consistent with the value in the full stylesheet (html.css).
+
+        * css/CSSDefaultStyleSheets.cpp:
+
 2019-10-09  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/css/CSSDefaultStyleSheets.cpp

@@ -81 +81 @@
 #endif
 
+#if PLATFORM(IOS_FAMILY)
+#define DEFAULT_OUTLINE_WIDTH "3px"
+#else
+#define DEFAULT_OUTLINE_WIDTH "5px"
+#endif
+
+#if HAVE(OS_DARK_MODE_SUPPORT)
+#define CSS_DARK_MODE_ADDITION "html{color:text}"
+#else
+#define CSS_DARK_MODE_ADDITION ""
+#endif
+
 // FIXME: It would be nice to use some mechanism that guarantees this is in sync with the real UA stylesheet.
-#if HAVE(OS_DARK_MODE_SUPPORT)
-// The only difference in the simple style sheet for dark mode is the addition of html{color:text}.
-static const char* simpleUserAgentStyleSheet = "html,body,div{display:block}html{color:text}head{display:none}body{margin:8px}div:focus,span:focus,a:focus{outline:auto 5px -webkit-focus-ring-color}a:any-link{color:-webkit-link;text-decoration:underline}a:any-link:active{color:-webkit-activelink}";
-#else
-static const char* simpleUserAgentStyleSheet = "html,body,div{display:block}head{display:none}body{margin:8px}div:focus,span:focus,a:focus{outline:auto 5px -webkit-focus-ring-color}a:any-link{color:-webkit-link;text-decoration:underline}a:any-link:active{color:-webkit-activelink}";
-#endif
+static const char* simpleUserAgentStyleSheet = "html,body,div{display:block}" CSS_DARK_MODE_ADDITION "head{display:none}body{margin:8px}div:focus,span:focus,a:focus{outline:auto " DEFAULT_OUTLINE_WIDTH " -webkit-focus-ring-color}a:any-link{color:-webkit-link;text-decoration:underline}a:any-link:active{color:-webkit-activelink}";
 
 static inline bool elementCanUseSimpleDefaultStyle(const Element& element)