Changeset 148220 in webkit

Timestamp:

Apr 11, 2013 11:54:09 AM (11 years ago)

Author:

Michelangelo De Simone

Message:

[CSS Shaders] Parse the geometry descriptor
​https://bugs.webkit.org/show_bug.cgi?id=110815

Source/WebCore:

Added initial parsing for the "geometry" descriptor, as per specification:
​https://dvcs.w3.org/hg/FXTF/raw-file/tip/filters/index.html#geometry
This descriptor allows to specify the mesh geometry for custom filters.

Reviewed by Dirk Schulze.

Tests: css3/filters/custom-with-at-rule-syntax/parsing-geometry-property-invalid.html

css3/filters/custom-with-at-rule-syntax/parsing-geometry-property-valid.html

• css/CSSComputedStyleDeclaration.cpp:

(WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):

• css/CSSParser.cpp:

(WebCore::CSSParser::parseValue):
(WebCore::CSSParser::parseGeometry): New method that parses the geometry
descriptor (grid()).
(WebCore):

• css/CSSParser.h:
• css/CSSProperty.cpp:

(WebCore::CSSProperty::isInheritedProperty):

• css/CSSPropertyNames.in: Added conditional "geometry" property.
• css/CSSValueKeywords.in: Added conditional "attached" value keyword; detached

was already there.

LayoutTests:

Positive and negative parsing tests for the "geometry" descriptor as
per specification:
​https://dvcs.w3.org/hg/FXTF/raw-file/tip/filters/index.html#geometry

Reviewed by Dirk Schulze.

• css3/filters/custom-with-at-rule-syntax/parsing-geometry-property-invalid-expected.txt: Added.
• css3/filters/custom-with-at-rule-syntax/parsing-geometry-property-invalid.html: Added.
• css3/filters/custom-with-at-rule-syntax/parsing-geometry-property-valid-expected.txt: Added.
• css3/filters/custom-with-at-rule-syntax/parsing-geometry-property-valid.html: Added.
• css3/filters/custom-with-at-rule-syntax/script-tests/parsing-geometry-property-invalid.js: Added.

(testInvalidGeometryProperty):

• css3/filters/custom-with-at-rule-syntax/script-tests/parsing-geometry-property-valid.js: Added.

(testGeometryProperty):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/css3/filters/custom-with-at-rule-syntax/parsing-geometry-property-invalid-expected.txt (added)
• LayoutTests/css3/filters/custom-with-at-rule-syntax/parsing-geometry-property-invalid.html (added)
• LayoutTests/css3/filters/custom-with-at-rule-syntax/parsing-geometry-property-valid-expected.txt (added)
• LayoutTests/css3/filters/custom-with-at-rule-syntax/parsing-geometry-property-valid.html (added)
• LayoutTests/css3/filters/custom-with-at-rule-syntax/script-tests/parsing-geometry-property-invalid.js (added)
• LayoutTests/css3/filters/custom-with-at-rule-syntax/script-tests/parsing-geometry-property-valid.js (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/CSSComputedStyleDeclaration.cpp (modified) (1 diff)
• Source/WebCore/css/CSSParser.cpp (modified) (2 diffs)
• Source/WebCore/css/CSSParser.h (modified) (1 diff)
• Source/WebCore/css/CSSProperty.cpp (modified) (1 diff)
• Source/WebCore/css/CSSPropertyNames.in (modified) (1 diff)
• Source/WebCore/css/CSSValueKeywords.in (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-04-11  Michelangelo De Simone  <michelangelo@webkit.org>
+
+        [CSS Shaders] Parse the geometry descriptor
+        https://bugs.webkit.org/show_bug.cgi?id=110815
+
+        Positive and negative parsing tests for the "geometry" descriptor as
+        per specification:
+        https://dvcs.w3.org/hg/FXTF/raw-file/tip/filters/index.html#geometry
+
+        Reviewed by Dirk Schulze.
+
+        * css3/filters/custom-with-at-rule-syntax/parsing-geometry-property-invalid-expected.txt: Added.
+        * css3/filters/custom-with-at-rule-syntax/parsing-geometry-property-invalid.html: Added.
+        * css3/filters/custom-with-at-rule-syntax/parsing-geometry-property-valid-expected.txt: Added.
+        * css3/filters/custom-with-at-rule-syntax/parsing-geometry-property-valid.html: Added.
+        * css3/filters/custom-with-at-rule-syntax/script-tests/parsing-geometry-property-invalid.js: Added.
+        (testInvalidGeometryProperty):
+        * css3/filters/custom-with-at-rule-syntax/script-tests/parsing-geometry-property-valid.js: Added.
+        (testGeometryProperty):
+
 2013-04-11  Zan Dobersek  <zdobersek@igalia.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-11  Michelangelo De Simone  <michelangelo@webkit.org>
+
+        [CSS Shaders] Parse the geometry descriptor
+        https://bugs.webkit.org/show_bug.cgi?id=110815
+
+        Added initial parsing for the "geometry" descriptor, as per specification:
+        https://dvcs.w3.org/hg/FXTF/raw-file/tip/filters/index.html#geometry
+        This descriptor allows to specify the mesh geometry for custom filters.
+
+        Reviewed by Dirk Schulze.
+
+        Tests: css3/filters/custom-with-at-rule-syntax/parsing-geometry-property-invalid.html
+               css3/filters/custom-with-at-rule-syntax/parsing-geometry-property-valid.html
+
+        * css/CSSComputedStyleDeclaration.cpp:
+        (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):
+        * css/CSSParser.cpp:
+        (WebCore::CSSParser::parseValue):
+        (WebCore::CSSParser::parseGeometry): New method that parses the geometry
+        descriptor (grid()).
+        (WebCore):
+        * css/CSSParser.h:
+        * css/CSSProperty.cpp:
+        (WebCore::CSSProperty::isInheritedProperty):
+        * css/CSSPropertyNames.in: Added conditional "geometry" property.
+        * css/CSSValueKeywords.in: Added conditional "attached" value keyword; detached
+        was already there.
+
 2013-04-11  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp

@@ -2792 +2792 @@
 
         /* Other unimplemented properties */
+#if ENABLE(CSS_SHADERS)
+        case CSSPropertyGeometry:
+#endif
         case CSSPropertyPage: // for @page
         case CSSPropertyQuotes: // FIXME: needs implementation

trunk/Source/WebCore/css/CSSParser.cpp

@@ -2909 +2909 @@
         return parsePage(propId, important);
     case CSSPropertyFontStretch:
+#if ENABLE(CSS_SHADERS)
+    case CSSPropertyGeometry:
+        return m_inFilterRule ? parseGeometry(propId, value, important) : false;
+#endif
     case CSSPropertyTextLineThrough:
     case CSSPropertyTextOverline:
@@ -8848 +8852 @@
 }
 
+bool CSSParser::parseGeometry(CSSPropertyID propId, CSSParserValue* value, bool important)
+{
+    ASSERT(propId == CSSPropertyGeometry);
+
+    // <geometry-shape> = grid(<integer>{1,2} || [ detached | attached ]?)
+    if (value->unit != CSSParserValue::Function || !equalIgnoringCase(value->function->name, "grid("))
+        return false;
+
+    ASSERT(value->function->args);
+
+    // grid() function should have from 1 to 3 arguments.
+    unsigned size = value->function->args->size();
+    if (!size || size > 3)
+        return false;
+
+    CSSParserValueList* gridParserValueList = value->function->args.get();
+    CSSParserValue* gridParserValue = gridParserValueList->current();
+    RefPtr<CSSValueList> geometryList = CSSValueList::createSpaceSeparated();
+
+    bool hasDimensions = false;
+    bool hasConnectivity = false;
+
+    while (gridParserValue) {
+        if (hasDimensions && hasConnectivity) {
+            geometryList.release();
+            return false;
+        }
+
+        if (gridParserValue->id == CSSValueAttached || gridParserValue->id == CSSValueDetached) {
+            hasConnectivity = true;
+            geometryList->append(cssValuePool().createIdentifierValue(gridParserValue->id));
+            gridParserValue = gridParserValueList->next();
+        } else if (!hasDimensions && parseGridDimensions(gridParserValueList, geometryList)) {
+            hasDimensions = true;
+            gridParserValue = gridParserValueList->current();
+        } else {
+            geometryList.release();
+            return false;
+        }
+    }
+
+    addProperty(propId, geometryList.release(), important);
+    return hasDimensions;
+}
+
+bool CSSParser::parseGridDimensions(CSSParserValueList* args, RefPtr<CSSValueList>& gridValueList)
+{
+    ASSERT(args);
+
+    // There must be at least one valid numeric value.
+    CSSParserValue* arg = args->current();
+    if (!arg || !validUnit(arg, FPositiveInteger))
+        return false;
+
+    // A valid numeric value is parsed and then we move on.
+    gridValueList->append(createPrimitiveNumericValue(arg));
+    arg = args->next();
+
+    // If the next argument is not numeric, we are done parsing the grid dimensions.
+    if (!arg || !validUnit(arg, FPositiveInteger))
+        return true;
+
+    // Commit the second numeric value we found.
+    gridValueList->append(createPrimitiveNumericValue(arg));
+    args->next();
+    return true;
+}
+
 StyleRuleBase* CSSParser::createFilterRule(const CSSParserString& filterName)
 {

trunk/Source/WebCore/css/CSSParser.h

@@ -255 +255 @@
     bool parseFilterRuleSrc();
     bool parseFilterRuleMix();
+    bool parseGeometry(CSSPropertyID, CSSParserValue*, bool);
+    bool parseGridDimensions(CSSParserValueList*, RefPtr<CSSValueList>&); 
     PassRefPtr<WebKitCSSShaderValue> parseFilterRuleSrcUriAndFormat(CSSParserValueList*);
 #endif

trunk/Source/WebCore/css/CSSProperty.cpp

@@ -442 +442 @@
     case CSSPropertyFloat:
     case CSSPropertyFontStretch:
+#if ENABLE(CSS_SHADERS)
+    case CSSPropertyGeometry:
+#endif
     case CSSPropertyHeight:
     case CSSPropertyLeft:

trunk/Source/WebCore/css/CSSPropertyNames.in

@@ -106 +106 @@
 float
 font-stretch
+#if defined(ENABLE_CSS_SHADERS) && ENABLE_CSS_SHADERS
+geometry
+#endif
 height
 #if defined(ENABLE_CSS_IMAGE_ORIENTATION) && ENABLE_CSS_IMAGE_ORIENTATION

trunk/Source/WebCore/css/CSSValueKeywords.in

@@ -987 +987 @@
 // padding-box
 // content-box
+attached
 filter-box
 detached