Title: [209324] trunk/Source/WebCore
Revision
209324
Author
[email protected]
Date
2016-12-05 10:04:48 -0800 (Mon, 05 Dec 2016)

Log Message

[CSS Parser] Fix rx and ry parsing
https://bugs.webkit.org/show_bug.cgi?id=165383

Reviewed by Dean Jackson.

* css/parser/CSSParserFastPaths.cpp:
(WebCore::isSimpleLengthPropertyID):
rx and ry can be negative in the slow path, so make sure they can be negative in the
fast path too.

* css/parser/CSSPropertyParser.cpp:
(WebCore::consumeRxOrRy):
Disallow auto as a value since we are not equipped to handle it, and it's not clear if it's
even valid.

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (209323 => 209324)


--- trunk/Source/WebCore/ChangeLog	2016-12-05 17:50:35 UTC (rev 209323)
+++ trunk/Source/WebCore/ChangeLog	2016-12-05 18:04:48 UTC (rev 209324)
@@ -1,3 +1,20 @@
+2016-12-05  Dave Hyatt  <[email protected]>
+
+        [CSS Parser] Fix rx and ry parsing
+        https://bugs.webkit.org/show_bug.cgi?id=165383
+
+        Reviewed by Dean Jackson.
+
+        * css/parser/CSSParserFastPaths.cpp:
+        (WebCore::isSimpleLengthPropertyID):
+        rx and ry can be negative in the slow path, so make sure they can be negative in the
+        fast path too.
+
+        * css/parser/CSSPropertyParser.cpp:
+        (WebCore::consumeRxOrRy):
+        Disallow auto as a value since we are not equipped to handle it, and it's not clear if it's
+        even valid.
+
 2016-12-05  Konstantin Tokarev  <[email protected]>
 
         Add __STDC_FORMAT_MACROS before inttypes.h is included

Modified: trunk/Source/WebCore/css/parser/CSSParserFastPaths.cpp (209323 => 209324)


--- trunk/Source/WebCore/css/parser/CSSParserFastPaths.cpp	2016-12-05 17:50:35 UTC (rev 209323)
+++ trunk/Source/WebCore/css/parser/CSSParserFastPaths.cpp	2016-12-05 18:04:48 UTC (rev 209324)
@@ -71,9 +71,6 @@
     case CSSPropertyWebkitPaddingEnd:
     case CSSPropertyWebkitPaddingStart:
     case CSSPropertyShapeMargin:
-    case CSSPropertyR:
-    case CSSPropertyRx:
-    case CSSPropertyRy:
         acceptsNegativeNumbers = false;
         return true;
     case CSSPropertyBottom:
@@ -92,6 +89,9 @@
     case CSSPropertyWebkitMarginStart:
     case CSSPropertyX:
     case CSSPropertyY:
+    case CSSPropertyR:
+    case CSSPropertyRx:
+    case CSSPropertyRy:
         acceptsNegativeNumbers = true;
         return true;
     default:

Modified: trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp (209323 => 209324)


--- trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp	2016-12-05 17:50:35 UTC (rev 209323)
+++ trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp	2016-12-05 18:04:48 UTC (rev 209324)
@@ -2069,8 +2069,10 @@
 
 static RefPtr<CSSPrimitiveValue> consumeRxOrRy(CSSParserTokenRange& range)
 {
-    if (range.peek().id() == CSSValueAuto)
-        return consumeIdent(range);
+    // FIXME-NEWPARSER: We don't support auto values when mapping, so for now turn this
+    // off until we can figure out if we're even supposed to support it.
+    // if (range.peek().id() == CSSValueAuto)
+    //     return consumeIdent(range);
     return consumeLengthOrPercent(range, SVGAttributeMode, ValueRangeAll, UnitlessQuirk::Forbid);
 }
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to