[webkit-changes] [96449] trunk

commit-queue Fri, 30 Sep 2011 18:42:20 -0700

Title: [96449] trunk

Revision: 96449
Author: commit-qu...@webkit.org
Date: 2011-09-30 18:43:20 -0700 (Fri, 30 Sep 2011)

Log Message

Implement currentColor support for CSS gradients
https://bugs.webkit.org/show_bug.cgi?id=58730


Patch by David Barr <davidb...@chromium.org> on 2011-09-30
Reviewed by Adam Barth.

Source/WebCore:

Allow currentColor as a CSS3 gradient color-stop.

Test: fast/css/linear-gradient-currentcolor.html

* css/CSSGradientValue.cpp:
(WebCore::CSSGradientValue::isCacheable): Make currentColor uncacheable since the
background image may be invalidated if currentColor is used as a gradient stop and
the value of the 'color' property changes.
* css/CSSParser.cpp:
(WebCore::parseGradientColorOrKeyword): Accept the currentColor keyword.
* rendering/style/StyleGeneratedImage.cpp:
(WebCore::StyleGeneratedImage::image): Initialize document styleSelector so that
currentColor may be computed for a StyleGeneratedImage.

LayoutTests:

* fast/css/linear-gradient-currentcolor-expected.txt: Added.
* fast/css/linear-gradient-currentcolor.html: Added.
* platform/chromium/test_expectations.txt:
* platform/mac/fast/css/linear-gradient-currentcolor-expected.png: Added.

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/platform/chromium/test_expectations.txt
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/css/CSSGradientValue.cpp
trunk/Source/WebCore/css/CSSParser.cpp
trunk/Source/WebCore/rendering/style/StyleGeneratedImage.cpp

Added Paths

trunk/LayoutTests/fast/css/linear-gradient-currentcolor-expected.txt
trunk/LayoutTests/fast/css/linear-gradient-currentcolor.html
trunk/LayoutTests/platform/mac/fast/css/linear-gradient-currentcolor-expected.png

Diff

Modified: trunk/LayoutTests/ChangeLog (96448 => 96449)


--- trunk/LayoutTests/ChangeLog	2011-10-01 01:40:31 UTC (rev 96448)
+++ trunk/LayoutTests/ChangeLog	2011-10-01 01:43:20 UTC (rev 96449)
@@ -1,3 +1,15 @@
+2011-09-30  David Barr  <davidb...@chromium.org>
+
+        Implement currentColor support for CSS gradients
+        https://bugs.webkit.org/show_bug.cgi?id=58730
+
+        Reviewed by Adam Barth.
+
+        * fast/css/linear-gradient-currentcolor-expected.txt: Added.
+        * fast/css/linear-gradient-currentcolor.html: Added.
+        * platform/chromium/test_expectations.txt:
+        * platform/mac/fast/css/linear-gradient-currentcolor-expected.png: Added.
+
 2011-09-30  Adam Barth  <aba...@webkit.org>
 
         Update baseline for this test on Leopard.

Added: trunk/LayoutTests/fast/css/linear-gradient-currentcolor-expected.txt (0 => 96449)


--- trunk/LayoutTests/fast/css/linear-gradient-currentcolor-expected.txt	                        (rev 0)
+++ trunk/LayoutTests/fast/css/linear-gradient-currentcolor-expected.txt	2011-10-01 01:43:20 UTC (rev 96449)
@@ -0,0 +1 @@
+

Added: trunk/LayoutTests/fast/css/linear-gradient-currentcolor.html (0 => 96449)


--- trunk/LayoutTests/fast/css/linear-gradient-currentcolor.html	                        (rev 0)
+++ trunk/LayoutTests/fast/css/linear-gradient-currentcolor.html	2011-10-01 01:43:20 UTC (rev 96449)
@@ -0,0 +1,24 @@
+<html>
+<head>
+<style>
+div {
+    background-color: red;
+    background-image: -moz-linear-gradient(gray 50px, currentColor 50px);
+    background-image: -ms-linear-gradient(gray 50px, currentColor 50px);
+    background-image: -o-linear-gradient(gray 50px, currentColor 50px);
+    background-image: -webkit-linear-gradient(gray 50px, currentColor 50px);
+    background-image: linear-gradient(gray 50px, currentColor 50px);
+	width: 100px;
+	height: 100px;
+}
+</style>
+</head>
+<script>
+if (window.layoutTestController)
+    window.layoutTestController.dumpAsText(true);
+</script>
+<body>
+  <div style="color: green"></div>
+  <div style="color: blue"></div>
+</body>
+</html>

Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (96448 => 96449)


--- trunk/LayoutTests/platform/chromium/test_expectations.txt	2011-10-01 01:40:31 UTC (rev 96448)
+++ trunk/LayoutTests/platform/chromium/test_expectations.txt	2011-10-01 01:43:20 UTC (rev 96449)
@@ -2531,6 +2531,9 @@
 BUGWK55745 MAC : fast/gradients/css3-radial-gradients3.html = IMAGE
 BUGWK55745 MAC : fast/gradients/css3-repeating-radial-gradients.html = IMAGE
 
+// New pixel tests added for bug 58730, rebaseline when webkit 58730 rolls.
+BUGWK58730 WIN LINUX: fast/css/linear-gradient-currentcolor.html = IMAGE
+
 // This was introduced by r75077.
 BUGWK52082 LEOPARD : fast/text/basic/014.html = IMAGE
 BUGWK52082 LEOPARD : fast/text/midword-break-after-breakable-char.html = IMAGE

Added: trunk/LayoutTests/platform/mac/fast/css/linear-gradient-currentcolor-expected.png (0 => 96449)


--- trunk/LayoutTests/platform/mac/fast/css/linear-gradient-currentcolor-expected.png	                        (rev 0)
+++ trunk/LayoutTests/platform/mac/fast/css/linear-gradient-currentcolor-expected.png	2011-10-01 01:43:20 UTC (rev 96449)
@@ -0,0 +1,9 @@
+\x89PNG
+
+
+IHDR X')tEXtchecksumb8f62dd168fa0953d133be0f8eb66d91\xB9\x906f\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\xFEIDATx\xDA\xED\xD81\x840\xC15\xF2\xBF\x8D_>\x97a\xC9B$\xE8\xAA\xD2\xCD&jmKR\xBC\xE70\x80\xC0X\x81 \xB0;\xFA\xEA0\xE7\xB4Φ1\x86\x80\x8B\x80\xC0X\x81 \xB0@`,\x80\xC0X\x81 \xB0@`,\x80\xC0X,\x81 \xB0@`,\x80\xC0X,\x81 \xB0X@`,\x80\xC0X,\x81 \xB0X@`P-\xC9\xFDa6\xEBlʈ\x80\x8B\x80\xC0X\x81 \xB0@`,\x80\xC0X\x81 \xB0@`,\x80\xC0X,\x81 \xB0@`,\x80\xC0X,\x81 \xB0X@`,\x80\xC0X,\x81 \xB0X@`P}u8\xEB\xB4\xC0>X@`,\x80\xC0X,\x81 \xB0X@`,\x80\xC0X,\x81 \xB0X@` \xB0\x80\xC0X,\x81 \xB0X@` \xB0\x80\xC0@`,\x81 \xB0X@` \xB0\x80\xC0@`,\x81@\xB5$\xF7\x87f\x9C]\x8B	\x80?\xE5\x83 \xB0\x80\xC0@`,\x81\x80\xC0X\x81 \xB0\x80\xC0@`,\x81\x80\xC0X\x81 \xB0@`,\x81\x80\xC0X\x81 \xB0@`,\x80\xC0X\x81 \xB0@`,\x80\xC0XT_\xE3<\xE1\x83 \xB0\x80\xC0@`,\x81\x80\xC0X\x81 \xB0\x80\xC0@`,\x81\x80\xC0X\x81 \xB0@`,\x81\x80\xC0X\x81 \xB0@`,\x80\xC0X\x81 \xB0@`,\x80\xC0X,\x81 \xB0@`,\x80\xC0X,\x81 \xB0@`,\x80\xC0X,\x81 \xB0X@`,\x80\xC0X,\x81 \xB0X@` \xB0\x80\xC0X,\x81 \xB0X@` \xB0\x80\xC0@`,\x81 \xB0X@` \xB0\x80\xC0@`,\x81 \xB0X@` \xB0\x80\xC0@`,\x81\x80\xC0X@` \xB0\x80\xC0@`,\x81\x80\xC0X\x81 \xB0\x80\xC0@`,\x81\x80\xC0X\x81 \xB0@`,\x81\x80\xC0X\x81 \xB0@`,\x81\x80\xC0X\x81 \xB0@`,\x80\xC0X\x81 \xB0@`,\x80\xC0X,\x81 \xB0@`,\x80\xC0X,\x81 \xB0X@`,\x80\xC0X,\x81 \xB0X@`,,\x81 \xB0X@` \xB0\x80\xC0@`,\x81 \xB0X@` \xB0\x80\xC0@`,\x81\x80\xC0X@` \xB0\x80\xC0@`,\x81\x80\xC0X\x81 \xB0\x80\xC0@`,\x81\x80\xC0X\x81 \xB0@`,\x81\x80\xC0X\x81 \xB0@`,\x81\x80\xC0X\x81 \xB0@`,\x80\xC0X\x81 \xB0@`,\x80\xC0X,\x81 \xB0@`,\x80\xC0X,\x81 \xB0X@`,\x80\xC0X,\x81 \xB0X@`,\x80\xC0X,\x81 \xB0X@` \xB0\x80\xC0X,\x81 \xB0X@` \xB0\x80\xC0@`,\x81 \xB0X@` \xB0\x80\xC0@`,\x81\x80\xC0X@` \xB0\x80\xC0@`,\x81\x80\xC0X@` \xB0\x80\xC0@`,\x81\x80\xC0X\x81 \xB0\x80\xC0@`,\x81\x80\xC0X\x81 \xB0>\xECZ\xB6\xA9\xE29\x94BIEND\xAEB`\x82
\ No newline at end of file

Modified: trunk/Source/WebCore/ChangeLog (96448 => 96449)


--- trunk/Source/WebCore/ChangeLog	2011-10-01 01:40:31 UTC (rev 96448)
+++ trunk/Source/WebCore/ChangeLog	2011-10-01 01:43:20 UTC (rev 96449)
@@ -1,3 +1,24 @@
+2011-09-30  David Barr  <davidb...@chromium.org>
+
+        Implement currentColor support for CSS gradients
+        https://bugs.webkit.org/show_bug.cgi?id=58730
+
+        Reviewed by Adam Barth.
+
+        Allow currentColor as a CSS3 gradient color-stop.
+
+        Test: fast/css/linear-gradient-currentcolor.html
+
+        * css/CSSGradientValue.cpp:
+        (WebCore::CSSGradientValue::isCacheable): Make currentColor uncacheable since the
+        background image may be invalidated if currentColor is used as a gradient stop and
+        the value of the 'color' property changes.
+        * css/CSSParser.cpp:
+        (WebCore::parseGradientColorOrKeyword): Accept the currentColor keyword.
+        * rendering/style/StyleGeneratedImage.cpp:
+        (WebCore::StyleGeneratedImage::image): Initialize document styleSelector so that
+        currentColor may be computed for a StyleGeneratedImage.
+
 2011-09-30  Gavin Barraclough  <barraclo...@apple.com>
 
         Remove toStrictThisObject, toThisString, toThisJSString

Modified: trunk/Source/WebCore/css/CSSGradientValue.cpp (96448 => 96449)


--- trunk/Source/WebCore/css/CSSGradientValue.cpp	2011-10-01 01:40:31 UTC (rev 96448)
+++ trunk/Source/WebCore/css/CSSGradientValue.cpp	2011-10-01 01:43:20 UTC (rev 96449)
@@ -412,6 +412,11 @@
 {
     for (size_t i = 0; i < m_stops.size(); ++i) {
         const CSSGradientColorStop& stop = m_stops[i];
+
+        CSSPrimitiveValue* color = stop.m_color.get();
+        if (color->getIdent() == CSSValueCurrentcolor)
+            return false;
+
         if (!stop.m_position)
             continue;

Modified: trunk/Source/WebCore/css/CSSParser.cpp (96448 => 96449)


--- trunk/Source/WebCore/css/CSSParser.cpp	2011-10-01 01:40:31 UTC (rev 96448)
+++ trunk/Source/WebCore/css/CSSParser.cpp	2011-10-01 01:43:20 UTC (rev 96449)
@@ -5915,7 +5915,7 @@
 static PassRefPtr<CSSPrimitiveValue> parseGradientColorOrKeyword(CSSParser* p, CSSParserValue* value)
 {
     int id = value->id;
-    if (id == CSSValueWebkitText || (id >= CSSValueAqua && id <= CSSValueWindowtext) || id == CSSValueMenu)
+    if (id == CSSValueWebkitText || (id >= CSSValueAqua && id <= CSSValueWindowtext) || id == CSSValueMenu || id == CSSValueCurrentcolor)
         return p->primitiveValueCache()->createIdentifierValue(id);
 
     return p->parseColor(value);

Modified: trunk/Source/WebCore/rendering/style/StyleGeneratedImage.cpp (96448 => 96449)


--- trunk/Source/WebCore/rendering/style/StyleGeneratedImage.cpp	2011-10-01 01:40:31 UTC (rev 96448)
+++ trunk/Source/WebCore/rendering/style/StyleGeneratedImage.cpp	2011-10-01 01:43:20 UTC (rev 96449)
@@ -25,6 +25,7 @@
 #include "StyleGeneratedImage.h"
 
 #include "CSSImageGeneratorValue.h"
+#include "CSSStyleSelector.h"
 #include "RenderObject.h"
 
 namespace WebCore {
@@ -74,6 +75,7 @@
 
 PassRefPtr<Image> StyleGeneratedImage::image(RenderObject* renderer, const IntSize& size) const
 {
+    renderer->document()->styleSelector()->setStyle(renderer->style());
     return m_generator->image(renderer, size);
 }

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

[webkit-changes] [96449] trunk

Log Message

Modified Paths

Added Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (96448 => 96449)

Added: trunk/LayoutTests/fast/css/linear-gradient-currentcolor-expected.txt (0 => 96449)

Added: trunk/LayoutTests/fast/css/linear-gradient-currentcolor.html (0 => 96449)

Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (96448 => 96449)

Added: trunk/LayoutTests/platform/mac/fast/css/linear-gradient-currentcolor-expected.png (0 => 96449)

Modified: trunk/Source/WebCore/ChangeLog (96448 => 96449)

Modified: trunk/Source/WebCore/css/CSSGradientValue.cpp (96448 => 96449)

Modified: trunk/Source/WebCore/css/CSSParser.cpp (96448 => 96449)

Modified: trunk/Source/WebCore/rendering/style/StyleGeneratedImage.cpp (96448 => 96449)

Reply via email to