Title: [88750] branches/chromium/742
- Revision
- 88750
- Author
- cev...@google.com
- Date
- 2011-06-13 19:08:02 -0700 (Mon, 13 Jun 2011)
Log Message
Merge 88448
BUG=85003
Review URL: http://codereview.chromium.org/7149011
Modified Paths
Added Paths
Diff
Copied: branches/chromium/742/LayoutTests/css3/calc/regression-62276-expected.txt (from rev 88448, trunk/LayoutTests/css3/calc/regression-62276-expected.txt) (0 => 88750)
--- branches/chromium/742/LayoutTests/css3/calc/regression-62276-expected.txt (rev 0)
+++ branches/chromium/742/LayoutTests/css3/calc/regression-62276-expected.txt 2011-06-14 02:08:02 UTC (rev 88750)
@@ -0,0 +1,3 @@
+The test passes if it does not crash
+
+
Copied: branches/chromium/742/LayoutTests/css3/calc/regression-62276.html (from rev 88448, trunk/LayoutTests/css3/calc/regression-62276.html) (0 => 88750)
--- branches/chromium/742/LayoutTests/css3/calc/regression-62276.html (rev 0)
+++ branches/chromium/742/LayoutTests/css3/calc/regression-62276.html 2011-06-14 02:08:02 UTC (rev 88750)
@@ -0,0 +1,12 @@
+<p>The test passes if it does not crash</p>
+
+<a style="-webkit-box-reflect:above 1px -webkit-calc(1)"></a>
+<a style="-webkit-box-reflect:above 1px -webkit-min(1)"></a>
+<a style="-webkit-box-reflect:above 1px -webkit-max(1)"></a>
+
+<script>
+if (window.layoutTestController)
+ layoutTestController.dumpAsText();
+</script>
+
+
Modified: branches/chromium/742/Source/WebCore/css/CSSParser.cpp (88749 => 88750)
--- branches/chromium/742/Source/WebCore/css/CSSParser.cpp 2011-06-14 02:07:07 UTC (rev 88749)
+++ branches/chromium/742/Source/WebCore/css/CSSParser.cpp 2011-06-14 02:08:02 UTC (rev 88750)
@@ -5934,6 +5934,9 @@
case FUNCTION:
case ANYFUNCTION:
case NOTFUNCTION:
+ case CALCFUNCTION:
+ case MINFUNCTION:
+ case MAXFUNCTION:
yylval->string.characters = t;
yylval->string.length = length;
break;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
