Changeset 148852 in webkit for trunk/Source/WebCore/css/CSSValue.cpp

Timestamp:

Apr 21, 2013, 9:39:07 PM (12 years ago)

Author:

[email protected]

Message:

[Part 4] Parse the custom() function in -webkit-filter: parse the matN() functions
​https://bugs.webkit.org/show_bug.cgi?id=71444

Reviewed by Dean Jackson.

Source/WebCore:

Custom filter parameters should support mat2 to mat4 value functions. Added parsing
and style resolving bits to support the matrix function values. A later patch will
add the matrices to the shader program.

​https://dvcs.w3.org/hg/FXTF/raw-file/tip/filters/index.html#custom-filter-parameters

Modified existing tests to cover changes.

• GNUmakefile.list.am: Added WebKitCSSMatFunctionValue to individual build systems.
• Target.pri:
• WebCore.vcproj/WebCore.vcproj:
• WebCore.vcxproj/WebCore.vcxproj:
• WebCore.vcxproj/WebCore.vcxproj.filters:
• WebCore.xcodeproj/project.pbxproj:
• css/CSSComputedStyleDeclaration.cpp:

(WebCore::valueForCustomFilterMatParameter):
(WebCore):
(WebCore::valueForCustomFilterParameter):

• css/CSSParser.cpp:

(WebCore::CSSParser::parseTransform):
(WebCore::CSSParser::parseMatValue):
(WebCore):
(WebCore::CSSParser::parseCustomFilterParameters):

• css/CSSParser.h:

(WebCore):

• css/CSSValue.cpp:

(WebCore::CSSValue::reportMemoryUsage):
(WebCore::CSSValue::equals):
(WebCore::CSSValue::cssText):
(WebCore::CSSValue::destroy):
(WebCore::CSSValue::cloneForCSSOM):

• css/CSSValue.h:

(WebCore::CSSValue::isWebKitCSSMatFunctionValue):

• css/StyleResolver.cpp:

(WebCore::StyleResolver::parseCustomFilterArrayParameter):
(WebCore::StyleResolver::parseCustomFilterParameter):

• css/StyleResolver.h:

(StyleResolver):

• css/WebKitCSSMatFunctionValue.cpp:

(WebCore::WebKitCSSMatFunctionValue::WebKitCSSMatFunctionValue):
(WebCore::WebKitCSSMatFunctionValue::customCssText):
(WebCore::WebKitCSSMatFunctionValue::cloneForCSSOM):
(WebCore::WebKitCSSMatFunctionValue::equals):
(WebCore::WebKitCSSMatFunctionValue::reportDescendantMemoryUsage):

• css/WebKitCSSMatFunctionValue.h:

(WebKitCSSMatFunctionValue):
(WebCore::WebKitCSSMatFunctionValue::create):

• platform/graphics/filters/CustomFilterArrayParameter.h:

(WebCore::CustomFilterArrayParameter::create):
(WebCore::CustomFilterArrayParameter::CustomFilterArrayParameter):

• platform/graphics/filters/CustomFilterParameter.h:

(CustomFilterParameter):

• platform/graphics/filters/CustomFilterRenderer.cpp:

(WebCore::CustomFilterRenderer::bindProgramParameters):

LayoutTests:

Added tests for mat2 to mat4 parameter functions on custom fiter function and
parameter descriptor.

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

File:

• trunk/Source/WebCore/css/CSSValue.cpp (modified) (6 diffs)

trunk/Source/WebCore/css/CSSValue.cpp

@@ -59 +59 @@
 #include "WebKitCSSArrayFunctionValue.h"
 #include "WebKitCSSFilterValue.h"
+#include "WebKitCSSMatFunctionValue.h"
 #include "WebKitCSSMixFunctionValue.h"
 #include "WebKitCSSShaderValue.h"
@@ -233 +234 @@
     case WebKitCSSArrayFunctionValueClass:
         static_cast<const WebKitCSSArrayFunctionValue*>(this)->reportDescendantMemoryUsage(memoryObjectInfo);
+        return;
+    case WebKitCSSMatFunctionValueClass:
+        static_cast<const WebKitCSSMatFunctionValue*>(this)->reportDescendantMemoryUsage(memoryObjectInfo);
         return;
     case WebKitCSSMixFunctionValueClass:
@@ -352 +356 @@
         case WebKitCSSArrayFunctionValueClass:
             return compareCSSValues<WebKitCSSArrayFunctionValue>(*this, other);
+        case WebKitCSSMatFunctionValueClass:
+            return compareCSSValues<WebKitCSSMatFunctionValue>(*this, other);
         case WebKitCSSMixFunctionValueClass:
             return compareCSSValues<WebKitCSSMixFunctionValue>(*this, other);
@@ -450 +456 @@
     case WebKitCSSArrayFunctionValueClass:
         return static_cast<const WebKitCSSArrayFunctionValue*>(this)->customCssText();
+    case WebKitCSSMatFunctionValueClass:
+        return static_cast<const WebKitCSSMatFunctionValue*>(this)->customCssText();
     case WebKitCSSMixFunctionValueClass:
         return static_cast<const WebKitCSSMixFunctionValue*>(this)->customCssText();
@@ -588 +596 @@
     case WebKitCSSArrayFunctionValueClass:
         delete static_cast<WebKitCSSArrayFunctionValue*>(this);
+        return;
+    case WebKitCSSMatFunctionValueClass:
+        delete static_cast<WebKitCSSMatFunctionValue*>(this);
         return;
     case WebKitCSSMixFunctionValueClass:
@@ -633 +644 @@
     case WebKitCSSArrayFunctionValueClass:
         return static_cast<const WebKitCSSArrayFunctionValue*>(this)->cloneForCSSOM();
+    case WebKitCSSMatFunctionValueClass:
+        return static_cast<const WebKitCSSMatFunctionValue*>(this)->cloneForCSSOM();
     case WebKitCSSMixFunctionValueClass:
         return static_cast<const WebKitCSSMixFunctionValue*>(this)->cloneForCSSOM();