Changeset 51901 in webkit

Timestamp:

Dec 9, 2009 9:28:21 AM (14 years ago)

Author:

senorblanco@chromium.org

Message:

Enable SVG filters in Chromium build.
​https://bugs.webkit.org/show_bug.cgi?id=32323

Reviewed by Darin Fisher.

Covered by SVG filter layout tests.

• WebCore.gyp/WebCore.gyp:
• WebCore.gypi:
• bindings/scripts/CodeGeneratorV8.pm:
• bindings/v8/DerivedSourcesAllInOne.cpp:
• bindings/v8/V8DOMWrapper.cpp:
• bindings/v8/V8Index.cpp:
• bindings/v8/V8Index.h:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• WebCore.gyp/WebCore.gyp (modified) (5 diffs)
• WebCore.gypi (modified) (3 diffs)
• bindings/scripts/CodeGeneratorV8.pm (modified) (1 diff)
• bindings/v8/DerivedSourcesAllInOne.cpp (modified) (2 diffs)
• bindings/v8/V8DOMWrapper.cpp (modified) (1 diff)
• bindings/v8/V8Index.cpp (modified) (2 diffs)
• bindings/v8/V8Index.h (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-12-09  Stephen White  <senorblanco@chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        Enable SVG filters in Chromium build.
+        https://bugs.webkit.org/show_bug.cgi?id=32323
+
+        Covered by SVG filter layout tests.
+
+        * WebCore.gyp/WebCore.gyp:
+        * WebCore.gypi:
+        * bindings/scripts/CodeGeneratorV8.pm:
+        * bindings/v8/DerivedSourcesAllInOne.cpp:
+        * bindings/v8/V8DOMWrapper.cpp:
+        * bindings/v8/V8Index.cpp:
+        * bindings/v8/V8Index.h:
+
 2009-12-09  Oliver Hunt  <oliver@apple.com>
 

trunk/WebCore/WebCore.gyp/WebCore.gyp

@@ -131 +131 @@
       '../platform/graphics',
       '../platform/graphics/chromium',
+      '../platform/graphics/filters',
       '../platform/graphics/opentype',
       '../platform/graphics/skia',
@@ -157 +158 @@
       '../svg/animation',
       '../svg/graphics',
+      '../svg/graphics/filters',
       '../websockets',
       '../workers',
@@ -215 +217 @@
         '<@(webcore_bindings_idl_files)',
       ],
-      'sources/': [
-        # SVG_FILTERS only.
-        ['exclude', 'svg/SVG(FE|Filter)[^/]*\\.idl$'],
-
-      ],
       'sources!': [
         # Custom bindings in bindings/v8/custom exist for these.
@@ -236 +233 @@
         '../svg/ElementTimeControl.idl',
         '../svg/SVGAnimatedPathData.idl',
-        '../svg/SVGComponentTransferFunctionElement.idl',
         '../svg/SVGExternalResourcesRequired.idl',
         '../svg/SVGFitToViewBox.idl',
@@ -661 +657 @@
         ['include', 'loader/appcache/ApplicationCacheHost\.h$'],
         ['include', 'loader/appcache/DOMApplicationCache\.(h|cpp)$'],
-
-        # SVG_FILTERS only.
-        ['exclude', '(platform|svg)/graphics/filters/'],
-        ['exclude', 'svg/Filter[^/]*\\.cpp$'],
-        ['exclude', 'svg/SVG(FE|Filter)[^/]*\\.cpp$'],
 
         # Exclude some DB-related files.

trunk/WebCore/WebCore.gypi

@@ -1976 +1976 @@
             'platform/graphics/filters/FEGaussianBlur.cpp',
             'platform/graphics/filters/FEGaussianBlur.h',
+            'platform/graphics/filters/Filter.h',
+            'platform/graphics/filters/FilterEffect.cpp',
+            'platform/graphics/filters/FilterEffect.h',
+            'platform/graphics/filters/ImageBufferFilter.cpp',
+            'platform/graphics/filters/ImageBufferFilter.h',
             'platform/graphics/filters/SourceAlpha.cpp',
             'platform/graphics/filters/SourceAlpha.h',
@@ -3220 +3225 @@
             'svg/graphics/filters/SVGFETurbulence.cpp',
             'svg/graphics/filters/SVGFETurbulence.h',
-            'svg/graphics/filters/SVGFilterEffect.cpp',
-            'svg/graphics/filters/SVGFilterEffect.h',
+            'svg/graphics/filters/SVGFilter.cpp',
+            'svg/graphics/filters/SVGFilter.h',
+            'svg/graphics/filters/SVGFilterBuilder.cpp',
+            'svg/graphics/filters/SVGFilterBuilder.h',
             'svg/graphics/filters/SVGLightSource.cpp',
             'svg/graphics/filters/SVGLightSource.h',
@@ -3254 +3261 @@
             'svg/ColorDistance.h',
             'svg/ElementTimeControl.h',
-            'svg/Filter.cpp',
-            'svg/Filter.h',
-            'svg/FilterBuilder.h',
-            'svg/FilterBuilder.cpp',
-            'svg/FilterEffect.cpp',
-            'svg/FilterEffect.h',
             'svg/GradientAttributes.h',
             'svg/LinearGradientAttributes.h',

trunk/WebCore/bindings/scripts/CodeGeneratorV8.pm

@@ -565 +565 @@
 
     my $getterFunc = $codeGenerator->WK_lcfirst($attrName);
-    $getterFunc .= "Animated" if $codeGenerator->IsSVGAnimatedType($attribute->signature->type);
+
+    if ($codeGenerator->IsSVGAnimatedType($attribute->signature->type)) {
+        # Some SVGFE*Element.idl use 'operator' as attribute name; rewrite as '_operator' to avoid clashes with C/C++
+        $getterFunc = "_" . $getterFunc if ($attrName =~ /operator/);
+        $getterFunc .= "Animated";
+    }
 
     my $returnType = GetTypeFromSignature($attribute->signature);

trunk/WebCore/bindings/v8/DerivedSourcesAllInOne.cpp

@@ -293 +293 @@
 #include "bindings/V8SVGClipPathElement.cpp"
 #include "bindings/V8SVGColor.cpp"
+#include "bindings/V8SVGComponentTransferFunctionElement.cpp"
 #include "bindings/V8SVGCursorElement.cpp"
 #include "bindings/V8SVGDefsElement.cpp"
@@ -302 +303 @@
 #include "bindings/V8SVGEllipseElement.cpp"
 #include "bindings/V8SVGException.cpp"
+#include "bindings/V8SVGFEBlendElement.cpp"
+#include "bindings/V8SVGFEColorMatrixElement.cpp"
+#include "bindings/V8SVGFEComponentTransferElement.cpp"
+#include "bindings/V8SVGFECompositeElement.cpp"
+#include "bindings/V8SVGFEDiffuseLightingElement.cpp"
+#include "bindings/V8SVGFEDisplacementMapElement.cpp"
+#include "bindings/V8SVGFEDistantLightElement.cpp"
+#include "bindings/V8SVGFEFloodElement.cpp"
+#include "bindings/V8SVGFEFuncAElement.cpp"
+#include "bindings/V8SVGFEFuncBElement.cpp"
+#include "bindings/V8SVGFEFuncGElement.cpp"
+#include "bindings/V8SVGFEFuncRElement.cpp"
+#include "bindings/V8SVGFEGaussianBlurElement.cpp"
+#include "bindings/V8SVGFEImageElement.cpp"
+#include "bindings/V8SVGFEMergeElement.cpp"
+#include "bindings/V8SVGFEMergeNodeElement.cpp"
+#include "bindings/V8SVGFEMorphologyElement.cpp"
+#include "bindings/V8SVGFEOffsetElement.cpp"
+#include "bindings/V8SVGFEPointLightElement.cpp"
+#include "bindings/V8SVGFESpecularLightingElement.cpp"
+#include "bindings/V8SVGFESpotLightElement.cpp"
+#include "bindings/V8SVGFETileElement.cpp"
+#include "bindings/V8SVGFETurbulenceElement.cpp"
+#include "bindings/V8SVGFilterElement.cpp"
 #include "bindings/V8SVGFontElement.cpp"
 #include "bindings/V8SVGFontFaceElement.cpp"

trunk/WebCore/bindings/v8/V8DOMWrapper.cpp

@@ -1106 +1106 @@
 #endif
 
-#if ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
 #define FOR_EACH_FILTERS_TAG(macro) \
     macro(feBlend, FEBLEND) \

trunk/WebCore/bindings/v8/V8Index.cpp

@@ -221 +221 @@
 #endif
 
-#if ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
 #include "V8SVGComponentTransferFunctionElement.h"
 #include "V8SVGFEBlendElement.h"
@@ -239 +239 @@
 #include "V8SVGFEMergeElement.h"
 #include "V8SVGFEMergeNodeElement.h"
+#include "V8SVGFEMorphologyElement.h"
 #include "V8SVGFEOffsetElement.h"
 #include "V8SVGFEPointLightElement.h"

trunk/WebCore/bindings/v8/V8Index.h

@@ -198 +198 @@
 #endif
 
-#if ENABLE(SVG_FILTERS)
+#if ENABLE(SVG) && ENABLE(FILTERS)
 #define SVG_FILTERS_ELEMENT_TYPES(V)                                    \
     V(SVGCOMPONENTTRANSFERFUNCTIONELEMENT, SVGComponentTransferFunctionElement)\
@@ -217 +217 @@
     V(SVGFEMERGEELEMENT, SVGFEMergeElement)                             \
     V(SVGFEMERGENODEELEMENT, SVGFEMergeNodeElement)                     \
+    V(SVGFEMORPHOLOGYELEMENT, SVGFEMorphologyElement)                   \
     V(SVGFEOFFSETELEMENT, SVGFEOffsetElement)                           \
     V(SVGFEPOINTLIGHTELEMENT, SVGFEPointLightElement)                   \