Diff
Modified: trunk/LayoutTests/ChangeLog (126191 => 126192)
--- trunk/LayoutTests/ChangeLog 2012-08-21 21:58:45 UTC (rev 126191)
+++ trunk/LayoutTests/ChangeLog 2012-08-21 22:02:13 UTC (rev 126192)
@@ -1,3 +1,20 @@
+2012-08-21 Sudarsana Nagineni <[email protected]>
+
+ canvas/philip/tests/2d.fillStyle.parse.invalid.rgba-6.html fails
+ https://bugs.webkit.org/show_bug.cgi?id=50797
+
+ Reviewed by Andreas Kling.
+
+ Unskipped tests that are now passing after this fix and removed
+ wrong expectations.
+
+ * platform/chromium/TestExpectations:
+ * platform/chromium/canvas/philip/tests/2d.fillStyle.parse.invalid.rgba-6-expected.txt: Removed.
+ * platform/efl/Skipped:
+ * platform/gtk/TestExpectations:
+ * platform/mac/canvas/philip/tests/2d.fillStyle.parse.invalid.rgba-6-expected.txt: Removed.
+ * platform/qt/Skipped:
+
2012-08-21 Levi Weintraub <[email protected]>
Unreviewed gardening. Rebaselines following r126110.
Modified: trunk/LayoutTests/platform/chromium/TestExpectations (126191 => 126192)
--- trunk/LayoutTests/platform/chromium/TestExpectations 2012-08-21 21:58:45 UTC (rev 126191)
+++ trunk/LayoutTests/platform/chromium/TestExpectations 2012-08-21 22:02:13 UTC (rev 126192)
@@ -1873,9 +1873,6 @@
BUGWK45991 LINUX WIN : canvas/philip/tests/2d.text.draw.baseline.ideographic.html = TEXT
BUGWK45991 LINUX ANDROID WIN : platform/chromium/virtual/gpu/canvas/philip/tests/2d.text.draw.baseline.ideographic.html = TEXT
-BUGWK50797 : canvas/philip/tests/2d.fillStyle.parse.invalid.rgba-6.html = TEXT
-BUGWK50797 : platform/chromium/virtual/gpu/canvas/philip/tests/2d.fillStyle.parse.invalid.rgba-6.html = TEXT
-
// Update canvas/philip in WK r71481
BUGCR62301 : canvas/philip/tests/2d.drawImage.image.incomplete.omitted.html = TEXT
BUGCR62301 : canvas/philip/tests/2d.fillStyle.parse.rgb-eof.html = TEXT
Deleted: trunk/LayoutTests/platform/chromium/canvas/philip/tests/2d.fillStyle.parse.invalid.rgba-6-expected.txt (126191 => 126192)
--- trunk/LayoutTests/platform/chromium/canvas/philip/tests/2d.fillStyle.parse.invalid.rgba-6-expected.txt 2012-08-21 21:58:45 UTC (rev 126191)
+++ trunk/LayoutTests/platform/chromium/canvas/philip/tests/2d.fillStyle.parse.invalid.rgba-6-expected.txt 2012-08-21 22:02:13 UTC (rev 126192)
@@ -1 +0,0 @@
-Passed
Modified: trunk/LayoutTests/platform/efl/Skipped (126191 => 126192)
--- trunk/LayoutTests/platform/efl/Skipped 2012-08-21 21:58:45 UTC (rev 126191)
+++ trunk/LayoutTests/platform/efl/Skipped 2012-08-21 22:02:13 UTC (rev 126192)
@@ -305,7 +305,6 @@
canvas/philip/tests/2d.composite.operation.darker.html
canvas/philip/tests/2d.drawImage.broken.html
canvas/philip/tests/2d.drawImage.image.incomplete.omitted.html
-canvas/philip/tests/2d.fillStyle.parse.invalid.rgba-6.html
canvas/philip/tests/2d.fillStyle.parse.rgb-eof.html
canvas/philip/tests/2d.fillStyle.parse.rgba-eof.html
canvas/philip/tests/2d.missingargs.html
Modified: trunk/LayoutTests/platform/gtk/TestExpectations (126191 => 126192)
--- trunk/LayoutTests/platform/gtk/TestExpectations 2012-08-21 21:58:45 UTC (rev 126191)
+++ trunk/LayoutTests/platform/gtk/TestExpectations 2012-08-21 22:02:13 UTC (rev 126192)
@@ -909,7 +909,6 @@
BUGWKGTK : canvas/philip/tests/2d.composite.operation.darker.html = TEXT
BUGWKGTK : canvas/philip/tests/2d.drawImage.broken.html = TEXT
BUGWKGTK : canvas/philip/tests/2d.drawImage.image.incomplete.omitted.html = TEXT
-BUGWKGTK : canvas/philip/tests/2d.fillStyle.parse.invalid.rgba-6.html = TEXT
BUGWKGTK : canvas/philip/tests/2d.fillStyle.parse.rgb-eof.html = TEXT
BUGWKGTK : canvas/philip/tests/2d.fillStyle.parse.rgba-eof.html = TEXT
BUGWKGTK : canvas/philip/tests/2d.missingargs.html = TEXT
Deleted: trunk/LayoutTests/platform/mac/canvas/philip/tests/2d.fillStyle.parse.invalid.rgba-6-expected.txt (126191 => 126192)
--- trunk/LayoutTests/platform/mac/canvas/philip/tests/2d.fillStyle.parse.invalid.rgba-6-expected.txt 2012-08-21 21:58:45 UTC (rev 126191)
+++ trunk/LayoutTests/platform/mac/canvas/philip/tests/2d.fillStyle.parse.invalid.rgba-6-expected.txt 2012-08-21 22:02:13 UTC (rev 126192)
@@ -1 +0,0 @@
-Failed assertion: got pixel [255,0,0,255] at (50,25), expected [0,255,0,255]
Modified: trunk/LayoutTests/platform/qt/Skipped (126191 => 126192)
--- trunk/LayoutTests/platform/qt/Skipped 2012-08-21 21:58:45 UTC (rev 126191)
+++ trunk/LayoutTests/platform/qt/Skipped 2012-08-21 22:02:13 UTC (rev 126192)
@@ -2121,7 +2121,6 @@
# Failing tests after sync with Philip Taylor's upstream tests
canvas/philip/tests/2d.drawImage.image.incomplete.omitted.html
-canvas/philip/tests/2d.fillStyle.parse.invalid.rgba-6.html
canvas/philip/tests/2d.fillStyle.parse.rgb-eof.html
canvas/philip/tests/2d.fillStyle.parse.rgba-eof.html
canvas/philip/tests/2d.imageData.put.wrongtype.html
Modified: trunk/Source/WebCore/ChangeLog (126191 => 126192)
--- trunk/Source/WebCore/ChangeLog 2012-08-21 21:58:45 UTC (rev 126191)
+++ trunk/Source/WebCore/ChangeLog 2012-08-21 22:02:13 UTC (rev 126192)
@@ -1,3 +1,18 @@
+2012-08-21 Sudarsana Nagineni <[email protected]>
+
+ canvas/philip/tests/2d.fillStyle.parse.invalid.rgba-6.html fails
+ https://bugs.webkit.org/show_bug.cgi?id=50797
+
+ Reviewed by Andreas Kling.
+
+ Add a check in fast-path parseAlphaValue() to return early
+ if the CSS <alphavalue> ended with an invalid digit.
+
+ Test: canvas/philip/tests/2d.fillStyle.parse.invalid.rgba-6.html
+
+ * css/CSSParser.cpp:
+ (WebCore::parseAlphaValue):
+
2012-08-21 Benjamin Poulain <[email protected]>
Store CString data in the CStringBuffer to avoid the double indirection
Modified: trunk/Source/WebCore/css/CSSParser.cpp (126191 => 126192)
--- trunk/Source/WebCore/css/CSSParser.cpp 2012-08-21 21:58:45 UTC (rev 126191)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2012-08-21 22:02:13 UTC (rev 126192)
@@ -5335,7 +5335,7 @@
if (length < 2)
return false;
- if (string[length - 1] != terminator)
+ if (string[length - 1] != terminator || !isASCIIDigit(string[length - 2]))
return false;
if (string[0] != '0' && string[0] != '1' && string[0] != '.') {
