Title: [230056] trunk/Source/WebCore
Revision
230056
Author
timo...@apple.com
Date
2018-03-28 15:50:45 -0700 (Wed, 28 Mar 2018)

Log Message

Include the 'text' color keyword as a system color.

https://bugs.webkit.org/show_bug.cgi?id=184113
rdar://problem/38779267

Reviewed by Tim Horton.

* css/StyleColor.cpp:
(WebCore::StyleColor::isColorKeyword): Don't check CSSValueMenu, it is a system color and is included.
(WebCore::StyleColor::isSystemColor): Include CSSValueText. Check CSSValueWebkitFocusRingColor in the range,
since it is immediately after CSSValueAppleSystemYellow.

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (230055 => 230056)


--- trunk/Source/WebCore/ChangeLog	2018-03-28 22:03:04 UTC (rev 230055)
+++ trunk/Source/WebCore/ChangeLog	2018-03-28 22:50:45 UTC (rev 230056)
@@ -1,3 +1,17 @@
+2018-03-28  Timothy Hatcher  <timo...@apple.com>
+
+        Include the 'text' color keyword as a system color.
+
+        https://bugs.webkit.org/show_bug.cgi?id=184113
+        rdar://problem/38779267
+
+        Reviewed by Tim Horton.
+
+        * css/StyleColor.cpp:
+        (WebCore::StyleColor::isColorKeyword): Don't check CSSValueMenu, it is a system color and is included.
+        (WebCore::StyleColor::isSystemColor): Include CSSValueText. Check CSSValueWebkitFocusRingColor in the range,
+        since it is immediately after CSSValueAppleSystemYellow.
+
 2018-03-28  Wenson Hsieh  <wenson_hs...@apple.com>
 
         [iOS] Multiple select appearance doesn't update when selecting or deselecting rows in the picker view

Modified: trunk/Source/WebCore/css/StyleColor.cpp (230055 => 230056)


--- trunk/Source/WebCore/css/StyleColor.cpp	2018-03-28 22:03:04 UTC (rev 230055)
+++ trunk/Source/WebCore/css/StyleColor.cpp	2018-03-28 22:50:45 UTC (rev 230056)
@@ -48,14 +48,12 @@
 
 bool StyleColor::isColorKeyword(CSSValueID id)
 {
-    return (id >= CSSValueAlpha && id <= CSSValueWebkitText)
-        || (id >= CSSValueAliceblue && id <= CSSValueYellowgreen)
-        || id == CSSValueMenu || isSystemColor(id);
+    return (id >= CSSValueAlpha && id <= CSSValueWebkitText) || (id >= CSSValueAliceblue && id <= CSSValueYellowgreen) || isSystemColor(id);
 }
 
 bool StyleColor::isSystemColor(CSSValueID id)
 {
-    return (id >= CSSValueActiveborder && id <= CSSValueAppleSystemYellow) || id == CSSValueMenu || id == CSSValueWebkitFocusRingColor;
+    return (id >= CSSValueActiveborder && id <= CSSValueWebkitFocusRingColor) || id == CSSValueMenu || id == CSSValueText;
 }
 
 } // namespace WebCore
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to