Title: [125003] trunk
- Revision
- 125003
- Author
- commit-qu...@webkit.org
- Date
- 2012-08-08 00:13:36 -0700 (Wed, 08 Aug 2012)
Log Message
'highlight' should not be parsed for a composite operation
https://bugs.webkit.org/show_bug.cgi?id=92615
Patch by Douglas Stockwell <dstockw...@chromium.org> on 2012-08-08
Reviewed by Ryosuke Niwa.
Source/WebCore:
r88144 removed support for highlight as a composite operation but did
not update the parser.
Test: fast/backgrounds/composite-highlight-is-invalid.html
* css/CSSParser.cpp:
(WebCore::CSSParser::parseFillProperty):
LayoutTests:
* fast/backgrounds/composite-highlight-is-invalid-expected.txt: Added.
* fast/backgrounds/composite-highlight-is-invalid.html: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (125002 => 125003)
--- trunk/LayoutTests/ChangeLog 2012-08-08 07:12:26 UTC (rev 125002)
+++ trunk/LayoutTests/ChangeLog 2012-08-08 07:13:36 UTC (rev 125003)
@@ -1,3 +1,13 @@
+2012-08-08 Douglas Stockwell <dstockw...@chromium.org>
+
+ 'highlight' should not be parsed for a composite operation
+ https://bugs.webkit.org/show_bug.cgi?id=92615
+
+ Reviewed by Ryosuke Niwa.
+
+ * fast/backgrounds/composite-highlight-is-invalid-expected.txt: Added.
+ * fast/backgrounds/composite-highlight-is-invalid.html: Added.
+
2012-08-08 Takashi Toyoshima <toyos...@chromium.org>
Unreviewed, adding new results for chromium.
Added: trunk/LayoutTests/fast/backgrounds/composite-highlight-is-invalid-expected.txt (0 => 125003)
--- trunk/LayoutTests/fast/backgrounds/composite-highlight-is-invalid-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/backgrounds/composite-highlight-is-invalid-expected.txt 2012-08-08 07:13:36 UTC (rev 125003)
@@ -0,0 +1,3 @@
+Tests that highlight is treated the same as an invalid value for a composite operation:
+PASS
+
Added: trunk/LayoutTests/fast/backgrounds/composite-highlight-is-invalid.html (0 => 125003)
--- trunk/LayoutTests/fast/backgrounds/composite-highlight-is-invalid.html (rev 0)
+++ trunk/LayoutTests/fast/backgrounds/composite-highlight-is-invalid.html 2012-08-08 07:13:36 UTC (rev 125003)
@@ -0,0 +1,15 @@
+<style>
+#test1 { -webkit-background-composite: highlight; }
+#test2 { -webkit-background-composite: invalid; }
+</style>
+Tests that highlight is treated the same as an invalid value for a composite operation:<br>
+<div id="result"></div>
+<span id="test1"></span>
+<span id="test2"></span>
+<script>
+value1 = window.getComputedStyle(document.getElementById('test1')).webkitBackgroundComposite;
+value2 = window.getComputedStyle(document.getElementById('test2')).webkitBackgroundComposite;
+result.innerText = value1 === value2 ? "PASS" : "FAIL";
+if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
Modified: trunk/Source/WebCore/ChangeLog (125002 => 125003)
--- trunk/Source/WebCore/ChangeLog 2012-08-08 07:12:26 UTC (rev 125002)
+++ trunk/Source/WebCore/ChangeLog 2012-08-08 07:13:36 UTC (rev 125003)
@@ -1,3 +1,18 @@
+2012-08-08 Douglas Stockwell <dstockw...@chromium.org>
+
+ 'highlight' should not be parsed for a composite operation
+ https://bugs.webkit.org/show_bug.cgi?id=92615
+
+ Reviewed by Ryosuke Niwa.
+
+ r88144 removed support for highlight as a composite operation but did
+ not update the parser.
+
+ Test: fast/backgrounds/composite-highlight-is-invalid.html
+
+ * css/CSSParser.cpp:
+ (WebCore::CSSParser::parseFillProperty):
+
2012-08-08 Takashi Sakamoto <ta...@google.com>
showNodePath should show the age of ShadowRoot
Modified: trunk/Source/WebCore/css/CSSParser.cpp (125002 => 125003)
--- trunk/Source/WebCore/css/CSSParser.cpp 2012-08-08 07:12:26 UTC (rev 125002)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2012-08-08 07:13:36 UTC (rev 125003)
@@ -3860,7 +3860,7 @@
}
case CSSPropertyWebkitBackgroundComposite:
case CSSPropertyWebkitMaskComposite:
- if ((val->id >= CSSValueClear && val->id <= CSSValuePlusLighter) || val->id == CSSValueHighlight) {
+ if (val->id >= CSSValueClear && val->id <= CSSValuePlusLighter) {
currValue = cssValuePool().createIdentifierValue(val->id);
m_valueList->next();
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
