Skip to site navigation (Press enter)

[webkit-changes] [96952] trunk

commit-queue Fri, 07 Oct 2011 09:59:52 -0700

Title: [96952] trunk

Revision: 96952
Author: [email protected]
Date: 2011-10-07 10:00:44 -0700 (Fri, 07 Oct 2011)

Log Message

Implement currentColor support for box-shadow and text-shadow
https://bugs.webkit.org/show_bug.cgi?id=68218


Source/WebCore:

Patch by David Barr <[email protected]> on 2011-10-07
Reviewed by Simon Fraser.

Test: fast/box-shadow/box-shadow-currentcolor.html

* css/CSSParser.cpp:
(WebCore::CSSParser::parseShadow): Add CSSValueCurrentcolor to supported keywords.

LayoutTests:

Patch by David Barr <[email protected]> on 2011-10-07
Reviewed by Simon Fraser.

* fast/box-shadow/box-shadow-currentcolor-expected.png: Added.
* fast/box-shadow/box-shadow-currentcolor-expected.txt: Added.
* fast/box-shadow/box-shadow-currentcolor.html: Added.

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/css/CSSParser.cpp

Added Paths

trunk/LayoutTests/fast/box-shadow/box-shadow-currentcolor-expected.png
trunk/LayoutTests/fast/box-shadow/box-shadow-currentcolor-expected.txt
trunk/LayoutTests/fast/box-shadow/box-shadow-currentcolor.html

Diff

Modified: trunk/LayoutTests/ChangeLog (96951 => 96952)


--- trunk/LayoutTests/ChangeLog	2011-10-07 16:59:27 UTC (rev 96951)
+++ trunk/LayoutTests/ChangeLog	2011-10-07 17:00:44 UTC (rev 96952)
@@ -1,3 +1,14 @@
+2011-10-07  David Barr  <[email protected]>
+
+        Implement currentColor support for box-shadow and text-shadow
+        https://bugs.webkit.org/show_bug.cgi?id=68218
+
+        Reviewed by Simon Fraser.
+
+        * fast/box-shadow/box-shadow-currentcolor-expected.png: Added.
+        * fast/box-shadow/box-shadow-currentcolor-expected.txt: Added.
+        * fast/box-shadow/box-shadow-currentcolor.html: Added.
+
 2011-10-07  Martin Robinson  <[email protected]>
 
         [Freetype] Pseudo-italics do not work

Added: trunk/LayoutTests/fast/box-shadow/box-shadow-currentcolor-expected.png (0 => 96952)


--- trunk/LayoutTests/fast/box-shadow/box-shadow-currentcolor-expected.png	                        (rev 0)
+++ trunk/LayoutTests/fast/box-shadow/box-shadow-currentcolor-expected.png	2011-10-07 17:00:44 UTC (rev 96952)
@@ -0,0 +1,10 @@
+\x89PNG
+
+
+IHDR X\xE7j\xE3)tEXtchecksum08bfd8136a24ec21391271aa4851fef0#\xFD\xC8\xEEiCCPICC Profilex\x85T\xCFkA\xFE6n\xA9\xD0"Zk\xB2x\x90"IY\xABhE\xD46\xFDbk\xDB\xB6E\x90d3I\xD6n6\xEB\xEE&\xB5\xA5\x88\xE4\xE2\xD1*\xDEE\xED\xA1\xFF\x80z\xF0d/J\x85ZE(ޫ(b\xA1-\xF1\xCDnL\xB6\xA5\xEA\xC0\xCE~\xF3\xDE7\xEF}ov\xDF
+r\xD24\xF5\x80\xE4
+\xC7R\xA2il|Bj\xFC\x88\x8E\xA2	A4%U\xDB\xECN$A\x83s\xF9{\xE7\xD8z\x81[V\xC3{\xFBw\xB2w\xAD\x9AҶ\x9A\x84\xFD@\xE0G\x9A\xD9*\xB0\xEFq
+Y\x88<ߡ)\xC7t\xDF\xE3\xD8\xF2\xEC\x8F9Nyx\xC1\xB5+=\xC4Y"|@5-\xCEM\xB8S\xCD%\xD3@\x83H8\x94\xF5qR>\x9C׋\x94\xD7inf\xC6\xC8\xBDO\x90\xA6\xBB\xCC\xEE\xABb\xA1\x9CN\xF6\x90\xBD\x9D\xF4~N\xB3\xDE>\xC2!\xC2\xAD?F\xB8\x8D\x9E\xF5\x8C\xD5?\xE2a\xE1\xA4\xE6Ć=5\xF4\xF8`\xB7\xA9\xF85\xC2_M'\xA2Tq\xD9.
+\xF1\x98\xAE\xFDV\xF2J\x82p\x908\xCAda\x80sZHO\xD7Ln\xF8\xBA\x87}&\xD7\xAF\xE2wVQ\xE1y\x8Fg\xDE\xD4\xDD\xEFE\xDA\xAF0\x9A
+HPEa\x98\xB0P@\x86<14\xB2r?#\xAB\x93{2u$j\xBBtbD\xB1A{6\xDC=\xB7Q\xA4\xDD<\xFE("q\x94C\xB5\x92\xFCA\xFE*\xAF\xC9O\xE5y\xF9\xCB\\xB0\xD8V\x{1D4B5B}\x9A\xBA\xF2\xE0;\xC5噹\xD7\xD3\xC8\xE3sM^|\x95\xD4v\x93WG\x96\xACyz\xBC\x9A\xEC?\xECW\x971\xE6\x825\x8F\xC4s\xB0\xFB\xF1-_\x95̗)\x8C\xC5\xE3U\xF3\xEAK\x84uZ17ߟl;=\xE2.\xCF.\xB5\xD6s\xAD\x89\x8B7V\x9B\x97g\xFDjH\xFB\x93\xE6U\xF9O^\xF5\xF1\xFCg\xCD\xC4c\xE2)1&v\x8A\xE7!\x89\x97\xC5.\xF1\x92\xD8K\xAB\xE2`m\xC7\x9D\x95\x86)\xD2m\x91\xFA$\xD5``\x9A\xBC\xF5/]?[x\xBDF\xF5Q\x94\xCC\xD2T\x89\xF7\xC2*d4\x9D\xB9o\xFA\x8F\xDB\xC7\xFC\xE4\xF7\x8A\xE7\x9F(/l\xE0ș\xBAmSq\xEF\xA1e\xA5ns\xAE\xBF\xD1}\xF0\xB6nk\xA3~8\xFCX<\xAB\xADR5\x9F \xBCv\x87z\xE8)\x98Ӗ\x96\xCD9R\x87,\x9F\x93\xBA\xE9\xCAbR\xCCP\xDBCRR\xD7%\xD7eK\xB3\x99Ub\xE9vؙ\xD3n\xA19B\xF7ħJe\x93\xFA\xAF\xF1\xB0\xFD\xB0R\xF9\xF9\xACR\xD9~Nց\x97\xFAo\xC0\xBC\xFDE\xC0x\x8B\x89	PLTE\xFF\x80\xFF\xFF\xFF\xA0
+5p\xFEIDATx\xDA\xED\xCF9 \xB0\x9A\xACITr\xB0\xB3\xB0\x94'q\x90h\x8F\x91\xA2H\xAC\x88\x88\x88\x88\x88\x88\x88\x88\x88\x88\x88\x88\x88\x88\x88\x9C\xC9ADDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDd/2劈\x88\x88\x88\x88\x88\x88\x88\x88\x88\x88\x88\x88\x88Hi\xE4z""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""F:y\xB2F\xE1g\xD5IEND\xAEB`\x82
\ No newline at end of file

Added: trunk/LayoutTests/fast/box-shadow/box-shadow-currentcolor-expected.txt (0 => 96952)


--- trunk/LayoutTests/fast/box-shadow/box-shadow-currentcolor-expected.txt	                        (rev 0)
+++ trunk/LayoutTests/fast/box-shadow/box-shadow-currentcolor-expected.txt	2011-10-07 17:00:44 UTC (rev 96952)
@@ -0,0 +1 @@
+

Added: trunk/LayoutTests/fast/box-shadow/box-shadow-currentcolor.html (0 => 96952)


--- trunk/LayoutTests/fast/box-shadow/box-shadow-currentcolor.html	                        (rev 0)
+++ trunk/LayoutTests/fast/box-shadow/box-shadow-currentcolor.html	2011-10-07 17:00:44 UTC (rev 96952)
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <style>
+    div {
+      width: 100px;
+      height: 100px;
+      color: green;
+      background-color: blue;
+      box-shadow: 20px 20px red;
+      box-shadow: 20px 20px currentColor;
+    }
+  </style>
+<script>
+if (window.layoutTestController)
+    window.layoutTestController.dumpAsText(true);
+</script>
+</head>
+<body>
+  <div/>
+</body>
+</html>

Modified: trunk/Source/WebCore/ChangeLog (96951 => 96952)


--- trunk/Source/WebCore/ChangeLog	2011-10-07 16:59:27 UTC (rev 96951)
+++ trunk/Source/WebCore/ChangeLog	2011-10-07 17:00:44 UTC (rev 96952)
@@ -1,3 +1,15 @@
+2011-10-07  David Barr  <[email protected]>
+
+        Implement currentColor support for box-shadow and text-shadow
+        https://bugs.webkit.org/show_bug.cgi?id=68218
+
+        Reviewed by Simon Fraser.
+
+        Test: fast/box-shadow/box-shadow-currentcolor.html
+
+        * css/CSSParser.cpp:
+        (WebCore::CSSParser::parseShadow): Add CSSValueCurrentcolor to supported keywords.
+
 2011-10-07  Pavel Feldman  <[email protected]>
 
         Web Inspector: add Audits panel to the compilation.

Modified: trunk/Source/WebCore/css/CSSParser.cpp (96951 => 96952)


--- trunk/Source/WebCore/css/CSSParser.cpp	2011-10-07 16:59:27 UTC (rev 96951)
+++ trunk/Source/WebCore/css/CSSParser.cpp	2011-10-07 17:00:44 UTC (rev 96952)
@@ -4998,8 +4998,9 @@
         } else {
             // The only other type of value that's ok is a color value.
             RefPtr<CSSPrimitiveValue> parsedColor;
-            bool isColor = ((val->id >= CSSValueAqua && val->id <= CSSValueWindowtext) || val->id == CSSValueMenu ||
-                            (val->id >= CSSValueWebkitFocusRingColor && val->id <= CSSValueWebkitText && !m_strict));
+            bool isColor = ((val->id >= CSSValueAqua && val->id <= CSSValueWindowtext) || val->id == CSSValueMenu
+                            || (val->id >= CSSValueWebkitFocusRingColor && val->id <= CSSValueWebkitText && !m_strict)
+                            || val->id == CSSValueCurrentcolor);
             if (isColor) {
                 if (!context.allowColor)
                     return false;

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes