Changeset 208111 in webkit

Timestamp:

Oct 29, 2016 12:14:10 PM (7 years ago)

Author:

hyatt@apple.com

Message:

[CSS Parser] Support -webkit-aspect-ratio
​https://bugs.webkit.org/show_bug.cgi?id=164187

Reviewed by Simon Fraser.

• css/parser/CSSPropertyParser.cpp:

(WebCore::consumeWebkitAspectRatio):
(WebCore::CSSPropertyParser::parseSingleValue):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/parser/CSSPropertyParser.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-10-29  Dave Hyatt  <hyatt@apple.com>
+
+        [CSS Parser] Support -webkit-aspect-ratio
+        https://bugs.webkit.org/show_bug.cgi?id=164187
+
+        Reviewed by Simon Fraser.
+
+        * css/parser/CSSPropertyParser.cpp:
+        (WebCore::consumeWebkitAspectRatio):
+        (WebCore::CSSPropertyParser::parseSingleValue):
+
 2016-10-29  Dave Hyatt  <hyatt@apple.com>
 

trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp

@@ -31 +31 @@
 #include "CSSPropertyParser.h"
 
+#include "CSSAspectRatioValue.h"
 #include "CSSBasicShapes.h"
 #include "CSSBorderImage.h"
@@ -3245 +3246 @@
     
     return consumeAttr(consumeFunction(range), context);
+}
+
+static RefPtr<CSSValue> consumeWebkitAspectRatio(CSSParserTokenRange& range)
+{
+    if (range.peek().type() == IdentToken)
+        return consumeIdent<CSSValueAuto, CSSValueFromDimensions, CSSValueFromIntrinsic>(range);
+    
+    RefPtr<CSSPrimitiveValue> leftValue = consumeNumber(range, ValueRangeNonNegative);
+    if (!leftValue || range.atEnd() || !consumeSlashIncludingWhitespace(range))
+        return nullptr;
+    RefPtr<CSSPrimitiveValue> rightValue = consumeNumber(range, ValueRangeNonNegative);
+    if (!rightValue)
+        return nullptr;
+    
+    return CSSAspectRatioValue::create(leftValue->floatValue(), rightValue->floatValue());
 }
 
@@ -3632 +3648 @@
     case CSSPropertyAlt:
         return consumeAlt(m_range, m_context);
+    case CSSPropertyWebkitAspectRatio:
+        return consumeWebkitAspectRatio(m_range);
     default:
         return nullptr;