2009-10-19 Dirk Schulze <krit@webkit.org>
authorkrit@webkit.org <krit@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 19 Oct 2009 12:57:43 +0000 (12:57 +0000)
committerkrit@webkit.org <krit@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 19 Oct 2009 12:57:43 +0000 (12:57 +0000)
        Reviewed by Darin Adler.

        Move feGaussianBlur from WebCore/svg to WebCore/platform
        [https://bugs.webkit.org/show_bug.cgi?id=30495]

        This patch moves SVGFRGaussianBlur from svg/graphics/filters
        to platform/graphics/filters/FEGaussianBlur. This is needed
        for shadow support on Qt and Cairo.
        No change in functionality, therfore no new test case needed.

        * GNUmakefile.am:
        * WebCore.gypi:
        * WebCore.pro:
        * WebCore.vcproj/WebCore.vcproj:
        * WebCore.xcodeproj/project.pbxproj:
        * platform/graphics/filters/FEGaussianBlur.cpp: Added.
        * platform/graphics/filters/FEGaussianBlur.h: Added.
        * svg/SVGFEGaussianBlurElement.h:
        * svg/graphics/filters/SVGFEGaussianBlur.cpp: Removed.
        * svg/graphics/filters/SVGFEGaussianBlur.h: Removed.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@49778 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog
WebCore/GNUmakefile.am
WebCore/WebCore.gypi
WebCore/WebCore.pro
WebCore/WebCore.vcproj/WebCore.vcproj
WebCore/WebCore.xcodeproj/project.pbxproj
WebCore/platform/graphics/filters/FEGaussianBlur.cpp [moved from WebCore/svg/graphics/filters/SVGFEGaussianBlur.cpp with 91% similarity]
WebCore/platform/graphics/filters/FEGaussianBlur.h [moved from WebCore/svg/graphics/filters/SVGFEGaussianBlur.h with 88% similarity]
WebCore/svg/SVGFEGaussianBlurElement.h

index 790accf..9eef0f6 100644 (file)
@@ -1,3 +1,26 @@
+2009-10-19  Dirk Schulze  <krit@webkit.org>
+
+        Reviewed by Darin Adler.
+
+        Move feGaussianBlur from WebCore/svg to WebCore/platform
+        [https://bugs.webkit.org/show_bug.cgi?id=30495]
+
+        This patch moves SVGFRGaussianBlur from svg/graphics/filters
+        to platform/graphics/filters/FEGaussianBlur. This is needed
+        for shadow support on Qt and Cairo.
+        No change in functionality, therfore no new test case needed.
+
+        * GNUmakefile.am:
+        * WebCore.gypi:
+        * WebCore.pro:
+        * WebCore.vcproj/WebCore.vcproj:
+        * WebCore.xcodeproj/project.pbxproj:
+        * platform/graphics/filters/FEGaussianBlur.cpp: Added.
+        * platform/graphics/filters/FEGaussianBlur.h: Added.
+        * svg/SVGFEGaussianBlurElement.h:
+        * svg/graphics/filters/SVGFEGaussianBlur.cpp: Removed.
+        * svg/graphics/filters/SVGFEGaussianBlur.h: Removed.
+
 2009-10-19  Yael Aharon  <yael.aharon@nokia.com>
 
         Unreviewed.
index 588ac0f..ae2f16b 100644 (file)
@@ -2599,6 +2599,8 @@ webcore_sources += \
        WebCore/platform/graphics/filters/FEComponentTransfer.h \
        WebCore/platform/graphics/filters/FEComposite.cpp \
        WebCore/platform/graphics/filters/FEComposite.h \
+       WebCore/platform/graphics/filters/FEGaussianBlur.cpp \
+       WebCore/platform/graphics/filters/FEGaussianBlur.h \
        WebCore/platform/graphics/filters/Filter.h \
        WebCore/platform/graphics/filters/FilterEffect.cpp \
        WebCore/platform/graphics/filters/FilterEffect.h \
@@ -3238,8 +3240,6 @@ webcore_sources += \
        WebCore/svg/graphics/filters/SVGFEDisplacementMap.h \
        WebCore/svg/graphics/filters/SVGFEFlood.cpp \
        WebCore/svg/graphics/filters/SVGFEFlood.h \
-       WebCore/svg/graphics/filters/SVGFEGaussianBlur.cpp \
-       WebCore/svg/graphics/filters/SVGFEGaussianBlur.h \
        WebCore/svg/graphics/filters/SVGFEImage.cpp \
        WebCore/svg/graphics/filters/SVGFEImage.h \
        WebCore/svg/graphics/filters/SVGFEMerge.cpp \
index 9542a00..91d8fc4 100644 (file)
             'platform/graphics/filters/FEComponentTransfer.h',
             'platform/graphics/filters/FEComposite.cpp',
             'platform/graphics/filters/FEComposite.h',
+            'platform/graphics/filters/FEGaussianBlur.cpp',
+            'platform/graphics/filters/FEGaussianBlur.h',
             'platform/graphics/filters/SourceAlpha.cpp',
             'platform/graphics/filters/SourceAlpha.h',
             'platform/graphics/filters/SourceGraphic.cpp',
             'svg/graphics/filters/SVGFEDisplacementMap.h',
             'svg/graphics/filters/SVGFEFlood.cpp',
             'svg/graphics/filters/SVGFEFlood.h',
-            'svg/graphics/filters/SVGFEGaussianBlur.cpp',
-            'svg/graphics/filters/SVGFEGaussianBlur.h',
             'svg/graphics/filters/SVGFEImage.cpp',
             'svg/graphics/filters/SVGFEImage.h',
             'svg/graphics/filters/SVGFEMerge.cpp',
index 5ed5b70..40cdd7d 100644 (file)
@@ -2778,6 +2778,7 @@ contains(DEFINES, ENABLE_FILTERS=1) {
         platform/graphics/filters/FEColorMatrix.cpp \
         platform/graphics/filters/FEComponentTransfer.cpp \
         platform/graphics/filters/FEComposite.cpp \
+        platform/graphics/filters/FEGaussianBlur.cpp \
         platform/graphics/filters/FilterEffect.cpp \
         platform/graphics/filters/SourceAlpha.cpp \
         platform/graphics/filters/SourceGraphic.cpp
@@ -3017,7 +3018,6 @@ contains(DEFINES, ENABLE_SVG=1) {
         svg/graphics/filters/SVGFEDiffuseLighting.cpp \
         svg/graphics/filters/SVGFEDisplacementMap.cpp \
         svg/graphics/filters/SVGFEFlood.cpp \
-        svg/graphics/filters/SVGFEGaussianBlur.cpp \
         svg/graphics/filters/SVGFEImage.cpp \
         svg/graphics/filters/SVGFEMerge.cpp \
         svg/graphics/filters/SVGFEMorphology.cpp \
index 7867185..7353ac5 100644 (file)
                                                >\r
                                        </File>\r
                                        <File\r
+                                               RelativePath="..\platform\graphics\filters\FEGaussianBlur.cpp"\r
+                                               >\r
+                                       </File>\r
+                                       <File\r
+                                               RelativePath="..\platform\graphics\filters\FEGaussianBlur.h"\r
+                                               >\r
+                                       </File>\r
+                                       <File\r
                                                RelativePath="..\svg\graphics\filters\SVGDistantLightSource.h"\r
                                                >\r
                                        </File>\r
                                                >\r
                                        </File>\r
                                        <File\r
-                                               RelativePath="..\svg\graphics\filters\SVGFEGaussianBlur.cpp"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
-                                               RelativePath="..\svg\graphics\filters\SVGFEGaussianBlur.h"\r
-                                               >\r
-                                       </File>\r
-                                       <File\r
                                                RelativePath="..\svg\graphics\filters\SVGFEImage.cpp"\r
                                                >\r
                                        </File>\r
index 5d20430..d0bb745 100644 (file)
                845E72F80FD261EE00A87D79 /* Filter.h in Headers */ = {isa = PBXBuildFile; fileRef = 845E72F70FD261EE00A87D79 /* Filter.h */; };
                845E72FB0FD2623900A87D79 /* SVGFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 845E72F90FD2623900A87D79 /* SVGFilter.cpp */; };
                845E72FC0FD2623900A87D79 /* SVGFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = 845E72FA0FD2623900A87D79 /* SVGFilter.h */; };
+               84801954108BAFB300CB2B1F /* FEGaussianBlur.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84801952108BAFB300CB2B1F /* FEGaussianBlur.cpp */; };
+               84801955108BAFB300CB2B1F /* FEGaussianBlur.h in Headers */ = {isa = PBXBuildFile; fileRef = 84801953108BAFB300CB2B1F /* FEGaussianBlur.h */; };
                849F77760EFEC6200090849D /* StrokeStyleApplier.h in Headers */ = {isa = PBXBuildFile; fileRef = 849F77750EFEC6200090849D /* StrokeStyleApplier.h */; };
                84A81F3D0FC7DFF000955300 /* SourceAlpha.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84A81F3B0FC7DFF000955300 /* SourceAlpha.cpp */; };
                84A81F3E0FC7DFF000955300 /* SourceAlpha.h in Headers */ = {isa = PBXBuildFile; fileRef = 84A81F3C0FC7DFF000955300 /* SourceAlpha.h */; };
                B255997F0D00D8BA00BB825C /* SVGFEDisplacementMap.h in Headers */ = {isa = PBXBuildFile; fileRef = B25598E50D00D8B900BB825C /* SVGFEDisplacementMap.h */; };
                B25599800D00D8BA00BB825C /* SVGFEFlood.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B25598E60D00D8B900BB825C /* SVGFEFlood.cpp */; };
                B25599810D00D8BA00BB825C /* SVGFEFlood.h in Headers */ = {isa = PBXBuildFile; fileRef = B25598E70D00D8B900BB825C /* SVGFEFlood.h */; };
-               B25599820D00D8BA00BB825C /* SVGFEGaussianBlur.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B25598E80D00D8B900BB825C /* SVGFEGaussianBlur.cpp */; };
-               B25599830D00D8BA00BB825C /* SVGFEGaussianBlur.h in Headers */ = {isa = PBXBuildFile; fileRef = B25598E90D00D8B900BB825C /* SVGFEGaussianBlur.h */; };
                B25599840D00D8BA00BB825C /* SVGFEImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B25598EA0D00D8B900BB825C /* SVGFEImage.cpp */; };
                B25599850D00D8BA00BB825C /* SVGFEImage.h in Headers */ = {isa = PBXBuildFile; fileRef = B25598EB0D00D8B900BB825C /* SVGFEImage.h */; };
                B25599860D00D8BA00BB825C /* SVGFEMerge.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B25598EC0D00D8B900BB825C /* SVGFEMerge.cpp */; };
                845E72F70FD261EE00A87D79 /* Filter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Filter.h; path = filters/Filter.h; sourceTree = "<group>"; };
                845E72F90FD2623900A87D79 /* SVGFilter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGFilter.cpp; sourceTree = "<group>"; };
                845E72FA0FD2623900A87D79 /* SVGFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGFilter.h; sourceTree = "<group>"; };
+               84801952108BAFB300CB2B1F /* FEGaussianBlur.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FEGaussianBlur.cpp; path = filters/FEGaussianBlur.cpp; sourceTree = "<group>"; };
+               84801953108BAFB300CB2B1F /* FEGaussianBlur.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FEGaussianBlur.h; path = filters/FEGaussianBlur.h; sourceTree = "<group>"; };
                849F77750EFEC6200090849D /* StrokeStyleApplier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StrokeStyleApplier.h; sourceTree = "<group>"; };
                84A81F3B0FC7DFF000955300 /* SourceAlpha.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SourceAlpha.cpp; path = filters/SourceAlpha.cpp; sourceTree = "<group>"; };
                84A81F3C0FC7DFF000955300 /* SourceAlpha.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SourceAlpha.h; path = filters/SourceAlpha.h; sourceTree = "<group>"; };
                B25598E50D00D8B900BB825C /* SVGFEDisplacementMap.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SVGFEDisplacementMap.h; sourceTree = "<group>"; };
                B25598E60D00D8B900BB825C /* SVGFEFlood.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SVGFEFlood.cpp; sourceTree = "<group>"; };
                B25598E70D00D8B900BB825C /* SVGFEFlood.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SVGFEFlood.h; sourceTree = "<group>"; };
-               B25598E80D00D8B900BB825C /* SVGFEGaussianBlur.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SVGFEGaussianBlur.cpp; sourceTree = "<group>"; };
-               B25598E90D00D8B900BB825C /* SVGFEGaussianBlur.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SVGFEGaussianBlur.h; sourceTree = "<group>"; };
                B25598EA0D00D8B900BB825C /* SVGFEImage.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SVGFEImage.cpp; sourceTree = "<group>"; };
                B25598EB0D00D8B900BB825C /* SVGFEImage.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SVGFEImage.h; sourceTree = "<group>"; };
                B25598EC0D00D8B900BB825C /* SVGFEMerge.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SVGFEMerge.cpp; sourceTree = "<group>"; };
                A75E8B7F0E1DE2B0007F2481 /* filters */ = {
                        isa = PBXGroup;
                        children = (
+                               84801952108BAFB300CB2B1F /* FEGaussianBlur.cpp */,
+                               84801953108BAFB300CB2B1F /* FEGaussianBlur.h */,
                                A75E8B800E1DE2D6007F2481 /* FEBlend.cpp */,
                                A75E8B810E1DE2D6007F2481 /* FEBlend.h */,
                                A75E8B820E1DE2D6007F2481 /* FEColorMatrix.cpp */,
                                B25598E50D00D8B900BB825C /* SVGFEDisplacementMap.h */,
                                B25598E60D00D8B900BB825C /* SVGFEFlood.cpp */,
                                B25598E70D00D8B900BB825C /* SVGFEFlood.h */,
-                               B25598E80D00D8B900BB825C /* SVGFEGaussianBlur.cpp */,
-                               B25598E90D00D8B900BB825C /* SVGFEGaussianBlur.h */,
                                B25598EA0D00D8B900BB825C /* SVGFEImage.cpp */,
                                B25598EB0D00D8B900BB825C /* SVGFEImage.h */,
                                B25598EC0D00D8B900BB825C /* SVGFEMerge.cpp */,
                                B22279E30D00BF220071B782 /* SVGFEFuncBElement.h in Headers */,
                                B22279E60D00BF220071B782 /* SVGFEFuncGElement.h in Headers */,
                                B22279E90D00BF220071B782 /* SVGFEFuncRElement.h in Headers */,
-                               B25599830D00D8BA00BB825C /* SVGFEGaussianBlur.h in Headers */,
                                B22279EC0D00BF220071B782 /* SVGFEGaussianBlurElement.h in Headers */,
                                B25599850D00D8BA00BB825C /* SVGFEImage.h in Headers */,
                                B22279EF0D00BF220071B782 /* SVGFEImageElement.h in Headers */,
                                97DD4D870FDF4D6E00ECF9A4 /* XSSAuditor.h in Headers */,
                                3314ACEC10892086000F0E56 /* JSExceptionBase.h in Headers */,
                                973E325710883B7C005BC493 /* ResourceLoadNotifier.h in Headers */,
+                               84801955108BAFB300CB2B1F /* FEGaussianBlur.h in Headers */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                                B22279E20D00BF220071B782 /* SVGFEFuncBElement.cpp in Sources */,
                                B22279E50D00BF220071B782 /* SVGFEFuncGElement.cpp in Sources */,
                                B22279E80D00BF220071B782 /* SVGFEFuncRElement.cpp in Sources */,
-                               B25599820D00D8BA00BB825C /* SVGFEGaussianBlur.cpp in Sources */,
                                B22279EB0D00BF220071B782 /* SVGFEGaussianBlurElement.cpp in Sources */,
                                B25599840D00D8BA00BB825C /* SVGFEImage.cpp in Sources */,
                                B22279EE0D00BF220071B782 /* SVGFEImageElement.cpp in Sources */,
                                97DD4D860FDF4D6E00ECF9A4 /* XSSAuditor.cpp in Sources */,
                                3314ACEB10892086000F0E56 /* JSExceptionBase.cpp in Sources */,
                                973E325610883B7C005BC493 /* ResourceLoadNotifier.cpp in Sources */,
+                               84801954108BAFB300CB2B1F /* FEGaussianBlur.cpp in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
 
 #include "config.h"
 
-#if ENABLE(SVG) && ENABLE(FILTERS)
-#include "SVGFEGaussianBlur.h"
+#if ENABLE(FILTERS)
+#include "FEGaussianBlur.h"
 
 #include "CanvasPixelArray.h"
 #include "Filter.h"
 #include "GraphicsContext.h"
 #include "ImageData.h"
-#include "SVGRenderTreeAsText.h"
 #include <math.h>
 
 namespace WebCore {
@@ -135,14 +134,6 @@ void FEGaussianBlur::dump()
 {
 }
 
-TextStream& FEGaussianBlur::externalRepresentation(TextStream& ts) const
-{
-    ts << "[type=GAUSSIAN-BLUR] ";
-    FilterEffect::externalRepresentation(ts);
-    ts << " [std dev. x=" << stdDeviationX() << " y=" << stdDeviationY() << "]";
-    return ts;
-}
-
 } // namespace WebCore
 
-#endif // ENABLE(SVG) && ENABLE(FILTERS)
+#endif // ENABLE(FILTERS)
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef SVGFEGaussianBlur_h
-#define SVGFEGaussianBlur_h
+#ifndef FEGaussianBlur_h
+#define FEGaussianBlur_h
 
-#if ENABLE(SVG) && ENABLE(FILTERS)
+#if ENABLE(FILTERS)
 #include "FilterEffect.h"
 #include "Filter.h"
 
@@ -41,7 +41,6 @@ namespace WebCore {
         virtual FloatRect uniteChildEffectSubregions(Filter* filter) { return calculateUnionOfChildEffectSubregions(filter, m_in.get()); }
         void apply(Filter*);
         void dump();
-        TextStream& externalRepresentation(TextStream& ts) const;
 
     private:
         FEGaussianBlur(FilterEffect*, const float&, const float&);
@@ -53,6 +52,6 @@ namespace WebCore {
 
 } // namespace WebCore
 
-#endif // ENABLE(SVG) && ENABLE(FILTERS)
+#endif // ENABLE(FILTERS)
 
-#endif // SVGFEGaussianBlur_h
+#endif // FEGaussianBlur_h
index 187c212..c9bb613 100644 (file)
@@ -24,7 +24,7 @@
 #define SVGFEGaussianBlurElement_h
 
 #if ENABLE(SVG) && ENABLE(FILTERS)
-#include "SVGFEGaussianBlur.h"
+#include "FEGaussianBlur.h"
 #include "SVGFilterPrimitiveStandardAttributes.h"
 
 namespace WebCore {