Changeset 49778 in webkit


Ignore:
Timestamp:
Oct 19, 2009 5:57:43 AM (15 years ago)
Author:
krit@webkit.org
Message:

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.
Location:
trunk/WebCore
Files:
7 edited
2 moved

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r49777 r49778  
     12009-10-19  Dirk Schulze  <krit@webkit.org>
     2
     3        Reviewed by Darin Adler.
     4
     5        Move feGaussianBlur from WebCore/svg to WebCore/platform
     6        [https://bugs.webkit.org/show_bug.cgi?id=30495]
     7
     8        This patch moves SVGFRGaussianBlur from svg/graphics/filters
     9        to platform/graphics/filters/FEGaussianBlur. This is needed
     10        for shadow support on Qt and Cairo.
     11        No change in functionality, therfore no new test case needed.
     12
     13        * GNUmakefile.am:
     14        * WebCore.gypi:
     15        * WebCore.pro:
     16        * WebCore.vcproj/WebCore.vcproj:
     17        * WebCore.xcodeproj/project.pbxproj:
     18        * platform/graphics/filters/FEGaussianBlur.cpp: Added.
     19        * platform/graphics/filters/FEGaussianBlur.h: Added.
     20        * svg/SVGFEGaussianBlurElement.h:
     21        * svg/graphics/filters/SVGFEGaussianBlur.cpp: Removed.
     22        * svg/graphics/filters/SVGFEGaussianBlur.h: Removed.
     23
    1242009-10-19  Yael Aharon  <yael.aharon@nokia.com>
    225

  • trunk/WebCore/GNUmakefile.am

    r49755 r49778  
    26002600        WebCore/platform/graphics/filters/FEComposite.cpp \
    26012601        WebCore/platform/graphics/filters/FEComposite.h \
     2602        WebCore/platform/graphics/filters/FEGaussianBlur.cpp \
     2603        WebCore/platform/graphics/filters/FEGaussianBlur.h \
    26022604        WebCore/platform/graphics/filters/Filter.h \
    26032605        WebCore/platform/graphics/filters/FilterEffect.cpp \
    … …  
    32393241        WebCore/svg/graphics/filters/SVGFEFlood.cpp \
    32403242        WebCore/svg/graphics/filters/SVGFEFlood.h \
    3241         WebCore/svg/graphics/filters/SVGFEGaussianBlur.cpp \
    3242         WebCore/svg/graphics/filters/SVGFEGaussianBlur.h \
    32433243        WebCore/svg/graphics/filters/SVGFEImage.cpp \
    32443244        WebCore/svg/graphics/filters/SVGFEImage.h \

  • trunk/WebCore/WebCore.gypi

    r49745 r49778  
    19401940            'platform/graphics/filters/FEComposite.cpp',
    19411941            'platform/graphics/filters/FEComposite.h',
     1942            'platform/graphics/filters/FEGaussianBlur.cpp',
     1943            'platform/graphics/filters/FEGaussianBlur.h',
    19421944            'platform/graphics/filters/SourceAlpha.cpp',
    19431945            'platform/graphics/filters/SourceAlpha.h',
    … …  
    31513153            'svg/graphics/filters/SVGFEFlood.cpp',
    31523154            'svg/graphics/filters/SVGFEFlood.h',
    3153             'svg/graphics/filters/SVGFEGaussianBlur.cpp',
    3154             'svg/graphics/filters/SVGFEGaussianBlur.h',
    31553155            'svg/graphics/filters/SVGFEImage.cpp',
    31563156            'svg/graphics/filters/SVGFEImage.h',

  • trunk/WebCore/WebCore.pro

    r49745 r49778  
    27792779        platform/graphics/filters/FEComponentTransfer.cpp \
    27802780        platform/graphics/filters/FEComposite.cpp \
     2781        platform/graphics/filters/FEGaussianBlur.cpp \
    27812782        platform/graphics/filters/FilterEffect.cpp \
    27822783        platform/graphics/filters/SourceAlpha.cpp \
    … …  
    30183019        svg/graphics/filters/SVGFEDisplacementMap.cpp \
    30193020        svg/graphics/filters/SVGFEFlood.cpp \
    3020         svg/graphics/filters/SVGFEGaussianBlur.cpp \
    30213021        svg/graphics/filters/SVGFEImage.cpp \
    30223022        svg/graphics/filters/SVGFEMerge.cpp \

  • trunk/WebCore/WebCore.vcproj/WebCore.vcproj

    r49745 r49778  
    3444234442                                        </File>
    3444334443                                        <File
     34444                                                RelativePath="..\platform\graphics\filters\FEGaussianBlur.cpp"
     34445                                                >
     34446                                        </File>
     34447                                        <File
     34448                                                RelativePath="..\platform\graphics\filters\FEGaussianBlur.h"
     34449                                                >
     34450                                        </File>
     34451                                        <File
    3444434452                                                RelativePath="..\svg\graphics\filters\SVGDistantLightSource.h"
    3444534453                                                >
    … …  
    3447534483                                        <File
    3447634484                                                RelativePath="..\svg\graphics\filters\SVGFEFlood.h"
    34477                                                 >
    34478                                         </File>
    34479                                         <File
    34480                                                 RelativePath="..\svg\graphics\filters\SVGFEGaussianBlur.cpp"
    34481                                                 >
    34482                                         </File>
    34483                                         <File
    34484                                                 RelativePath="..\svg\graphics\filters\SVGFEGaussianBlur.h"
    3448534485                                                >
    3448634486                                        </File>

  • trunk/WebCore/WebCore.xcodeproj/project.pbxproj

    r49745 r49778  
    12301230                845E72FB0FD2623900A87D79 /* SVGFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 845E72F90FD2623900A87D79 /* SVGFilter.cpp */; };
    12311231                845E72FC0FD2623900A87D79 /* SVGFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = 845E72FA0FD2623900A87D79 /* SVGFilter.h */; };
     1232                84801954108BAFB300CB2B1F /* FEGaussianBlur.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84801952108BAFB300CB2B1F /* FEGaussianBlur.cpp */; };
     1233                84801955108BAFB300CB2B1F /* FEGaussianBlur.h in Headers */ = {isa = PBXBuildFile; fileRef = 84801953108BAFB300CB2B1F /* FEGaussianBlur.h */; };
    12321234                849F77760EFEC6200090849D /* StrokeStyleApplier.h in Headers */ = {isa = PBXBuildFile; fileRef = 849F77750EFEC6200090849D /* StrokeStyleApplier.h */; };
    12331235                84A81F3D0FC7DFF000955300 /* SourceAlpha.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84A81F3B0FC7DFF000955300 /* SourceAlpha.cpp */; };
    … …  
    35553557                B25599800D00D8BA00BB825C /* SVGFEFlood.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B25598E60D00D8B900BB825C /* SVGFEFlood.cpp */; };
    35563558                B25599810D00D8BA00BB825C /* SVGFEFlood.h in Headers */ = {isa = PBXBuildFile; fileRef = B25598E70D00D8B900BB825C /* SVGFEFlood.h */; };
    3557                 B25599820D00D8BA00BB825C /* SVGFEGaussianBlur.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B25598E80D00D8B900BB825C /* SVGFEGaussianBlur.cpp */; };
    3558                 B25599830D00D8BA00BB825C /* SVGFEGaussianBlur.h in Headers */ = {isa = PBXBuildFile; fileRef = B25598E90D00D8B900BB825C /* SVGFEGaussianBlur.h */; };
    35593559                B25599840D00D8BA00BB825C /* SVGFEImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B25598EA0D00D8B900BB825C /* SVGFEImage.cpp */; };
    35603560                B25599850D00D8BA00BB825C /* SVGFEImage.h in Headers */ = {isa = PBXBuildFile; fileRef = B25598EB0D00D8B900BB825C /* SVGFEImage.h */; };
    … …  
    65226522                845E72F90FD2623900A87D79 /* SVGFilter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGFilter.cpp; sourceTree = "<group>"; };
    65236523                845E72FA0FD2623900A87D79 /* SVGFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGFilter.h; sourceTree = "<group>"; };
     6524                84801952108BAFB300CB2B1F /* FEGaussianBlur.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FEGaussianBlur.cpp; path = filters/FEGaussianBlur.cpp; sourceTree = "<group>"; };
     6525                84801953108BAFB300CB2B1F /* FEGaussianBlur.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FEGaussianBlur.h; path = filters/FEGaussianBlur.h; sourceTree = "<group>"; };
    65246526                849F77750EFEC6200090849D /* StrokeStyleApplier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StrokeStyleApplier.h; sourceTree = "<group>"; };
    65256527                84A81F3B0FC7DFF000955300 /* SourceAlpha.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SourceAlpha.cpp; path = filters/SourceAlpha.cpp; sourceTree = "<group>"; };
    … …  
    86628664                B25598E60D00D8B900BB825C /* SVGFEFlood.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SVGFEFlood.cpp; sourceTree = "<group>"; };
    86638665                B25598E70D00D8B900BB825C /* SVGFEFlood.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SVGFEFlood.h; sourceTree = "<group>"; };
    8664                 B25598E80D00D8B900BB825C /* SVGFEGaussianBlur.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SVGFEGaussianBlur.cpp; sourceTree = "<group>"; };
    8665                 B25598E90D00D8B900BB825C /* SVGFEGaussianBlur.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SVGFEGaussianBlur.h; sourceTree = "<group>"; };
    86668666                B25598EA0D00D8B900BB825C /* SVGFEImage.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SVGFEImage.cpp; sourceTree = "<group>"; };
    86678667                B25598EB0D00D8B900BB825C /* SVGFEImage.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SVGFEImage.h; sourceTree = "<group>"; };
    … …  
    1272512725                        isa = PBXGroup;
    1272612726                        children = (
     12727                                84801952108BAFB300CB2B1F /* FEGaussianBlur.cpp */,
     12728                                84801953108BAFB300CB2B1F /* FEGaussianBlur.h */,
    1272712729                                A75E8B800E1DE2D6007F2481 /* FEBlend.cpp */,
    1272812730                                A75E8B810E1DE2D6007F2481 /* FEBlend.h */,
    … …  
    1393513937                                B25598E60D00D8B900BB825C /* SVGFEFlood.cpp */,
    1393613938                                B25598E70D00D8B900BB825C /* SVGFEFlood.h */,
    13937                                 B25598E80D00D8B900BB825C /* SVGFEGaussianBlur.cpp */,
    13938                                 B25598E90D00D8B900BB825C /* SVGFEGaussianBlur.h */,
    1393913939                                B25598EA0D00D8B900BB825C /* SVGFEImage.cpp */,
    1394013940                                B25598EB0D00D8B900BB825C /* SVGFEImage.h */,
    … …  
    1774017740                                B22279E60D00BF220071B782 /* SVGFEFuncGElement.h in Headers */,
    1774117741                                B22279E90D00BF220071B782 /* SVGFEFuncRElement.h in Headers */,
    17742                                 B25599830D00D8BA00BB825C /* SVGFEGaussianBlur.h in Headers */,
    1774317742                                B22279EC0D00BF220071B782 /* SVGFEGaussianBlurElement.h in Headers */,
    1774417743                                B25599850D00D8BA00BB825C /* SVGFEImage.h in Headers */,
    … …  
    1806418063                                3314ACEC10892086000F0E56 /* JSExceptionBase.h in Headers */,
    1806518064                                973E325710883B7C005BC493 /* ResourceLoadNotifier.h in Headers */,
     18065                                84801955108BAFB300CB2B1F /* FEGaussianBlur.h in Headers */,
    1806618066                        );
    1806718067                        runOnlyForDeploymentPostprocessing = 0;
    … …  
    1991319913                                B22279E50D00BF220071B782 /* SVGFEFuncGElement.cpp in Sources */,
    1991419914                                B22279E80D00BF220071B782 /* SVGFEFuncRElement.cpp in Sources */,
    19915                                 B25599820D00D8BA00BB825C /* SVGFEGaussianBlur.cpp in Sources */,
    1991619915                                B22279EB0D00BF220071B782 /* SVGFEGaussianBlurElement.cpp in Sources */,
    1991719916                                B25599840D00D8BA00BB825C /* SVGFEImage.cpp in Sources */,
    … …  
    2019820197                                3314ACEB10892086000F0E56 /* JSExceptionBase.cpp in Sources */,
    2019920198                                973E325610883B7C005BC493 /* ResourceLoadNotifier.cpp in Sources */,
     20199                                84801954108BAFB300CB2B1F /* FEGaussianBlur.cpp in Sources */,
    2020020200                        );
    2020120201                        runOnlyForDeploymentPostprocessing = 0;

  • trunk/WebCore/platform/graphics/filters/FEGaussianBlur.cpp

    r49777 r49778  
    2323#include "config.h"
    2424
    25 #if ENABLE(SVG) && ENABLE(FILTERS)
    26 #include "SVGFEGaussianBlur.h"
     25#if ENABLE(FILTERS)
     26#include "FEGaussianBlur.h"
    2727
    2828#include "CanvasPixelArray.h"
    … …  
    3030#include "GraphicsContext.h"
    3131#include "ImageData.h"
    32 #include "SVGRenderTreeAsText.h"
    3332#include <math.h>
    3433
    … …  
    136135}
    137136
    138 TextStream& FEGaussianBlur::externalRepresentation(TextStream& ts) const
    139 {
    140     ts << "[type=GAUSSIAN-BLUR] ";
    141     FilterEffect::externalRepresentation(ts);
    142     ts << " [std dev. x=" << stdDeviationX() << " y=" << stdDeviationY() << "]";
    143     return ts;
    144 }
    145 
    146137} // namespace WebCore
    147138
    148 #endif // ENABLE(SVG) && ENABLE(FILTERS)
     139#endif // ENABLE(FILTERS)

  • trunk/WebCore/platform/graphics/filters/FEGaussianBlur.h

    r49777 r49778  
    2020*/
    2121
    22 #ifndef SVGFEGaussianBlur_h
    23 #define SVGFEGaussianBlur_h
     22#ifndef FEGaussianBlur_h
     23#define FEGaussianBlur_h
    2424
    25 #if ENABLE(SVG) && ENABLE(FILTERS)
     25#if ENABLE(FILTERS)
    2626#include "FilterEffect.h"
    2727#include "Filter.h"
    … …  
    4242        void apply(Filter*);
    4343        void dump();
    44         TextStream& externalRepresentation(TextStream& ts) const;
    4544
    4645    private:
    … …  
    5453} // namespace WebCore
    5554
    56 #endif // ENABLE(SVG) && ENABLE(FILTERS)
     55#endif // ENABLE(FILTERS)
    5756
    58 #endif // SVGFEGaussianBlur_h
     57#endif // FEGaussianBlur_h

  • trunk/WebCore/svg/SVGFEGaussianBlurElement.h

    r44299 r49778  
    2525
    2626#if ENABLE(SVG) && ENABLE(FILTERS)
    27 #include "SVGFEGaussianBlur.h"
     27#include "FEGaussianBlur.h"
    2828#include "SVGFilterPrimitiveStandardAttributes.h"
    2929
Note: See TracChangeset for help on using the changeset viewer.