Changeset 244467 in webkit

Timestamp:

Apr 19, 2019 2:19:57 PM (5 years ago)

Author:

timothy@apple.com

Message:

Source/WebCore:
Standardize the <meta name="color-scheme"> separator.
​https://bugs.webkit.org/show_bug.cgi?id=193931
rdar://problem/49995929

Reviewed by Darin Adler.

Tests: css-dark-mode/color-scheme-meta.html

• dom/Document.cpp:

(WebCore::processColorSchemeString): Use isHTMLSpace insead of isColorSchemeSeparator and isASCIISpace.
(WebCore::isColorSchemeSeparator): Deleted.

LayoutTests:
Standardize the <meta name="color-scheme"> separator.
​https://bugs.webkit.org/show_bug.cgi?id=193931
rdar://problem/49995929

Reviewed by Darin Adler.

• css-dark-mode/color-scheme-meta-expected.txt:
• css-dark-mode/color-scheme-meta.html: Test other types of spaces like tab, newline and vertical tab.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/css-dark-mode/color-scheme-meta-expected.txt (modified) (1 diff)
• LayoutTests/css-dark-mode/color-scheme-meta.html (modified) (2 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/Document.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-04-19  Timothy Hatcher  <timothy@apple.com>
+
+        Standardize the `<meta name="color-scheme">` separator.
+        https://bugs.webkit.org/show_bug.cgi?id=193931
+        rdar://problem/49995929
+
+        Reviewed by Darin Adler.
+
+        * css-dark-mode/color-scheme-meta-expected.txt:
+        * css-dark-mode/color-scheme-meta.html: Test other types of spaces like tab, newline and vertical tab.
+
 2019-04-19  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/LayoutTests/css-dark-mode/color-scheme-meta-expected.txt

@@ -19 +19 @@
 PASS Color schemes changed to light,dark 
 PASS Element colors are in light color scheme since comma is not an allowed seperator 
+PASS Color schemes changed to foo\vdark 
+PASS Element colors are in light color scheme since vertical tab is not an allowed seperator 
 PASS Color schemes changed to a bogus value and dark 
 PASS Element colors are correct in dark color scheme with dark color scheme 

trunk/LayoutTests/css-dark-mode/color-scheme-meta.html

@@ -93 +93 @@
 
 test(function() {
-    document.getElementById("meta").content = "light  foo ";
+    document.getElementById("meta").content = "\tlight  foo ";
 }, "Color schemes changed to light and a bogus value");
 
@@ -120 +120 @@
 
 test(function() {
-    document.getElementById("meta").content = "  foo dark";
+    document.getElementById("meta").content = "foo\vdark ";
+}, "Color schemes changed to foo\\vdark");
+
+test(function() {
+    // The semantic text color should be black still.
+    test_color_is_black("test1");
+}, "Element colors are in light color scheme since vertical tab is not an allowed seperator");
+
+test(function() {
+    document.getElementById("meta").content = "  foo\ndark";
 }, "Color schemes changed to a bogus value and dark");
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-04-19  Timothy Hatcher  <timothy@apple.com>
+
+        Standardize the <meta name="color-scheme"> separator.
+        https://bugs.webkit.org/show_bug.cgi?id=193931
+        rdar://problem/49995929
+
+        Reviewed by Darin Adler.
+
+        Tests: css-dark-mode/color-scheme-meta.html
+
+        * dom/Document.cpp:
+        (WebCore::processColorSchemeString): Use isHTMLSpace insead of isColorSchemeSeparator and isASCIISpace.
+        (WebCore::isColorSchemeSeparator): Deleted.
+
 2019-04-19  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -3604 +3604 @@
 
 #if ENABLE(DARK_MODE_CSS)
-static inline bool isColorSchemeSeparator(UChar character)
-{
-    return isASCIISpace(character);
-}
-
 static void processColorSchemeString(StringView colorScheme, const WTF::Function<void(StringView key)>& callback)
 {
@@ -3614 +3609 @@
     for (unsigned i = 0; i < length; ) {
         // Skip to first non-separator.
-        while (i < length && isColorSchemeSeparator(colorScheme[i]))
+        while (i < length && isHTMLSpace(colorScheme[i]))
             ++i;
         unsigned keyBegin = i;
 
         // Skip to first separator.
-        while (i < length && !isColorSchemeSeparator(colorScheme[i]))
+        while (i < length && !isHTMLSpace(colorScheme[i]))
             ++i;
         unsigned keyEnd = i;