Changeset 58093 in webkit


Ignore:
Timestamp:
Apr 22, 2010 6:50:44 AM (14 years ago)
Author:
Nikolas Zimmermann
Message:

2010-04-22 Nikolas Zimmermann <​nzimmermann@rim.com>

Reviewed by Dirk Schulze.

SVGPaintServer needs to be converted to the new RenderSVGResource* system
​https://bugs.webkit.org/show_bug.cgi?id=37986

No functional changes, just move the SVGPaintServer* classes from svg/graphics/ to rendering/, the new location for the RenderSVGResource* classes.
This is a preparation for the real patch which follows soon.

  • Android.mk: Rename files and move to the right location.
  • GNUmakefile.am: Ditto.
  • WebCore.gypi: Ditto.
  • WebCore.pro: Ditto.
  • WebCore.vcproj/WebCore.vcproj: Ditto.
  • WebCore.xcodeproj/project.pbxproj: Ditto.
  • rendering/RenderSVGResource.cpp: Copied from svg/graphics/SVGPaintServer.cpp.
  • rendering/RenderSVGResourceGradient.cpp: Copied from svg/graphics/SVGPaintServerGradient.cpp.
  • rendering/RenderSVGResourceGradient.h: Copied from svg/graphics/SVGPaintServerGradient.h.
  • rendering/RenderSVGResourceLinearGradient.cpp: Copied from svg/graphics/SVGPaintServerLinearGradient.cpp.
  • rendering/RenderSVGResourceLinearGradient.h: Copied from svg/graphics/SVGPaintServerLinearGradient.h.
  • rendering/RenderSVGResourcePattern.cpp: Copied from svg/graphics/SVGPaintServerPattern.cpp.
  • rendering/RenderSVGResourcePattern.h: Copied from svg/graphics/SVGPaintServerPattern.h.
  • rendering/RenderSVGResourceRadialGradient.cpp: Copied from svg/graphics/SVGPaintServerRadialGradient.cpp.
  • rendering/RenderSVGResourceRadialGradient.h: Copied from svg/graphics/SVGPaintServerRadialGradient.h.
  • rendering/RenderSVGResourceSolidColor.cpp: Copied from svg/graphics/SVGPaintServerSolid.cpp.
  • rendering/RenderSVGResourceSolidColor.h: Copied from svg/graphics/SVGPaintServerSolid.h.
  • rendering/SVGRenderTreeAsText.cpp: Change include file names.
  • svg/SVGFont.cpp: Ditto.
  • svg/SVGGradientElement.cpp: Ditto.
  • svg/SVGGradientElement.h: Ditto.
  • svg/SVGLinearGradientElement.cpp: Ditto.
  • svg/SVGPatternElement.cpp: Ditto.
  • svg/SVGPatternElement.h: Ditto.
  • svg/SVGRadialGradientElement.cpp: Ditto.
  • svg/graphics/SVGPaintServer.cpp: Removed.
  • svg/graphics/SVGPaintServerGradient.cpp: Removed.
  • svg/graphics/SVGPaintServerGradient.h: Removed.
  • svg/graphics/SVGPaintServerLinearGradient.cpp: Removed.
  • svg/graphics/SVGPaintServerLinearGradient.h: Removed.
  • svg/graphics/SVGPaintServerPattern.cpp: Removed.
  • svg/graphics/SVGPaintServerPattern.h: Removed.
  • svg/graphics/SVGPaintServerRadialGradient.cpp: Removed.
  • svg/graphics/SVGPaintServerRadialGradient.h: Removed.
  • svg/graphics/SVGPaintServerSolid.cpp: Removed.
  • svg/graphics/SVGPaintServerSolid.h: Removed.
  • svg/graphics/SVGResourceListener.h: Removed.
Location:
trunk/WebCore
Files:
1 deleted
15 edited
11 moved

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/Android.mk

    r57927 r58093  
    607607        rendering/RenderSVGInlineText.cpp \
    608608        rendering/RenderSVGModelObject.cpp \
     609        rendering/RenderSVGResource.cpp \
    609610        rendering/RenderSVGResourceClipper.cpp \
    610611        rendering/RenderSVGResourceFilter.cpp \
     612        rendering/RenderSVGResourceGradient.cpp \
     613        rendering/RenderSVGResourceLinearGradient.cpp \
    611614        rendering/RenderSVGResourceMarker.cpp \
    612615        rendering/RenderSVGResourceMasker.cpp \
     616        rendering/RenderSVGResourcePattern.cpp \
     617        rendering/RenderSVGResourceRadialGradient.cpp \
     618        rendering/RenderSVGResourceSolidColor.cpp \
    613619        rendering/RenderSVGRoot.cpp \
    614620        rendering/RenderSVGShadowTreeRootContainer.cpp \
    … …  
    856862        \
    857863        svg/graphics/SVGImage.cpp \
    858         svg/graphics/SVGPaintServer.cpp \
    859         svg/graphics/SVGPaintServerGradient.cpp \
    860         svg/graphics/SVGPaintServerLinearGradient.cpp \
    861         svg/graphics/SVGPaintServerPattern.cpp \
    862         svg/graphics/SVGPaintServerRadialGradient.cpp \
    863         svg/graphics/SVGPaintServerSolid.cpp \
    864864        svg/graphics/SVGResource.cpp \
    865865        \

  • trunk/WebCore/ChangeLog

    r58092 r58093  
     12010-04-22  Nikolas Zimmermann  <nzimmermann@rim.com>
     2
     3        Reviewed by Dirk Schulze.
     4
     5        SVGPaintServer needs to be converted to the new RenderSVGResource* system
     6        https://bugs.webkit.org/show_bug.cgi?id=37986
     7
     8        No functional changes, just move the SVGPaintServer* classes from svg/graphics/ to rendering/, the new location for the RenderSVGResource* classes.
     9        This is a preparation for the real patch which follows soon.
     10
     11        * Android.mk: Rename files and move to the right location.
     12        * GNUmakefile.am: Ditto.
     13        * WebCore.gypi: Ditto.
     14        * WebCore.pro: Ditto.
     15        * WebCore.vcproj/WebCore.vcproj: Ditto.
     16        * WebCore.xcodeproj/project.pbxproj: Ditto.
     17        * rendering/RenderSVGResource.cpp: Copied from svg/graphics/SVGPaintServer.cpp.
     18        * rendering/RenderSVGResourceGradient.cpp: Copied from svg/graphics/SVGPaintServerGradient.cpp.
     19        * rendering/RenderSVGResourceGradient.h: Copied from svg/graphics/SVGPaintServerGradient.h.
     20        * rendering/RenderSVGResourceLinearGradient.cpp: Copied from svg/graphics/SVGPaintServerLinearGradient.cpp.
     21        * rendering/RenderSVGResourceLinearGradient.h: Copied from svg/graphics/SVGPaintServerLinearGradient.h.
     22        * rendering/RenderSVGResourcePattern.cpp: Copied from svg/graphics/SVGPaintServerPattern.cpp.
     23        * rendering/RenderSVGResourcePattern.h: Copied from svg/graphics/SVGPaintServerPattern.h.
     24        * rendering/RenderSVGResourceRadialGradient.cpp: Copied from svg/graphics/SVGPaintServerRadialGradient.cpp.
     25        * rendering/RenderSVGResourceRadialGradient.h: Copied from svg/graphics/SVGPaintServerRadialGradient.h.
     26        * rendering/RenderSVGResourceSolidColor.cpp: Copied from svg/graphics/SVGPaintServerSolid.cpp.
     27        * rendering/RenderSVGResourceSolidColor.h: Copied from svg/graphics/SVGPaintServerSolid.h.
     28        * rendering/SVGRenderTreeAsText.cpp: Change include file names.
     29        * svg/SVGFont.cpp: Ditto.
     30        * svg/SVGGradientElement.cpp: Ditto.
     31        * svg/SVGGradientElement.h: Ditto.
     32        * svg/SVGLinearGradientElement.cpp: Ditto.
     33        * svg/SVGPatternElement.cpp: Ditto.
     34        * svg/SVGPatternElement.h: Ditto.
     35        * svg/SVGRadialGradientElement.cpp: Ditto.
     36        * svg/graphics/SVGPaintServer.cpp: Removed.
     37        * svg/graphics/SVGPaintServerGradient.cpp: Removed.
     38        * svg/graphics/SVGPaintServerGradient.h: Removed.
     39        * svg/graphics/SVGPaintServerLinearGradient.cpp: Removed.
     40        * svg/graphics/SVGPaintServerLinearGradient.h: Removed.
     41        * svg/graphics/SVGPaintServerPattern.cpp: Removed.
     42        * svg/graphics/SVGPaintServerPattern.h: Removed.
     43        * svg/graphics/SVGPaintServerRadialGradient.cpp: Removed.
     44        * svg/graphics/SVGPaintServerRadialGradient.h: Removed.
     45        * svg/graphics/SVGPaintServerSolid.cpp: Removed.
     46        * svg/graphics/SVGPaintServerSolid.h: Removed.
     47        * svg/graphics/SVGResourceListener.h: Removed.
     48
    1492010-04-22  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>
    250

  • trunk/WebCore/GNUmakefile.am

    r57985 r58093  
    31203120        WebCore/rendering/RenderSVGModelObject.cpp \
    31213121        WebCore/rendering/RenderSVGModelObject.h \
     3122        WebCore/rendering/RenderSVGResource.cpp \
    31223123        WebCore/rendering/RenderSVGResource.h \
    31233124        WebCore/rendering/RenderSVGResourceClipper.cpp \
    … …  
    31253126        WebCore/rendering/RenderSVGResourceFilter.cpp \
    31263127        WebCore/rendering/RenderSVGResourceFilter.h \
     3128        WebCore/rendering/RenderSVGResourceGradient.cpp \
     3129        WebCore/rendering/RenderSVGResourceGradient.h \
     3130        WebCore/rendering/RenderSVGResourceLinearGradient.cpp \
     3131        WebCore/rendering/RenderSVGResourceLinearGradient.h \
    31273132        WebCore/rendering/RenderSVGResourceMarker.cpp \
    31283133        WebCore/rendering/RenderSVGResourceMarker.h \
    31293134        WebCore/rendering/RenderSVGResourceMasker.cpp \
    31303135        WebCore/rendering/RenderSVGResourceMasker.h \
     3136        WebCore/rendering/RenderSVGResourcePattern.cpp \
     3137        WebCore/rendering/RenderSVGResourcePattern.h \
     3138        WebCore/rendering/RenderSVGResourceRadialGradient.cpp \
     3139        WebCore/rendering/RenderSVGResourceRadialGradient.h \
     3140        WebCore/rendering/RenderSVGResourceSolidColor.cpp \
     3141        WebCore/rendering/RenderSVGResourceSolidColor.h \
    31313142        WebCore/rendering/RenderSVGRoot.cpp \
    31323143        WebCore/rendering/RenderSVGRoot.h \
    … …  
    34503461        WebCore/svg/graphics/SVGImage.cpp \
    34513462        WebCore/svg/graphics/SVGImage.h \
    3452         WebCore/svg/graphics/SVGPaintServer.cpp \
    34533463        WebCore/svg/graphics/SVGPaintServer.h \
    3454         WebCore/svg/graphics/SVGPaintServerGradient.cpp \
    3455         WebCore/svg/graphics/SVGPaintServerGradient.h \
    3456         WebCore/svg/graphics/SVGPaintServerLinearGradient.cpp \
    3457         WebCore/svg/graphics/SVGPaintServerLinearGradient.h \
    3458         WebCore/svg/graphics/SVGPaintServerPattern.cpp \
    3459         WebCore/svg/graphics/SVGPaintServerPattern.h \
    3460         WebCore/svg/graphics/SVGPaintServerRadialGradient.cpp \
    3461         WebCore/svg/graphics/SVGPaintServerRadialGradient.h \
    3462         WebCore/svg/graphics/SVGPaintServerSolid.cpp \
    3463         WebCore/svg/graphics/SVGPaintServerSolid.h \
    34643464        WebCore/svg/graphics/SVGResource.cpp \
    3465         WebCore/svg/graphics/SVGResource.h \
    3466         WebCore/svg/graphics/SVGResourceListener.h \
    34673465        WebCore/svg/graphics/filters/SVGDistantLightSource.h \
    34683466        WebCore/svg/graphics/filters/SVGFEConvolveMatrix.cpp \

  • trunk/WebCore/WebCore.gypi

    r58006 r58093  
    31703170            'rendering/RenderSVGModelObject.cpp',
    31713171            'rendering/RenderSVGModelObject.h',
     3172            'rendering/RenderSVGResource.cpp',
    31723173            'rendering/RenderSVGResource.h',
    31733174            'rendering/RenderSVGResourceClipper.cpp',
    … …  
    31753176            'rendering/RenderSVGResourceFilter.cpp',
    31763177            'rendering/RenderSVGResourceFilter.h',
     3178            'rendering/RenderSVGResourceGradient.cpp',
     3179            'rendering/RenderSVGResourceGradient.h',
     3180            'rendering/RenderSVGResourceLinearGradient.cpp',
     3181            'rendering/RenderSVGResourceLinearGradient.h',
    31773182            'rendering/RenderSVGResourceMarker.cpp',
    31783183            'rendering/RenderSVGResourceMarker.h',
    31793184            'rendering/RenderSVGResourceMasker.cpp',
    31803185            'rendering/RenderSVGResourceMasker.h',
     3186            'rendering/RenderSVGResourcePattern.cpp',
     3187            'rendering/RenderSVGResourcePattern.h',
     3188            'rendering/RenderSVGResourceRadialGradient.cpp',
     3189            'rendering/RenderSVGResourceRadialGradient.h',
     3190            'rendering/RenderSVGResourceSolidColor.cpp',
     3191            'rendering/RenderSVGResourceSolidColor.h',
    31813192            'rendering/RenderSVGRoot.cpp',
    31823193            'rendering/RenderSVGRoot.h',
    … …  
    33933404            'svg/graphics/SVGImage.cpp',
    33943405            'svg/graphics/SVGImage.h',
    3395             'svg/graphics/SVGPaintServer.cpp',
    33963406            'svg/graphics/SVGPaintServer.h',
    3397             'svg/graphics/SVGPaintServerGradient.cpp',
    3398             'svg/graphics/SVGPaintServerGradient.h',
    3399             'svg/graphics/SVGPaintServerLinearGradient.cpp',
    3400             'svg/graphics/SVGPaintServerLinearGradient.h',
    3401             'svg/graphics/SVGPaintServerPattern.cpp',
    3402             'svg/graphics/SVGPaintServerPattern.h',
    3403             'svg/graphics/SVGPaintServerRadialGradient.cpp',
    3404             'svg/graphics/SVGPaintServerRadialGradient.h',
    3405             'svg/graphics/SVGPaintServerSolid.cpp',
    3406             'svg/graphics/SVGPaintServerSolid.h',
    34073407            'svg/graphics/SVGResource.cpp',
    34083408            'svg/graphics/SVGResource.h',
    3409             'svg/graphics/SVGResourceListener.h',
    34103409            'svg/ColorDistance.cpp',
    34113410            'svg/ColorDistance.h',

  • trunk/WebCore/WebCore.pro

    r58092 r58093  
    17311731    rendering/RenderSVGResource.h \
    17321732    rendering/RenderSVGResourceClipper.h \
    1733     rendering/RenderSVGResourceFilter.h \
     1733    rendering/RenderSVGResourceFilter.h \
     1734    rendering/RenderSVGResourceGradient.h \
     1735    rendering/RenderSVGResourceLinearGradient.h \
    17341736    rendering/RenderSVGResourceMarker.h \
    17351737    rendering/RenderSVGResourceMasker.h \
     1738    rendering/RenderSVGResourcePattern.h \
     1739    rendering/RenderSVGResourceRadialGradient.h \
     1740    rendering/RenderSVGResourceSolidColor.h \
    17361741    rendering/RenderSVGRoot.h \
    17371742    rendering/RenderSVGShadowTreeRootContainer.h \
    … …  
    18151820    svg/graphics/filters/SVGLightSource.h \
    18161821    svg/graphics/SVGImage.h \
    1817     svg/graphics/SVGPaintServerGradient.h \
    18181822    svg/graphics/SVGPaintServer.h \
    1819     svg/graphics/SVGPaintServerLinearGradient.h \
    1820     svg/graphics/SVGPaintServerPattern.h \
    1821     svg/graphics/SVGPaintServerRadialGradient.h \
    1822     svg/graphics/SVGPaintServerSolid.h \
    18231823    svg/graphics/SVGResource.h \
    18241824    svg/SVGAElement.h \
    … …  
    26862686        svg/graphics/filters/SVGLightSource.cpp \
    26872687        svg/graphics/SVGImage.cpp \
    2688         svg/graphics/SVGPaintServer.cpp \
    2689         svg/graphics/SVGPaintServerGradient.cpp \
    2690         svg/graphics/SVGPaintServerLinearGradient.cpp \
    2691         svg/graphics/SVGPaintServerPattern.cpp \
    2692         svg/graphics/SVGPaintServerRadialGradient.cpp \
    2693         svg/graphics/SVGPaintServerSolid.cpp \
    26942688        svg/graphics/SVGResource.cpp \
    26952689        rendering/RenderForeignObject.cpp \
    … …  
    27032697        rendering/RenderSVGInlineText.cpp \
    27042698        rendering/RenderSVGModelObject.cpp \
     2699        rendering/RenderSVGResource.cpp \
    27052700        rendering/RenderSVGResourceClipper.cpp \
    27062701        rendering/RenderSVGResourceFilter.cpp \
     2702        rendering/RenderSVGResourceGradient.cpp \
     2703        rendering/RenderSVGResourceLinearGradient.cpp \
    27072704        rendering/RenderSVGResourceMarker.cpp \
    27082705        rendering/RenderSVGResourceMasker.cpp \
     2706        rendering/RenderSVGResourcePattern.cpp \
     2707        rendering/RenderSVGResourceRadialGradient.cpp \
     2708        rendering/RenderSVGResourceSolidColor.cpp \
    27092709        rendering/RenderSVGRoot.cpp \
    27102710        rendering/RenderSVGShadowTreeRootContainer.cpp \

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

    r58045 r58093  
    2792027920                        </File>
    2792127921                        <File
     27922                                RelativePath="..\rendering\RenderSVGResource.cpp"
     27923                                >
     27924                        </File>
     27925                        <File
    2792227926                                RelativePath="..\rendering\RenderSVGResource.h"
    2792327927                                >
    … …  
    2794027944                        </File>
    2794127945                        <File
     27946                                RelativePath="..\rendering\RenderSVGResourceGradient.cpp"
     27947                                >
     27948                        </File>
     27949                        <File
     27950                                RelativePath="..\rendering\RenderSVGResourceGradient.h"
     27951                                >
     27952                        </File>
     27953                        <File
     27954                                RelativePath="..\rendering\RenderSVGResourceLinearGradient.cpp"
     27955                                >
     27956                        </File>
     27957                        <File
     27958                                RelativePath="..\rendering\RenderSVGResourceLinearGradient.h"
     27959                                >
     27960                        </File>
     27961                        <File
    2794227962                                RelativePath="..\rendering\RenderSVGResourceMarker.cpp"
    2794327963                                >
    … …  
    2795327973                        <File
    2795427974                                RelativePath="..\rendering\RenderSVGResourceMasker.h"
     27975                                >
     27976                        </File>
     27977                        <File
     27978                                RelativePath="..\rendering\RenderSVGResourcePattern.cpp"
     27979                                >
     27980                        </File>
     27981                        <File
     27982                                RelativePath="..\rendering\RenderSVGResourcePattern.h"
     27983                                >
     27984                        </File>
     27985                        <File
     27986                                RelativePath="..\rendering\RenderSVGResourceRadialGradient.cpp"
     27987                                >
     27988                        </File>
     27989                        <File
     27990                                RelativePath="..\rendering\RenderSVGResourceRadialGradient.h"
     27991                                >
     27992                        </File>
     27993                        <File
     27994                                RelativePath="..\rendering\RenderSVGResourceSolidColor.cpp"
     27995                                >
     27996                        </File>
     27997                        <File
     27998                                RelativePath="..\rendering\RenderSVGResourceSolidColor.h"
    2795527999                                >
    2795628000                        </File>
    … …  
    4231142355                                </File>
    4231242356                                <File
    42313                                         RelativePath="..\svg\graphics\SVGPaintServer.cpp"
    42314                                         >
    42315                                 </File>
    42316                                 <File
    4231742357                                        RelativePath="..\svg\graphics\SVGPaintServer.h"
    4231842358                                        >
    4231942359                                </File>
    4232042360                                <File
    42321                                         RelativePath="..\svg\graphics\SVGPaintServerGradient.cpp"
    42322                                         >
    42323                                 </File>
    42324                                 <File
    42325                                         RelativePath="..\svg\graphics\SVGPaintServerGradient.h"
    42326                                         >
    42327                                 </File>
    42328                                 <File
    42329                                         RelativePath="..\svg\graphics\SVGPaintServerLinearGradient.cpp"
    42330                                         >
    42331                                 </File>
    42332                                 <File
    42333                                         RelativePath="..\svg\graphics\SVGPaintServerLinearGradient.h"
    42334                                         >
    42335                                 </File>
    42336                                 <File
    42337                                         RelativePath="..\svg\graphics\SVGPaintServerPattern.cpp"
    42338                                         >
    42339                                 </File>
    42340                                 <File
    42341                                         RelativePath="..\svg\graphics\SVGPaintServerPattern.h"
    42342                                         >
    42343                                 </File>
    42344                                 <File
    42345                                         RelativePath="..\svg\graphics\SVGPaintServerRadialGradient.cpp"
    42346                                         >
    42347                                 </File>
    42348                                 <File
    42349                                         RelativePath="..\svg\graphics\SVGPaintServerRadialGradient.h"
    42350                                         >
    42351                                 </File>
    42352                                 <File
    42353                                         RelativePath="..\svg\graphics\SVGPaintServerSolid.cpp"
    42354                                         >
    42355                                 </File>
    42356                                 <File
    42357                                         RelativePath="..\svg\graphics\SVGPaintServerSolid.h"
    42358                                         >
    42359                                 </File>
    42360                                 <File
    4236142361                                        RelativePath="..\svg\graphics\SVGResource.cpp"
    4236242362                                        >
    … …  
    4236442364                                <File
    4236542365                                        RelativePath="..\svg\graphics\SVGResource.h"
    42366                                         >
    42367                                 </File>
    42368                                 <File
    42369                                         RelativePath="..\svg\graphics\SVGResourceListener.h"
    4237042366                                        >
    4237142367                                </File>

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

    r57959 r58093  
    4747                0804BF6E0EE09C3B0006C000 /* WMLDoElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0804BF6C0EE09C3B0006C000 /* WMLDoElement.cpp */; };
    4848                0804BF6F0EE09C3B0006C000 /* WMLDoElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 0804BF6D0EE09C3B0006C000 /* WMLDoElement.h */; };
     49                08082373117987C100241DE8 /* RenderSVGResourceContainer.h in Headers */ = {isa = PBXBuildFile; fileRef = 08082372117987C100241DE8 /* RenderSVGResourceContainer.h */; };
    4950                080AEC810ED8708B00DF4CCE /* WMLIntrinsicEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 080AEC7D0ED8708A00DF4CCE /* WMLIntrinsicEvent.cpp */; };
    5051                080AEC820ED8708B00DF4CCE /* WMLIntrinsicEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 080AEC7E0ED8708B00DF4CCE /* WMLIntrinsicEvent.h */; };
    … …  
    8586                084DBAA10ED39D360038C226 /* WMLVariables.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 084DBA9D0ED39D350038C226 /* WMLVariables.cpp */; };
    8687                084DBAA20ED39D360038C226 /* WMLVariables.h in Headers */ = {isa = PBXBuildFile; fileRef = 084DBA9E0ED39D360038C226 /* WMLVariables.h */; };
     88                08563BB4117861780012B578 /* RenderSVGResourcePattern.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 08563BB2117861770012B578 /* RenderSVGResourcePattern.cpp */; };
     89                08563BB5117861780012B578 /* RenderSVGResourcePattern.h in Headers */ = {isa = PBXBuildFile; fileRef = 08563BB3117861770012B578 /* RenderSVGResourcePattern.h */; };
     90                08563BD0117865F50012B578 /* RenderSVGResource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 08563BCF117865F50012B578 /* RenderSVGResource.cpp */; };
    8791                08591AA50F085C4E009BACB1 /* InputElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 08591AA40F085C4E009BACB1 /* InputElement.h */; settings = {ATTRIBUTES = (Private, ); }; };
    8892                085AFDC80F2977350061F2B3 /* WMLFormControlElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 085AFDC60F2977350061F2B3 /* WMLFormControlElement.cpp */; };
    … …  
    140144                08A484780E5272C500C3FE76 /* ScriptElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A484760E5272C500C3FE76 /* ScriptElement.h */; };
    141145                08A48A6E0E86CF6D00E225DD /* JSSVGElementInstanceCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 08A48A6D0E86CF6D00E225DD /* JSSVGElementInstanceCustom.cpp */; };
     146                08A7E92711805EDA00D0B870 /* SVGPaintServer.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A7E92611805EDA00D0B870 /* SVGPaintServer.h */; };
     147                08A7E92B11805EF100D0B870 /* SVGResource.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A7E92A11805EF100D0B870 /* SVGResource.h */; };
     148                08A7E92F11805EFD00D0B870 /* SVGResource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 08A7E92E11805EFD00D0B870 /* SVGResource.cpp */; };
     149                08C34AF51179C057002D7456 /* RenderSVGResourceGradient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 08C34AF11179C056002D7456 /* RenderSVGResourceGradient.cpp */; };
     150                08C34AF61179C057002D7456 /* RenderSVGResourceGradient.h in Headers */ = {isa = PBXBuildFile; fileRef = 08C34AF21179C057002D7456 /* RenderSVGResourceGradient.h */; };
     151                08C34AF71179C057002D7456 /* RenderSVGResourceLinearGradient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 08C34AF31179C057002D7456 /* RenderSVGResourceLinearGradient.cpp */; };
     152                08C34AF81179C057002D7456 /* RenderSVGResourceLinearGradient.h in Headers */ = {isa = PBXBuildFile; fileRef = 08C34AF41179C057002D7456 /* RenderSVGResourceLinearGradient.h */; };
     153                08C34AFD1179C072002D7456 /* RenderSVGResourceRadialGradient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 08C34AFB1179C072002D7456 /* RenderSVGResourceRadialGradient.cpp */; };
     154                08C34AFE1179C072002D7456 /* RenderSVGResourceRadialGradient.h in Headers */ = {isa = PBXBuildFile; fileRef = 08C34AFC1179C072002D7456 /* RenderSVGResourceRadialGradient.h */; };
    142155                08C4C5180EF19A4000E4840F /* WMLImageElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 08C4C5140EF19A4000E4840F /* WMLImageElement.cpp */; };
    143156                08C4C5190EF19A4000E4840F /* WMLImageElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 08C4C5150EF19A4000E4840F /* WMLImageElement.h */; };
    144157                08C4C51A0EF19A4000E4840F /* WMLImageLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 08C4C5160EF19A4000E4840F /* WMLImageLoader.cpp */; };
    145158                08C4C51B0EF19A4000E4840F /* WMLImageLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 08C4C5170EF19A4000E4840F /* WMLImageLoader.h */; };
     159                08C6A7AB117DFBAB00FEA1A2 /* RenderSVGResourceSolidColor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 08C6A7A9117DFBAB00FEA1A2 /* RenderSVGResourceSolidColor.cpp */; };
     160                08C6A7AC117DFBAB00FEA1A2 /* RenderSVGResourceSolidColor.h in Headers */ = {isa = PBXBuildFile; fileRef = 08C6A7AA117DFBAB00FEA1A2 /* RenderSVGResourceSolidColor.h */; };
    146161                08C7A2C710DC7462002D368B /* SVGNames.h in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = 656581E909D1508D000E61D7 /* SVGNames.h */; };
    147162                08C925190FCC7C4A00480DEC /* FilterEffect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 08C925170FCC7C4A00480DEC /* FilterEffect.cpp */; };
    … …  
    37323747                B25599A40D00D8BA00BB825C /* SVGImage.h in Headers */ = {isa = PBXBuildFile; fileRef = B255990C0D00D8B900BB825C /* SVGImage.h */; };
    37333748                B25599A50D00D8BA00BB825C /* EmptyClients.h in Headers */ = {isa = PBXBuildFile; fileRef = B255990D0D00D8B900BB825C /* EmptyClients.h */; };
    3734                 B25599A60D00D8BA00BB825C /* SVGPaintServer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B255990E0D00D8B900BB825C /* SVGPaintServer.cpp */; };
    3735                 B25599A70D00D8BA00BB825C /* SVGPaintServer.h in Headers */ = {isa = PBXBuildFile; fileRef = B255990F0D00D8B900BB825C /* SVGPaintServer.h */; };
    3736                 B25599A80D00D8BA00BB825C /* SVGPaintServerGradient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B25599100D00D8B900BB825C /* SVGPaintServerGradient.cpp */; };
    3737                 B25599A90D00D8BA00BB825C /* SVGPaintServerGradient.h in Headers */ = {isa = PBXBuildFile; fileRef = B25599110D00D8B900BB825C /* SVGPaintServerGradient.h */; };
    3738                 B25599AA0D00D8BA00BB825C /* SVGPaintServerLinearGradient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B25599120D00D8B900BB825C /* SVGPaintServerLinearGradient.cpp */; };
    3739                 B25599AB0D00D8BA00BB825C /* SVGPaintServerLinearGradient.h in Headers */ = {isa = PBXBuildFile; fileRef = B25599130D00D8B900BB825C /* SVGPaintServerLinearGradient.h */; };
    3740                 B25599AC0D00D8BA00BB825C /* SVGPaintServerPattern.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B25599140D00D8B900BB825C /* SVGPaintServerPattern.cpp */; };
    3741                 B25599AD0D00D8BA00BB825C /* SVGPaintServerPattern.h in Headers */ = {isa = PBXBuildFile; fileRef = B25599150D00D8B900BB825C /* SVGPaintServerPattern.h */; };
    3742                 B25599AE0D00D8BA00BB825C /* SVGPaintServerRadialGradient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B25599160D00D8B900BB825C /* SVGPaintServerRadialGradient.cpp */; };
    3743                 B25599AF0D00D8BA00BB825C /* SVGPaintServerRadialGradient.h in Headers */ = {isa = PBXBuildFile; fileRef = B25599170D00D8B900BB825C /* SVGPaintServerRadialGradient.h */; };
    3744                 B25599B00D00D8BA00BB825C /* SVGPaintServerSolid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B25599180D00D8B900BB825C /* SVGPaintServerSolid.cpp */; };
    3745                 B25599B10D00D8BA00BB825C /* SVGPaintServerSolid.h in Headers */ = {isa = PBXBuildFile; fileRef = B25599190D00D8B900BB825C /* SVGPaintServerSolid.h */; };
    3746                 B25599B20D00D8BA00BB825C /* SVGResource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B255991A0D00D8B900BB825C /* SVGResource.cpp */; };
    3747                 B25599B30D00D8BA00BB825C /* SVGResource.h in Headers */ = {isa = PBXBuildFile; fileRef = B255991B0D00D8B900BB825C /* SVGResource.h */; };
    3748                 B25599B80D00D8BA00BB825C /* SVGResourceListener.h in Headers */ = {isa = PBXBuildFile; fileRef = B25599200D00D8B900BB825C /* SVGResourceListener.h */; };
    37493749                B25DFAAF0B2E2929000E6510 /* JSSVGMatrixCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B25DFAAE0B2E2929000E6510 /* JSSVGMatrixCustom.cpp */; };
    37503750                B262B8040D1F32D000158F09 /* SVGFont.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B262B8030D1F32D000158F09 /* SVGFont.cpp */; };
    … …  
    54325432                0804BF6C0EE09C3B0006C000 /* WMLDoElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WMLDoElement.cpp; sourceTree = "<group>"; };
    54335433                0804BF6D0EE09C3B0006C000 /* WMLDoElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WMLDoElement.h; sourceTree = "<group>"; };
     5434                08082372117987C100241DE8 /* RenderSVGResourceContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderSVGResourceContainer.h; sourceTree = "<group>"; };
    54345435                080AEC7D0ED8708A00DF4CCE /* WMLIntrinsicEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WMLIntrinsicEvent.cpp; sourceTree = "<group>"; };
    54355436                080AEC7E0ED8708B00DF4CCE /* WMLIntrinsicEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WMLIntrinsicEvent.h; sourceTree = "<group>"; };
    … …  
    54685469                084DBA9D0ED39D350038C226 /* WMLVariables.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WMLVariables.cpp; sourceTree = "<group>"; };
    54695470                084DBA9E0ED39D360038C226 /* WMLVariables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WMLVariables.h; sourceTree = "<group>"; };
     5471                08563BB2117861770012B578 /* RenderSVGResourcePattern.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderSVGResourcePattern.cpp; sourceTree = "<group>"; };
     5472                08563BB3117861770012B578 /* RenderSVGResourcePattern.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderSVGResourcePattern.h; sourceTree = "<group>"; };
     5473                08563BCF117865F50012B578 /* RenderSVGResource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderSVGResource.cpp; sourceTree = "<group>"; };
    54705474                08591AA40F085C4E009BACB1 /* InputElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InputElement.h; sourceTree = "<group>"; };
    54715475                085AFDC60F2977350061F2B3 /* WMLFormControlElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WMLFormControlElement.cpp; sourceTree = "<group>"; };
    … …  
    55115515                08A484760E5272C500C3FE76 /* ScriptElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptElement.h; sourceTree = "<group>"; };
    55125516                08A48A6D0E86CF6D00E225DD /* JSSVGElementInstanceCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSSVGElementInstanceCustom.cpp; sourceTree = "<group>"; };
     5517                08A7E92611805EDA00D0B870 /* SVGPaintServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGPaintServer.h; sourceTree = "<group>"; };
     5518                08A7E92A11805EF100D0B870 /* SVGResource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGResource.h; sourceTree = "<group>"; };
     5519                08A7E92E11805EFD00D0B870 /* SVGResource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGResource.cpp; sourceTree = "<group>"; };
     5520                08C34AF11179C056002D7456 /* RenderSVGResourceGradient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderSVGResourceGradient.cpp; sourceTree = "<group>"; };
     5521                08C34AF21179C057002D7456 /* RenderSVGResourceGradient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderSVGResourceGradient.h; sourceTree = "<group>"; };
     5522                08C34AF31179C057002D7456 /* RenderSVGResourceLinearGradient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderSVGResourceLinearGradient.cpp; sourceTree = "<group>"; };
     5523                08C34AF41179C057002D7456 /* RenderSVGResourceLinearGradient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderSVGResourceLinearGradient.h; sourceTree = "<group>"; };
     5524                08C34AFB1179C072002D7456 /* RenderSVGResourceRadialGradient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderSVGResourceRadialGradient.cpp; sourceTree = "<group>"; };
     5525                08C34AFC1179C072002D7456 /* RenderSVGResourceRadialGradient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderSVGResourceRadialGradient.h; sourceTree = "<group>"; };
    55135526                08C4C5140EF19A4000E4840F /* WMLImageElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WMLImageElement.cpp; sourceTree = "<group>"; };
    55145527                08C4C5150EF19A4000E4840F /* WMLImageElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WMLImageElement.h; sourceTree = "<group>"; };
    55155528                08C4C5160EF19A4000E4840F /* WMLImageLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WMLImageLoader.cpp; sourceTree = "<group>"; };
    55165529                08C4C5170EF19A4000E4840F /* WMLImageLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WMLImageLoader.h; sourceTree = "<group>"; };
     5530                08C6A7A9117DFBAB00FEA1A2 /* RenderSVGResourceSolidColor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderSVGResourceSolidColor.cpp; sourceTree = "<group>"; };
     5531                08C6A7AA117DFBAB00FEA1A2 /* RenderSVGResourceSolidColor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderSVGResourceSolidColor.h; sourceTree = "<group>"; };
    55175532                08C925170FCC7C4A00480DEC /* FilterEffect.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FilterEffect.cpp; path = filters/FilterEffect.cpp; sourceTree = "<group>"; };
    55185533                08C925180FCC7C4A00480DEC /* FilterEffect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FilterEffect.h; path = filters/FilterEffect.h; sourceTree = "<group>"; };
    … …  
    90679082                B255990C0D00D8B900BB825C /* SVGImage.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SVGImage.h; sourceTree = "<group>"; };
    90689083                B255990D0D00D8B900BB825C /* EmptyClients.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = EmptyClients.h; sourceTree = "<group>"; };
    9069                 B255990E0D00D8B900BB825C /* SVGPaintServer.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SVGPaintServer.cpp; sourceTree = "<group>"; };
    9070                 B255990F0D00D8B900BB825C /* SVGPaintServer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SVGPaintServer.h; sourceTree = "<group>"; };
    9071                 B25599100D00D8B900BB825C /* SVGPaintServerGradient.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SVGPaintServerGradient.cpp; sourceTree = "<group>"; };
    9072                 B25599110D00D8B900BB825C /* SVGPaintServerGradient.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SVGPaintServerGradient.h; sourceTree = "<group>"; };
    9073                 B25599120D00D8B900BB825C /* SVGPaintServerLinearGradient.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SVGPaintServerLinearGradient.cpp; sourceTree = "<group>"; };
    9074                 B25599130D00D8B900BB825C /* SVGPaintServerLinearGradient.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SVGPaintServerLinearGradient.h; sourceTree = "<group>"; };
    9075                 B25599140D00D8B900BB825C /* SVGPaintServerPattern.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SVGPaintServerPattern.cpp; sourceTree = "<group>"; };
    9076                 B25599150D00D8B900BB825C /* SVGPaintServerPattern.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SVGPaintServerPattern.h; sourceTree = "<group>"; };
    9077                 B25599160D00D8B900BB825C /* SVGPaintServerRadialGradient.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SVGPaintServerRadialGradient.cpp; sourceTree = "<group>"; };
    9078                 B25599170D00D8B900BB825C /* SVGPaintServerRadialGradient.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SVGPaintServerRadialGradient.h; sourceTree = "<group>"; };
    9079                 B25599180D00D8B900BB825C /* SVGPaintServerSolid.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SVGPaintServerSolid.cpp; sourceTree = "<group>"; };
    9080                 B25599190D00D8B900BB825C /* SVGPaintServerSolid.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SVGPaintServerSolid.h; sourceTree = "<group>"; };
    9081                 B255991A0D00D8B900BB825C /* SVGResource.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SVGResource.cpp; sourceTree = "<group>"; };
    9082                 B255991B0D00D8B900BB825C /* SVGResource.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SVGResource.h; sourceTree = "<group>"; };
    9083                 B25599200D00D8B900BB825C /* SVGResourceListener.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SVGResourceListener.h; sourceTree = "<group>"; };
    90849084                B25DFAAE0B2E2929000E6510 /* JSSVGMatrixCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSSVGMatrixCustom.cpp; sourceTree = "<group>"; };
    90859085                B262B8030D1F32D000158F09 /* SVGFont.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SVGFont.cpp; sourceTree = "<group>"; };
    … …  
    1451114511                                B255990B0D00D8B900BB825C /* SVGImage.cpp */,
    1451214512                                B255990C0D00D8B900BB825C /* SVGImage.h */,
    14513                                 B255990E0D00D8B900BB825C /* SVGPaintServer.cpp */,
    14514                                 B255990F0D00D8B900BB825C /* SVGPaintServer.h */,
    14515                                 B25599100D00D8B900BB825C /* SVGPaintServerGradient.cpp */,
    14516                                 B25599110D00D8B900BB825C /* SVGPaintServerGradient.h */,
    14517                                 B25599120D00D8B900BB825C /* SVGPaintServerLinearGradient.cpp */,
    14518                                 B25599130D00D8B900BB825C /* SVGPaintServerLinearGradient.h */,
    14519                                 B25599140D00D8B900BB825C /* SVGPaintServerPattern.cpp */,
    14520                                 B25599150D00D8B900BB825C /* SVGPaintServerPattern.h */,
    14521                                 B25599160D00D8B900BB825C /* SVGPaintServerRadialGradient.cpp */,
    14522                                 B25599170D00D8B900BB825C /* SVGPaintServerRadialGradient.h */,
    14523                                 B25599180D00D8B900BB825C /* SVGPaintServerSolid.cpp */,
    14524                                 B25599190D00D8B900BB825C /* SVGPaintServerSolid.h */,
    14525                                 B255991A0D00D8B900BB825C /* SVGResource.cpp */,
    14526                                 B255991B0D00D8B900BB825C /* SVGResource.h */,
    14527                                 B25599200D00D8B900BB825C /* SVGResourceListener.h */,
     14513                                08A7E92611805EDA00D0B870 /* SVGPaintServer.h */,
     14514                                08A7E92E11805EFD00D0B870 /* SVGResource.cpp */,
     14515                                08A7E92A11805EF100D0B870 /* SVGResource.h */,
    1452814516                        );
    1452914517                        path = graphics;
    … …  
    1583015818                        isa = PBXGroup;
    1583115819                        children = (
    15832                                 841FDC241178C9BE00F8AC9B /* RenderSVGResourceFilter.cpp */,
    15833                                 841FDC251178C9BE00F8AC9B /* RenderSVGResourceFilter.h */,
    1583415820                                BC8C8FAA0DDCD2F200B592F4 /* style */,
    1583515821                                A8CFF04B0A154F09000A4234 /* AutoTableLayout.cpp */,
    … …  
    1597615962                                A8F5C0B70F9285AC0098E06B /* RenderSVGModelObject.cpp */,
    1597715963                                A8F5C0B60F9285AC0098E06B /* RenderSVGModelObject.h */,
     15964                                08563BCF117865F50012B578 /* RenderSVGResource.cpp */,
    1597815965                                083192A7112B43050083C3B9 /* RenderSVGResource.h */,
    1597915966                                84BDA16911358D2A00DBF64C /* RenderSVGResourceClipper.cpp */,
    1598015967                                84BDA16A11358D2A00DBF64C /* RenderSVGResourceClipper.h */,
     15968                                08082372117987C100241DE8 /* RenderSVGResourceContainer.h */,
     15969                                841FDC241178C9BE00F8AC9B /* RenderSVGResourceFilter.cpp */,
     15970                                841FDC251178C9BE00F8AC9B /* RenderSVGResourceFilter.h */,
     15971                                08C34AF11179C056002D7456 /* RenderSVGResourceGradient.cpp */,
     15972                                08C34AF21179C057002D7456 /* RenderSVGResourceGradient.h */,
     15973                                08C34AF31179C057002D7456 /* RenderSVGResourceLinearGradient.cpp */,
     15974                                08C34AF41179C057002D7456 /* RenderSVGResourceLinearGradient.h */,
    1598115975                                8499A512115FB33000F566E3 /* RenderSVGResourceMarker.cpp */,
    1598215976                                8499A513115FB33000F566E3 /* RenderSVGResourceMarker.h */,
    1598315977                                083192A8112B43050083C3B9 /* RenderSVGResourceMasker.cpp */,
    1598415978                                083192A9112B43050083C3B9 /* RenderSVGResourceMasker.h */,
     15979                                08563BB2117861770012B578 /* RenderSVGResourcePattern.cpp */,
     15980                                08563BB3117861770012B578 /* RenderSVGResourcePattern.h */,
     15981                                08C34AFB1179C072002D7456 /* RenderSVGResourceRadialGradient.cpp */,
     15982                                08C34AFC1179C072002D7456 /* RenderSVGResourceRadialGradient.h */,
     15983                                08C6A7A9117DFBAB00FEA1A2 /* RenderSVGResourceSolidColor.cpp */,
     15984                                08C6A7AA117DFBAB00FEA1A2 /* RenderSVGResourceSolidColor.h */,
    1598515985                                AA31B5B20C1DFD1000AE7083 /* RenderSVGRoot.cpp */,
    1598615986                                AA31B5B30C1DFD1000AE7083 /* RenderSVGRoot.h */,
    … …  
    1855218552                                B2227A510D00BF220071B782 /* SVGNumberList.h in Headers */,
    1855318553                                B2227A540D00BF220071B782 /* SVGPaint.h in Headers */,
    18554                                 B25599A70D00D8BA00BB825C /* SVGPaintServer.h in Headers */,
    18555                                 B25599A90D00D8BA00BB825C /* SVGPaintServerGradient.h in Headers */,
    18556                                 B25599AB0D00D8BA00BB825C /* SVGPaintServerLinearGradient.h in Headers */,
    18557                                 B25599AD0D00D8BA00BB825C /* SVGPaintServerPattern.h in Headers */,
    18558                                 B25599AF0D00D8BA00BB825C /* SVGPaintServerRadialGradient.h in Headers */,
    18559                                 B25599B10D00D8BA00BB825C /* SVGPaintServerSolid.h in Headers */,
    1856018554                                B2227A570D00BF220071B782 /* SVGParserUtilities.h in Headers */,
    1856118555                                B2227A590D00BF220071B782 /* SVGPathElement.h in Headers */,
    … …  
    1858618580                                A8F4FB940C169E7B002AFED5 /* SVGRenderSupport.h in Headers */,
    1858718581                                B2EBDC9D0AF77E3400AE4A68 /* SVGRenderTreeAsText.h in Headers */,
    18588                                 B25599B30D00D8BA00BB825C /* SVGResource.h in Headers */,
    18589                                 B25599B80D00D8BA00BB825C /* SVGResourceListener.h in Headers */,
    1859018582                                853CA9E90AEEC608002372DC /* SVGRootInlineBox.h in Headers */,
    1859118583                                B2227AA30D00BF220071B782 /* SVGScriptElement.h in Headers */,
    … …  
    1886518857                                9FA37EFB1172FDA600C4CD55 /* JSScriptProfile.h in Headers */,
    1886618858                                9FA37EFD1172FDA600C4CD55 /* JSScriptProfileNode.h in Headers */,
     18859                                08563BB5117861780012B578 /* RenderSVGResourcePattern.h in Headers */,
     18860                                08082373117987C100241DE8 /* RenderSVGResourceContainer.h in Headers */,
     18861                                08C34AF61179C057002D7456 /* RenderSVGResourceGradient.h in Headers */,
     18862                                08C34AF81179C057002D7456 /* RenderSVGResourceLinearGradient.h in Headers */,
     18863                                08C34AFE1179C072002D7456 /* RenderSVGResourceRadialGradient.h in Headers */,
    1886718864                                895253DD116C4EF500CABF00 /* FileStreamProxy.h in Headers */,
    1886818865                                895253DF116C4F0600CABF00 /* FileThreadTask.h in Headers */,
    … …  
    1887018867                                0FD3080F117CF7E700A791F7 /* RenderFrameBase.h in Headers */,
    1887118868                                0FD308D6117D168500A791F7 /* RenderIFrame.h in Headers */,
     18869                                08C6A7AC117DFBAB00FEA1A2 /* RenderSVGResourceSolidColor.h in Headers */,
     18870                                08A7E92711805EDA00D0B870 /* SVGPaintServer.h in Headers */,
     18871                                08A7E92B11805EF100D0B870 /* SVGResource.h in Headers */,
    1887218872                        );
    1887318873                        runOnlyForDeploymentPostprocessing = 0;
    … …  
    2083620836                                B2227A500D00BF220071B782 /* SVGNumberList.cpp in Sources */,
    2083720837                                B2227A530D00BF220071B782 /* SVGPaint.cpp in Sources */,
    20838                                 B25599A60D00D8BA00BB825C /* SVGPaintServer.cpp in Sources */,
    20839                                 B25599A80D00D8BA00BB825C /* SVGPaintServerGradient.cpp in Sources */,
    20840                                 B25599AA0D00D8BA00BB825C /* SVGPaintServerLinearGradient.cpp in Sources */,
    20841                                 B25599AC0D00D8BA00BB825C /* SVGPaintServerPattern.cpp in Sources */,
    20842                                 B25599AE0D00D8BA00BB825C /* SVGPaintServerRadialGradient.cpp in Sources */,
    20843                                 B25599B00D00D8BA00BB825C /* SVGPaintServerSolid.cpp in Sources */,
    2084420838                                B2227A560D00BF220071B782 /* SVGParserUtilities.cpp in Sources */,
    2084520839                                B2227A580D00BF220071B782 /* SVGPathElement.cpp in Sources */,
    … …  
    2086720861                                A8F4FB960C169E85002AFED5 /* SVGRenderSupport.cpp in Sources */,
    2086820862                                B2EBDC9C0AF77E3400AE4A68 /* SVGRenderTreeAsText.cpp in Sources */,
    20869                                 B25599B20D00D8BA00BB825C /* SVGResource.cpp in Sources */,
    2087020863                                853CA9E80AEEC608002372DC /* SVGRootInlineBox.cpp in Sources */,
    2087120864                                B2227AA20D00BF220071B782 /* SVGScriptElement.cpp in Sources */,
    … …  
    2110121094                                9FA37EFA1172FDA600C4CD55 /* JSScriptProfile.cpp in Sources */,
    2110221095                                9FA37EFC1172FDA600C4CD55 /* JSScriptProfileNode.cpp in Sources */,
     21096                                08563BB4117861780012B578 /* RenderSVGResourcePattern.cpp in Sources */,
     21097                                08563BD0117865F50012B578 /* RenderSVGResource.cpp in Sources */,
     21098                                08C34AF51179C057002D7456 /* RenderSVGResourceGradient.cpp in Sources */,
     21099                                08C34AF71179C057002D7456 /* RenderSVGResourceLinearGradient.cpp in Sources */,
     21100                                08C34AFD1179C072002D7456 /* RenderSVGResourceRadialGradient.cpp in Sources */,
    2110321101                                895253DC116C4EF500CABF00 /* FileStreamProxy.cpp in Sources */,
    2110421102                                CEF418CE1179678C009D112C /* ViewportArguments.cpp in Sources */,
    2110521103                                0FD3080E117CF7E700A791F7 /* RenderFrameBase.cpp in Sources */,
    2110621104                                0FD308D5117D168500A791F7 /* RenderIFrame.cpp in Sources */,
     21105                                08C6A7AB117DFBAB00FEA1A2 /* RenderSVGResourceSolidColor.cpp in Sources */,
    2110721106                                973889A0116EA9DC00ADF313 /* DocumentWriter.cpp in Sources */,
     21107                                08A7E92F11805EFD00D0B870 /* SVGResource.cpp in Sources */,
    2110821108                        );
    2110921109                        runOnlyForDeploymentPostprocessing = 0;

  • trunk/WebCore/rendering/RenderSVGResource.cpp

    r57888 r58093  
    3434#include "NodeRenderStyle.h"
    3535#include "RenderObject.h"
     36#include "RenderSVGResourceSolidColor.h"
    3637#include "RenderStyle.h"
    37 #include "SVGPaintServerSolid.h"
    3838#include "SVGStyledElement.h"
    3939#include "SVGURIReference.h"

  • trunk/WebCore/rendering/RenderSVGResourceGradient.cpp

    r57888 r58093  
    2929
    3030#if ENABLE(SVG)
    31 #include "SVGPaintServerGradient.h"
     31#include "RenderSVGResourceGradient.h"
    3232
    3333#include "FloatConversion.h"
    … …  
    3535#include "ImageBuffer.h"
    3636#include "RenderObject.h"
     37#include "RenderSVGResourceLinearGradient.h"
     38#include "RenderSVGResourceRadialGradient.h"
    3739#include "RenderView.h"
    3840#include "SVGGradientElement.h"
    39 #include "SVGPaintServerLinearGradient.h"
    40 #include "SVGPaintServerRadialGradient.h"
    4141#include "SVGRenderSupport.h"
    4242#include "SVGRenderTreeAsText.h"

  • trunk/WebCore/rendering/RenderSVGResourceGradient.h

    r57888 r58093  
    2525 */
    2626
    27 #ifndef SVGPaintServerGradient_h
    28 #define SVGPaintServerGradient_h
     27#ifndef RenderSVGResourceGradient_h
     28#define RenderSVGResourceGradient_h
    2929
    3030#if ENABLE(SVG)
    … …  
    4141namespace WebCore {
    4242
    43     class ImageBuffer;
    44     class SVGGradientElement;
     43class ImageBuffer;
     44class SVGGradientElement;
    4545
    46     typedef std::pair<float, Color> SVGGradientStop;
     46typedef std::pair<float, Color> SVGGradientStop;
    4747
    48     class SVGPaintServerGradient : public SVGPaintServer {
    49     public:
    50         virtual ~SVGPaintServerGradient();
     48class SVGPaintServerGradient : public SVGPaintServer {
     49public:
     50    virtual ~SVGPaintServerGradient();
    5151
    52         void setGradient(PassRefPtr<Gradient>);
    53         Gradient* gradient() const;
     52    void setGradient(PassRefPtr<Gradient>);
     53    Gradient* gradient() const;
    5454
    55         // Gradient start and end points are percentages when used in boundingBox mode.
    56         // For instance start point with value (0,0) is top-left and end point with
    57         // value (100, 100) is bottom-right. BoundingBox mode is enabled by default.
    58         bool boundingBoxMode() const;
    59         void setBoundingBoxMode(bool mode = true);
     55    // Gradient start and end points are percentages when used in boundingBox mode.
     56    // For instance start point with value (0,0) is top-left and end point with
     57    // value (100, 100) is bottom-right. BoundingBox mode is enabled by default.
     58    bool boundingBoxMode() const;
     59    void setBoundingBoxMode(bool mode = true);
    6060
    61         AffineTransform gradientTransform() const;
    62         void setGradientTransform(const AffineTransform&);
     61    AffineTransform gradientTransform() const;
     62    void setGradientTransform(const AffineTransform&);
    6363
    64         void setGradientStops(const Vector<SVGGradientStop>& stops) { m_stops = stops; }
    65         const Vector<SVGGradientStop>& gradientStops() const { return m_stops; }
     64    void setGradientStops(const Vector<SVGGradientStop>& stops) { m_stops = stops; }
     65    const Vector<SVGGradientStop>& gradientStops() const { return m_stops; }
    6666
    67         virtual TextStream& externalRepresentation(TextStream&) const;
     67    virtual TextStream& externalRepresentation(TextStream&) const;
    6868
    69         virtual bool setup(GraphicsContext*&, const RenderObject*, const RenderStyle*, SVGPaintTargetType, bool isPaintingText) const;
    70         virtual void teardown(GraphicsContext*&, const RenderObject*, SVGPaintTargetType, bool isPaintingText) const;
     69    virtual bool setup(GraphicsContext*&, const RenderObject*, const RenderStyle*, SVGPaintTargetType, bool isPaintingText) const;
     70    virtual void teardown(GraphicsContext*&, const RenderObject*, SVGPaintTargetType, bool isPaintingText) const;
    7171
    72     protected:
    73         SVGPaintServerGradient(const SVGGradientElement* owner);
    74        
    75     private:
    76         Vector<SVGGradientStop> m_stops;
    77         RefPtr<Gradient> m_gradient;
    78         bool m_boundingBoxMode;
    79         AffineTransform m_gradientTransform;
    80         const SVGGradientElement* m_ownerElement;
     72protected:
     73    SVGPaintServerGradient(const SVGGradientElement* owner);
     74   
     75private:
     76    Vector<SVGGradientStop> m_stops;
     77    RefPtr<Gradient> m_gradient;
     78    bool m_boundingBoxMode;
     79    AffineTransform m_gradientTransform;
     80    const SVGGradientElement* m_ownerElement;
    8181
    8282#if PLATFORM(CG)
    83     public:
    84         mutable GraphicsContext* m_savedContext;
    85         mutable OwnPtr<ImageBuffer> m_imageBuffer;
     83public:
     84    mutable GraphicsContext* m_savedContext;
     85    mutable OwnPtr<ImageBuffer> m_imageBuffer;
    8686#endif
    87     };
     87};
    8888
    89     inline SVGGradientStop makeGradientStop(float offset, const Color& color)
    90     {
    91         return std::make_pair(offset, color);
    92     }
     89inline SVGGradientStop makeGradientStop(float offset, const Color& color)
     90{
     91    return std::make_pair(offset, color);
     92}
    9393
    9494} // namespace WebCore
    … …  
    9696#endif
    9797
    98 #endif // SVGPaintServerGradient_h
     98#endif // RenderSVGResourceGradient_h

  • trunk/WebCore/rendering/RenderSVGResourceLinearGradient.cpp

    r57888 r58093  
    2727
    2828#if ENABLE(SVG)
    29 #include "SVGPaintServerLinearGradient.h"
     29#include "RenderSVGResourceLinearGradient.h"
     30
    3031#include "SVGRenderTreeAsText.h"
    3132

  • trunk/WebCore/rendering/RenderSVGResourceLinearGradient.h

    r57888 r58093  
    2424 */
    2525
    26 #ifndef SVGPaintServerLinearGradient_h
    27 #define SVGPaintServerLinearGradient_h
     26#ifndef RenderSVGResourceLinearGradient_h
     27#define RenderSVGResourceLinearGradient_h
    2828
    2929#if ENABLE(SVG)
    3030
    3131#include "FloatPoint.h"
    32 #include "SVGPaintServerGradient.h"
     32#include "RenderSVGResourceGradient.h"
    3333
    3434namespace WebCore {
    3535
    36     class SVGPaintServerLinearGradient : public SVGPaintServerGradient {
    37     public:
    38         static PassRefPtr<SVGPaintServerLinearGradient> create(const SVGGradientElement* owner) { return adoptRef(new SVGPaintServerLinearGradient(owner)); }
    39         virtual ~SVGPaintServerLinearGradient();
     36class SVGPaintServerLinearGradient : public SVGPaintServerGradient {
     37public:
     38    static PassRefPtr<SVGPaintServerLinearGradient> create(const SVGGradientElement* owner) { return adoptRef(new SVGPaintServerLinearGradient(owner)); }
     39    virtual ~SVGPaintServerLinearGradient();
    4040
    41         virtual SVGPaintServerType type() const { return LinearGradientPaintServer; }
     41    virtual SVGPaintServerType type() const { return LinearGradientPaintServer; }
    4242
    43         FloatPoint gradientStart() const;
    44         void setGradientStart(const FloatPoint&);
     43    FloatPoint gradientStart() const;
     44    void setGradientStart(const FloatPoint&);
    4545
    46         FloatPoint gradientEnd() const;
    47         void setGradientEnd(const FloatPoint&);
     46    FloatPoint gradientEnd() const;
     47    void setGradientEnd(const FloatPoint&);
    4848
    49         virtual TextStream& externalRepresentation(TextStream&) const;
     49    virtual TextStream& externalRepresentation(TextStream&) const;
    5050
    51     private:
    52         SVGPaintServerLinearGradient(const SVGGradientElement* owner);
     51private:
     52    SVGPaintServerLinearGradient(const SVGGradientElement* owner);
    5353
    54         FloatPoint m_start;
    55         FloatPoint m_end;
    56     };
     54    FloatPoint m_start;
     55    FloatPoint m_end;
     56};
    5757
    5858} // namespace WebCore
    … …  
    6060#endif
    6161
    62 #endif // SVGPaintServerLinearGradient_h
     62#endif // RenderSVGResourceLinearGradient_h

  • trunk/WebCore/rendering/RenderSVGResourcePattern.cpp

    r57888 r58093  
    2828
    2929#if ENABLE(SVG)
    30 #include "SVGPaintServerPattern.h"
     30#include "RenderSVGResourcePattern.h"
    3131
    3232#include "AffineTransform.h"

  • trunk/WebCore/rendering/RenderSVGResourcePattern.h

    r57888 r58093  
    2424 */
    2525
    26 #ifndef SVGPaintServerPattern_h
    27 #define SVGPaintServerPattern_h
     26#ifndef RenderSVGResourcePattern_h
     27#define RenderSVGResourcePattern_h
    2828
    2929#if ENABLE(SVG)
    … …  
    4141namespace WebCore {
    4242
    43     class GraphicsContext;
    44     class ImageBuffer;
    45     class SVGPatternElement;
     43class GraphicsContext;
     44class ImageBuffer;
     45class SVGPatternElement;
    4646
    47     class SVGPaintServerPattern : public SVGPaintServer {
    48     public:
    49         static PassRefPtr<SVGPaintServerPattern> create(const SVGPatternElement* owner) { return adoptRef(new SVGPaintServerPattern(owner)); }
     47class SVGPaintServerPattern : public SVGPaintServer {
     48public:
     49    static PassRefPtr<SVGPaintServerPattern> create(const SVGPatternElement* owner) { return adoptRef(new SVGPaintServerPattern(owner)); }
    5050
    51         virtual ~SVGPaintServerPattern();
     51    virtual ~SVGPaintServerPattern();
    5252
    53         virtual SVGPaintServerType type() const { return PatternPaintServer; }
     53    virtual SVGPaintServerType type() const { return PatternPaintServer; }
    5454
    55         // Pattern boundaries
    56         void setPatternBoundaries(const FloatRect&);
    57         FloatRect patternBoundaries() const;
     55    // Pattern boundaries
     56    void setPatternBoundaries(const FloatRect&);
     57    FloatRect patternBoundaries() const;
    5858
    59         ImageBuffer* tile() const;
    60         void setTile(PassOwnPtr<ImageBuffer>);
     59    ImageBuffer* tile() const;
     60    void setTile(PassOwnPtr<ImageBuffer>);
    6161
    62         AffineTransform patternTransform() const;
    63         void setPatternTransform(const AffineTransform&);
     62    AffineTransform patternTransform() const;
     63    void setPatternTransform(const AffineTransform&);
    6464
    65         virtual TextStream& externalRepresentation(TextStream&) const;
     65    virtual TextStream& externalRepresentation(TextStream&) const;
    6666
    67         virtual bool setup(GraphicsContext*&, const RenderObject*, const RenderStyle*, SVGPaintTargetType, bool isPaintingText) const;
    68         virtual void teardown(GraphicsContext*&, const RenderObject*, SVGPaintTargetType, bool isPaintingText) const;
     67    virtual bool setup(GraphicsContext*&, const RenderObject*, const RenderStyle*, SVGPaintTargetType, bool isPaintingText) const;
     68    virtual void teardown(GraphicsContext*&, const RenderObject*, SVGPaintTargetType, bool isPaintingText) const;
    6969
    70     private:
    71         SVGPaintServerPattern(const SVGPatternElement*);
    72        
    73         OwnPtr<ImageBuffer> m_tile;
    74         const SVGPatternElement* m_ownerElement;
    75         AffineTransform m_patternTransform;
    76         FloatRect m_patternBoundaries;
     70private:
     71    SVGPaintServerPattern(const SVGPatternElement*);
     72   
     73    OwnPtr<ImageBuffer> m_tile;
     74    const SVGPatternElement* m_ownerElement;
     75    AffineTransform m_patternTransform;
     76    FloatRect m_patternBoundaries;
    7777
    78         mutable RefPtr<Pattern> m_pattern;
    79     };
     78    mutable RefPtr<Pattern> m_pattern;
     79};
    8080
    8181} // namespace WebCore
    … …  
    8383#endif
    8484
    85 #endif // SVGPaintServerPattern_h
     85#endif // RenderSVGResourcePattern_h

  • trunk/WebCore/rendering/RenderSVGResourceRadialGradient.cpp

    r57888 r58093  
    2727
    2828#if ENABLE(SVG)
    29 #include "SVGPaintServerRadialGradient.h"
     29#include "RenderSVGResourceRadialGradient.h"
     30
    3031#include "SVGRenderTreeAsText.h"
    3132

  • trunk/WebCore/rendering/RenderSVGResourceRadialGradient.h

    r57888 r58093  
    2424 */
    2525
    26 #ifndef SVGPaintServerRadialGradient_h
    27 #define SVGPaintServerRadialGradient_h
     26#ifndef RenderSVGResourceRadialGradient_h
     27#define RenderSVGResourceRadialGradient_h
    2828
    2929#if ENABLE(SVG)
    3030
    3131#include "FloatPoint.h"
    32 #include "SVGPaintServerGradient.h"
     32#include "RenderSVGResourceGradient.h"
    3333
    3434namespace WebCore {
    3535
    36     class SVGPaintServerRadialGradient : public SVGPaintServerGradient {
    37     public:
    38         static PassRefPtr<SVGPaintServerRadialGradient> create(const SVGGradientElement* owner) { return adoptRef(new SVGPaintServerRadialGradient(owner)); }
    39         virtual ~SVGPaintServerRadialGradient();
     36class SVGPaintServerRadialGradient : public SVGPaintServerGradient {
     37public:
     38    static PassRefPtr<SVGPaintServerRadialGradient> create(const SVGGradientElement* owner) { return adoptRef(new SVGPaintServerRadialGradient(owner)); }
     39    virtual ~SVGPaintServerRadialGradient();
    4040
    41         virtual SVGPaintServerType type() const { return RadialGradientPaintServer; }
     41    virtual SVGPaintServerType type() const { return RadialGradientPaintServer; }
    4242
    43         FloatPoint gradientCenter() const;
    44         void setGradientCenter(const FloatPoint&);
     43    FloatPoint gradientCenter() const;
     44    void setGradientCenter(const FloatPoint&);
    4545
    46         FloatPoint gradientFocal() const;
    47         void setGradientFocal(const FloatPoint&);
     46    FloatPoint gradientFocal() const;
     47    void setGradientFocal(const FloatPoint&);
    4848
    49         float gradientRadius() const;
    50         void setGradientRadius(float);
     49    float gradientRadius() const;
     50    void setGradientRadius(float);
    5151
    52         virtual TextStream& externalRepresentation(TextStream&) const;
     52    virtual TextStream& externalRepresentation(TextStream&) const;
    5353
    54     private:
    55         SVGPaintServerRadialGradient(const SVGGradientElement* owner);
     54private:
     55    SVGPaintServerRadialGradient(const SVGGradientElement* owner);
    5656
    57         float m_radius;
    58         FloatPoint m_center;
    59         FloatPoint m_focal;
    60     };
     57    float m_radius;
     58    FloatPoint m_center;
     59    FloatPoint m_focal;
     60};
    6161
    6262} // namespace WebCore
    … …  
    6464#endif
    6565
    66 #endif // SVGPaintServerRadialGradient_h
     66#endif // RenderSVGResourceRadialGradient_h

  • trunk/WebCore/rendering/RenderSVGResourceSolidColor.cpp

    r57888 r58093  
    2828
    2929#if ENABLE(SVG)
    30 #include "SVGPaintServerSolid.h"
     30#include "RenderSVGResourceSolidColor.h"
    3131
    3232#include "GraphicsContext.h"

  • trunk/WebCore/rendering/RenderSVGResourceSolidColor.h

    r57888 r58093  
    2424 */
    2525
    26 #ifndef SVGPaintServerSolid_h
    27 #define SVGPaintServerSolid_h
     26#ifndef RenderSVGResourceSolidColor_h
     27#define RenderSVGResourceSolidColor_h
    2828
    2929#if ENABLE(SVG)
    … …  
    3434namespace WebCore {
    3535
    36     class SVGPaintServerSolid : public SVGPaintServer {
    37     public:
    38         static PassRefPtr<SVGPaintServerSolid> create() { return adoptRef(new SVGPaintServerSolid); }
    39         virtual ~SVGPaintServerSolid();
     36class SVGPaintServerSolid : public SVGPaintServer {
     37public:
     38    static PassRefPtr<SVGPaintServerSolid> create() { return adoptRef(new SVGPaintServerSolid); }
     39    virtual ~SVGPaintServerSolid();
    4040
    41         virtual SVGPaintServerType type() const { return SolidPaintServer; }
     41    virtual SVGPaintServerType type() const { return SolidPaintServer; }
    4242
    43         Color color() const;
    44         void setColor(const Color&);
     43    Color color() const;
     44    void setColor(const Color&);
    4545
    46         virtual TextStream& externalRepresentation(TextStream&) const;
     46    virtual TextStream& externalRepresentation(TextStream&) const;
    4747
    48         virtual bool setup(GraphicsContext*&, const RenderObject*, const RenderStyle*, SVGPaintTargetType, bool isPaintingText) const;
     48    virtual bool setup(GraphicsContext*&, const RenderObject*, const RenderStyle*, SVGPaintTargetType, bool isPaintingText) const;
    4949
    50     private:
    51         SVGPaintServerSolid();
     50private:
     51    SVGPaintServerSolid();
    5252
    53         Color m_color;
    54     };
     53    Color m_color;
     54};
    5555
    5656} // namespace WebCore
    … …  
    5858#endif
    5959
    60 #endif // SVGPaintServerSolid_h
     60#endif // RenderSVGResourceSolidColor_h

  • trunk/WebCore/rendering/SVGRenderTreeAsText.cpp

    r57886 r58093  
    4343#include "RenderSVGResourceClipper.h"
    4444#include "RenderSVGResourceFilter.h"
     45#include "RenderSVGResourceGradient.h"
    4546#include "RenderSVGResourceMarker.h"
    4647#include "RenderSVGResourceMasker.h"
     48#include "RenderSVGResourcePattern.h"
     49#include "RenderSVGResourceSolidColor.h"
    4750#include "RenderSVGRoot.h"
    4851#include "RenderSVGText.h"
    … …  
    5053#include "SVGCharacterLayoutInfo.h"
    5154#include "SVGInlineTextBox.h"
    52 #include "SVGPaintServerGradient.h"
    53 #include "SVGPaintServerPattern.h"
    54 #include "SVGPaintServerSolid.h"
    5555#include "SVGRootInlineBox.h"
    5656#include "SVGStyledElement.h"

  • trunk/WebCore/svg/SVGFont.cpp

    r55949 r58093  
    2828#include "GraphicsContext.h"
    2929#include "RenderObject.h"
     30#include "RenderSVGResourceSolidColor.h"
    3031#include "SimpleFontData.h"
    3132#include "SVGAltGlyphElement.h"
    … …  
    3637#include "SVGFontFaceElement.h"
    3738#include "SVGMissingGlyphElement.h"
    38 #include "SVGPaintServer.h"
    39 #include "SVGPaintServerSolid.h"
    4039#include "XMLNames.h"
    4140

  • trunk/WebCore/svg/SVGGradientElement.cpp

    r53879 r58093  
    2828#include "RenderPath.h"
    2929#include "RenderSVGHiddenContainer.h"
     30#include "RenderSVGResourceLinearGradient.h"
     31#include "RenderSVGResourceRadialGradient.h"
    3032#include "SVGNames.h"
    31 #include "SVGPaintServerLinearGradient.h"
    32 #include "SVGPaintServerRadialGradient.h"
    3333#include "SVGStopElement.h"
    3434#include "SVGTransformList.h"

  • trunk/WebCore/svg/SVGGradientElement.h

    r53879 r58093  
    2424#if ENABLE(SVG)
    2525#include "RenderObject.h"
    26 #include "SVGPaintServerGradient.h"
     26#include "RenderSVGResourceGradient.h"
    2727#include "SVGExternalResourcesRequired.h"
    2828#include "SVGStyledElement.h"

  • trunk/WebCore/svg/SVGLinearGradientElement.cpp

    r53879 r58093  
    3030#include "LinearGradientAttributes.h"
    3131#include "MappedAttribute.h"
     32#include "RenderSVGResourceLinearGradient.h"
    3233#include "SVGLength.h"
    3334#include "SVGNames.h"
    34 #include "SVGPaintServerLinearGradient.h"
    3535#include "SVGTransform.h"
    3636#include "SVGTransformList.h"

  • trunk/WebCore/svg/SVGPatternElement.cpp

    r54560 r58093  
    3232#include "PatternAttributes.h"
    3333#include "RenderSVGContainer.h"
     34#include "RenderSVGResourcePattern.h"
    3435#include "SVGLength.h"
    3536#include "SVGNames.h"
    36 #include "SVGPaintServerPattern.h"
    3737#include "SVGRenderSupport.h"
    3838#include "SVGSVGElement.h"

  • trunk/WebCore/svg/SVGPatternElement.h

    r53879 r58093  
    2424#if ENABLE(SVG)
    2525#include "RenderObject.h"
     26#include "RenderSVGResourcePattern.h"
    2627#include "SVGExternalResourcesRequired.h"
    2728#include "SVGFitToViewBox.h"
    2829#include "SVGLangSpace.h"
    29 #include "SVGPaintServerPattern.h"
    3030#include "SVGStyledElement.h"
    3131#include "SVGTests.h"

  • trunk/WebCore/svg/SVGRadialGradientElement.cpp

    r53879 r58093  
    3131#include "RadialGradientAttributes.h"
    3232#include "RenderObject.h"
     33#include "RenderSVGResourceRadialGradient.h"
    3334#include "SVGLength.h"
    3435#include "SVGNames.h"
    35 #include "SVGPaintServerRadialGradient.h"
    3636#include "SVGStopElement.h"
    3737#include "SVGTransform.h"
Note: See TracChangeset for help on using the changeset viewer.