Changeset 152299 in webkit


Ignore:
Timestamp:
Jul 2, 2013 10:37:32 AM (11 years ago)
Author:
Christophe Dumez
Message:

Remove SVGStyledLocatableElement class
​https://bugs.webkit.org/show_bug.cgi?id=118283

Reviewed by Dirk Schulze.

Remove SVGStyledLocatableElement class and have SVGGraphicsElement
inherit SVGStyledElement directly instead. SVGStyledLocatableElement
is no longer needed and according to the specification, SVGGraphicsElement
should inherit SVGStyledElement (actually SVGElement once we merge
SVGStyledElement into SVGElement).

No new tests, no behavior change.

  • CMakeLists.txt:
  • GNUmakefile.list.am:
  • Target.pri:
  • WebCore.order:
  • WebCore.vcxproj/WebCore.vcxproj:
  • WebCore.vcxproj/WebCore.vcxproj.filters:
  • WebCore.xcodeproj/project.pbxproj:
  • bindings/scripts/CodeGeneratorJS.pm:

(GetGnuVTableOffsetForType):

  • svg/SVGAllInOne.cpp:
  • svg/SVGElement.cpp:

(WebCore::SVGElement::getBoundingBox):

  • svg/SVGElement.h:
  • svg/SVGGraphicsElement.cpp:

(WebCore::SVGGraphicsElement::SVGGraphicsElement):
(WebCore::SVGGraphicsElement::parseAttribute):
(WebCore::SVGGraphicsElement::svgAttributeChanged):

  • svg/SVGGraphicsElement.h:
  • svg/SVGLocatable.cpp:

(WebCore::SVGLocatable::getTransformToElement):

  • svg/SVGStyledElement.cpp:

(WebCore::SVGStyledElement::localCoordinateSpaceTransform):

  • svg/SVGStyledLocatableElement.cpp: Removed.
  • svg/SVGStyledLocatableElement.h: Removed.
Location:
trunk/Source/WebCore
Files:
2 deleted
16 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/CMakeLists.txt

    r152235 r152299  
    24642464    svg/SVGStyleElement.cpp
    24652465    svg/SVGStyledElement.cpp
    2466     svg/SVGStyledLocatableElement.cpp
    24672466    svg/SVGSwitchElement.cpp
    24682467    svg/SVGSymbolElement.cpp

  • trunk/Source/WebCore/ChangeLog

    r152297 r152299  
     12013-07-02  Christophe Dumez  <ch.dumez@sisa.samsung.com>
     2
     3        Remove SVGStyledLocatableElement class
     4        https://bugs.webkit.org/show_bug.cgi?id=118283
     5
     6        Reviewed by Dirk Schulze.
     7
     8        Remove SVGStyledLocatableElement class and have SVGGraphicsElement
     9        inherit SVGStyledElement directly instead. SVGStyledLocatableElement
     10        is no longer needed and according to the specification, SVGGraphicsElement
     11        should inherit SVGStyledElement (actually SVGElement once we merge
     12        SVGStyledElement into SVGElement).
     13
     14        No new tests, no behavior change.
     15
     16        * CMakeLists.txt:
     17        * GNUmakefile.list.am:
     18        * Target.pri:
     19        * WebCore.order:
     20        * WebCore.vcxproj/WebCore.vcxproj:
     21        * WebCore.vcxproj/WebCore.vcxproj.filters:
     22        * WebCore.xcodeproj/project.pbxproj:
     23        * bindings/scripts/CodeGeneratorJS.pm:
     24        (GetGnuVTableOffsetForType):
     25        * svg/SVGAllInOne.cpp:
     26        * svg/SVGElement.cpp:
     27        (WebCore::SVGElement::getBoundingBox):
     28        * svg/SVGElement.h:
     29        * svg/SVGGraphicsElement.cpp:
     30        (WebCore::SVGGraphicsElement::SVGGraphicsElement):
     31        (WebCore::SVGGraphicsElement::parseAttribute):
     32        (WebCore::SVGGraphicsElement::svgAttributeChanged):
     33        * svg/SVGGraphicsElement.h:
     34        * svg/SVGLocatable.cpp:
     35        (WebCore::SVGLocatable::getTransformToElement):
     36        * svg/SVGStyledElement.cpp:
     37        (WebCore::SVGStyledElement::localCoordinateSpaceTransform):
     38        * svg/SVGStyledLocatableElement.cpp: Removed.
     39        * svg/SVGStyledLocatableElement.h: Removed.
     40
    1412013-07-02  peavo@outlook.com  <peavo@outlook.com>
    242

  • trunk/Source/WebCore/GNUmakefile.list.am

    r152275 r152299  
    53015301        Source/WebCore/svg/SVGStyledElement.cpp \
    53025302        Source/WebCore/svg/SVGStyledElement.h \
    5303         Source/WebCore/svg/SVGStyledLocatableElement.cpp \
    5304         Source/WebCore/svg/SVGStyledLocatableElement.h \
    53055303        Source/WebCore/svg/SVGSVGElement.cpp \
    53065304        Source/WebCore/svg/SVGSVGElement.h \

  • trunk/Source/WebCore/Target.pri

    r152282 r152299  
    27822782    svg/SVGStyleElement.h \
    27832783    svg/SVGStyledElement.h \
    2784     svg/SVGStyledLocatableElement.h \
    27852784    svg/SVGSVGElement.h \
    27862785    svg/SVGSwitchElement.h \
    … …  
    38443843        svg/SVGStyleElement.cpp \
    38453844        svg/SVGStyledElement.cpp \
    3846         svg/SVGStyledLocatableElement.cpp \
    38473845        svg/SVGSwitchElement.cpp \
    38483846        svg/SVGSymbolElement.cpp \

  • trunk/Source/WebCore/WebCore.order

    r152167 r152299  
    1000910009__ZN7WebCore13SVGSVGElement6createERKNS_13QualifiedNameEPNS_8DocumentE
    1001010010__ZN7WebCore13SVGSVGElementC1ERKNS_13QualifiedNameEPNS_8DocumentE
    10011 __ZN7WebCore25SVGStyledLocatableElementC2ERKNS_13QualifiedNameEPNS_8DocumentE
    1001210011__ZN7WebCore16SVGStyledElementC2ERKNS_13QualifiedNameEPNS_8DocumentE
    1001310012__ZN7WebCore10SVGElementC2ERKNS_13QualifiedNameEPNS_8DocumentE
    … …  
    1002210021__ZN7WebCore16SVGStyledElement32cssPropertyIdForSVGAttributeNameERKNS_13QualifiedNameE
    1002310022__ZN7WebCore13SVGSVGElement20parseMappedAttributeEPNS_9AttributeE
    10024 __ZNK7WebCore25SVGStyledLocatableElement22nearestViewportElementEv
    1002510023__ZN7WebCore12SVGLocatable22nearestViewportElementEPKNS_10SVGElementE
    1002610024__ZN7WebCore8SVGTests20parseMappedAttributeEPNS_9AttributeE
    … …  
    1144011438__ZN3JSC21getStaticPropertySlotIN7WebCore24JSSVGSVGElementPrototypeENS_8JSObjectEEEbPNS_9ExecStateEPKNS_9HashTableEPT_RKNS_10IdentifierERNS_12PropertySlotE
    1144111439__ZNK7WebCore10SVGElement11boundingBoxERNS_9FloatRectENS_12SVGLocatable19StyleUpdateStrategyE
    11442 __ZNK7WebCore25SVGStyledLocatableElement17isStyledLocatableEv
    11443 __ZNK7WebCore25SVGStyledLocatableElement7getBBoxENS_12SVGLocatable19StyleUpdateStrategyE
    1144411440__ZN7WebCore12SVGLocatable7getBBoxEPKNS_10SVGElementENS0_19StyleUpdateStrategyE
    1144511441__ZNK7WebCore13RenderSVGRoot17objectBoundingBoxEv
    … …  
    3004530041__ZN7WebCore24jsSVGSVGElementClassNameEPN3JSC9ExecStateENS0_7JSValueERKNS0_10IdentifierE
    3004630042__ZN7WebCore38jsSVGSVGElementFarthestViewportElementEPN3JSC9ExecStateENS0_7JSValueERKNS0_10IdentifierE
    30047 __ZNK7WebCore25SVGStyledLocatableElement23farthestViewportElementEv
    3004830043__ZN7WebCore39jsSVGSVGElementScreenPixelToMillimeterYEPN3JSC9ExecStateENS0_7JSValueERKNS0_10IdentifierE
    3004930044__ZNK7WebCore13SVGSVGElement24screenPixelToMillimeterYEv
    … …  
    3009030085__ZNK7WebCore29SVGGraphicsElement12getScreenCTMENS_12SVGLocatable19StyleUpdateStrategyE
    3009130086__ZN7WebCore44jsSVGSVGElementPrototypeFunctionGetScreenCTMEPN3JSC9ExecStateE
    30092 __ZNK7WebCore25SVGStyledLocatableElement12getScreenCTMENS_12SVGLocatable19StyleUpdateStrategyE
    3009330087__ZN7WebCoreL28createSVGGlyphElementWrapperEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEN3WTF10PassRefPtrINS_10SVGElementEEE
    3009430088__ZN7WebCore13createWrapperINS_17JSSVGGlyphElementENS_15SVGGlyphElementEEEPNS_12JSDOMWrapperEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPT0_
    … …  
    3021830212__ZNK7WebCore13SVGSVGElement14getElementByIdERKN3WTF12AtomicStringE
    3021930213__ZN7WebCore38jsSVGSVGElementPrototypeFunctionGetCTMEPN3JSC9ExecStateE
    30220 __ZNK7WebCore25SVGStyledLocatableElement6getCTMENS_12SVGLocatable19StyleUpdateStrategyE
    3022130214__ZN7WebCore36jsSVGGElementPrototypeFunctionGetCTMEPN3JSC9ExecStateE
    3022230215__ZN7WebCore42jsSVGGElementPrototypeFunctionGetScreenCTMEPN3JSC9ExecStateE
    … …  
    3078430777__ZNK7WebCore15RenderSVGInline19mapLocalToContainerEPNS_20RenderBoxModelObjectEbbRNS_14TransformStateE
    3078530778__ZN7WebCore53jsSVGSVGElementPrototypeFunctionGetTransformToElementEPN3JSC9ExecStateE
    30786 __ZTv0_n56_NK7WebCore25SVGStyledLocatableElement6getCTMENS_12SVGLocatable19StyleUpdateStrategyE
    3078730779__ZNK7WebCore4Font32selectionRectForTextUsingSVGFontERKNS_7TextRunERKNS_10FloatPointEiii
    3078830780__ZNK7WebCore13RenderSVGText14firstLineBlockEv
    … …  
    3552235514__ZTTN7WebCore11SVGAElementE
    3552335515__ZTCN7WebCore11SVGAElementE0_NS_29SVGGraphicsElementE
    35524 __ZTCN7WebCore11SVGAElementE0_NS_25SVGStyledLocatableElementE
    3552535516__ZTCN7WebCore11SVGAElementE144_NS_16SVGTransformableE
    3552635517__ZTVN7WebCore18SVGAltGlyphElementE
    … …  
    3555135542__ZTTN7WebCore16SVGCircleElementE
    3555235543__ZTCN7WebCore16SVGCircleElementE0_NS_29SVGGraphicsElementE
    35553 __ZTCN7WebCore16SVGCircleElementE0_NS_25SVGStyledLocatableElementE
    3555435544__ZTCN7WebCore16SVGCircleElementE144_NS_16SVGTransformableE
    3555535545__ZTVN7WebCore18SVGClipPathElementE
    3555635546__ZTTN7WebCore18SVGClipPathElementE
    3555735547__ZTCN7WebCore18SVGClipPathElementE0_NS_29SVGGraphicsElementE
    35558 __ZTCN7WebCore18SVGClipPathElementE0_NS_25SVGStyledLocatableElementE
    3555935548__ZTCN7WebCore18SVGClipPathElementE144_NS_16SVGTransformableE
    3556035549__ZTVN7WebCore35SVGComponentTransferFunctionElementE
    … …  
    3556335552__ZTTN7WebCore14SVGDefsElementE
    3556435553__ZTCN7WebCore14SVGDefsElementE0_NS_29SVGGraphicsElementE
    35565 __ZTCN7WebCore14SVGDefsElementE0_NS_25SVGStyledLocatableElementE
    3556635554__ZTCN7WebCore14SVGDefsElementE144_NS_16SVGTransformableE
    3556735555__ZTVN7WebCore11SVGDocumentE
    … …  
    3557235560__ZTTN7WebCore17SVGEllipseElementE
    3557335561__ZTCN7WebCore17SVGEllipseElementE0_NS_29SVGGraphicsElementE
    35574 __ZTCN7WebCore17SVGEllipseElementE0_NS_25SVGStyledLocatableElementE
    3557535562__ZTCN7WebCore17SVGEllipseElementE144_NS_16SVGTransformableE
    3557635563__ZN7WebCoreL13svgExceptionsE
    … …  
    3560935596__ZTTN7WebCore23SVGForeignObjectElementE
    3561035597__ZTCN7WebCore23SVGForeignObjectElementE0_NS_29SVGGraphicsElementE
    35611 __ZTCN7WebCore23SVGForeignObjectElementE0_NS_25SVGStyledLocatableElementE
    3561235598__ZTCN7WebCore23SVGForeignObjectElementE144_NS_16SVGTransformableE
    3561335599__ZTVN7WebCore11SVGGElementE
    3561435600__ZTTN7WebCore11SVGGElementE
    3561535601__ZTCN7WebCore11SVGGElementE0_NS_29SVGGraphicsElementE
    35616 __ZTCN7WebCore11SVGGElementE0_NS_25SVGStyledLocatableElementE
    3561735602__ZTCN7WebCore11SVGGElementE144_NS_16SVGTransformableE
    3561835603__ZTVN7WebCore15SVGGlyphElementE
    … …  
    3562435609__ZTTN7WebCore15SVGImageElementE
    3562535610__ZTCN7WebCore15SVGImageElementE0_NS_29SVGGraphicsElementE
    35626 __ZTCN7WebCore15SVGImageElementE0_NS_25SVGStyledLocatableElementE
    3562735611__ZTCN7WebCore15SVGImageElementE144_NS_16SVGTransformableE
    3562835612__ZTVN7WebCore14SVGImageLoaderE
    … …  
    3563135615__ZTTN7WebCore14SVGLineElementE
    3563235616__ZTCN7WebCore14SVGLineElementE0_NS_29SVGGraphicsElementE
    35633 __ZTCN7WebCore14SVGLineElementE0_NS_25SVGStyledLocatableElementE
    3563435617__ZTCN7WebCore14SVGLineElementE144_NS_16SVGTransformableE
    3563535618__ZTVN7WebCore16SVGMarkerElementE
    … …  
    3564235625__ZTTN7WebCore14SVGPathElementE
    3564335626__ZTCN7WebCore14SVGPathElementE0_NS_29SVGGraphicsElementE
    35644 __ZTCN7WebCore14SVGPathElementE0_NS_25SVGStyledLocatableElementE
    3564535627__ZTCN7WebCore14SVGPathElementE144_NS_16SVGTransformableE
    3564635628__ZTVN7WebCore21SVGPathSegListBuilderE
    … …  
    3565435636__ZTTN7WebCore14SVGPolyElementE
    3565535637__ZTCN7WebCore14SVGPolyElementE0_NS_29SVGGraphicsElementE
    35656 __ZTCN7WebCore14SVGPolyElementE0_NS_25SVGStyledLocatableElementE
    3565735638__ZTCN7WebCore14SVGPolyElementE144_NS_16SVGTransformableE
    3565835639__ZTVN7WebCore24SVGRadialGradientElementE
    … …  
    3566035641__ZTTN7WebCore14SVGRectElementE
    3566135642__ZTCN7WebCore14SVGRectElementE0_NS_29SVGGraphicsElementE
    35662 __ZTCN7WebCore14SVGRectElementE0_NS_25SVGStyledLocatableElementE
    3566335643__ZTCN7WebCore14SVGRectElementE144_NS_16SVGTransformableE
    3566435644__ZTVN7WebCore16SVGScriptElementE
    … …  
    3566835648__ZTVN7WebCore14SVGStopElementE
    3566935649__ZTVN7WebCore16SVGStyledElementE
    35670 __ZTVN7WebCore25SVGStyledLocatableElementE
    3567135650__ZTVN7WebCore29SVGGraphicsElementE
    3567235651__ZTTN7WebCore29SVGGraphicsElementE
    35673 __ZTCN7WebCore29SVGGraphicsElementE0_NS_25SVGStyledLocatableElementE
    3567435652__ZTCN7WebCore29SVGGraphicsElementE144_NS_16SVGTransformableE
    3567535653__ZTVN7WebCore15SVGStyleElementE
    3567635654__ZTVN7WebCore13SVGSVGElementE
    3567735655__ZTTN7WebCore13SVGSVGElementE
    35678 __ZTCN7WebCore13SVGSVGElementE0_NS_25SVGStyledLocatableElementE
    3567935656__ZTVN7WebCore16SVGSwitchElementE
    3568035657__ZTTN7WebCore16SVGSwitchElementE
    3568135658__ZTCN7WebCore16SVGSwitchElementE0_NS_29SVGGraphicsElementE
    35682 __ZTCN7WebCore16SVGSwitchElementE0_NS_25SVGStyledLocatableElementE
    3568335659__ZTCN7WebCore16SVGSwitchElementE144_NS_16SVGTransformableE
    3568435660__ZTVN7WebCore16SVGSymbolElementE
    … …  
    3569635672__ZTTN7WebCore13SVGUseElementE
    3569735673__ZTCN7WebCore13SVGUseElementE0_NS_29SVGGraphicsElementE
    35698 __ZTCN7WebCore13SVGUseElementE0_NS_25SVGStyledLocatableElementE
    3569935674__ZTCN7WebCore13SVGUseElementE144_NS_16SVGTransformableE
    3570035675__ZTVN7WebCore14SVGViewElementE
    … …  
    3835838333__ZTCN7WebCore17SVGPolygonElementE0_NS_14SVGPolyElementE
    3835938334__ZTCN7WebCore17SVGPolygonElementE0_NS_29SVGGraphicsElementE
    38360 __ZTCN7WebCore17SVGPolygonElementE0_NS_25SVGStyledLocatableElementE
    3836138335__ZTCN7WebCore17SVGPolygonElementE144_NS_16SVGTransformableE
    3836238336__ZTVN7WebCore18SVGPolylineElementE
    … …  
    3836438338__ZTCN7WebCore18SVGPolylineElementE0_NS_14SVGPolyElementE
    3836538339__ZTCN7WebCore18SVGPolylineElementE0_NS_29SVGGraphicsElementE
    38366 __ZTCN7WebCore18SVGPolylineElementE0_NS_25SVGStyledLocatableElementE
    3836738340__ZTCN7WebCore18SVGPolylineElementE144_NS_16SVGTransformableE
    3836838341__ZTVN7WebCore5TimerINS_10SVGElementEEE

  • trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj

    r152235 r152299  
    1346313463    <ClInclude Include="..\svg\SVGStringList.h" />
    1346413464    <ClInclude Include="..\svg\SVGStyledElement.h" />
    13465     <ClInclude Include="..\svg\SVGStyledLocatableElement.h" />
    1346613465    <ClInclude Include="..\svg\SVGGraphicsElement.h" />
    1346713466    <ClInclude Include="..\svg\SVGStyleElement.h" />

  • trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters

    r152235 r152299  
    1212412124      <Filter>rendering\svg</Filter>
    1212512125    </ClInclude>
    12126     <ClInclude Include="..\svg\SVGStyledLocatableElement.h">
    12127       <Filter>rendering\svg</Filter>
    12128     </ClInclude>
    1212912126    <ClInclude Include="..\svg\SVGGraphicsElement.h">
    1213012127      <Filter>rendering\svg</Filter>

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

    r152235 r152299  
    40884088                B2227AAB0D00BF220071B782 /* SVGStringList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B22279150D00BF210071B782 /* SVGStringList.cpp */; };
    40894089                B2227AAC0D00BF220071B782 /* SVGStringList.h in Headers */ = {isa = PBXBuildFile; fileRef = B22279160D00BF210071B782 /* SVGStringList.h */; };
    4090                 B2227AB30D00BF220071B782 /* SVGStyledLocatableElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B222791D0D00BF210071B782 /* SVGStyledLocatableElement.cpp */; };
    4091                 B2227AB40D00BF220071B782 /* SVGStyledLocatableElement.h in Headers */ = {isa = PBXBuildFile; fileRef = B222791E0D00BF210071B782 /* SVGStyledLocatableElement.h */; };
    40924090                B2227AB50D00BF220071B782 /* SVGGraphicsElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B222791F0D00BF210071B782 /* SVGGraphicsElement.cpp */; };
    40934091                B2227AB60D00BF220071B782 /* SVGGraphicsElement.h in Headers */ = {isa = PBXBuildFile; fileRef = B22279200D00BF210071B782 /* SVGGraphicsElement.h */; };
    … …  
    1072910727                B22279160D00BF210071B782 /* SVGStringList.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SVGStringList.h; sourceTree = "<group>"; };
    1073010728                B22279170D00BF210071B782 /* SVGStringList.idl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = SVGStringList.idl; sourceTree = "<group>"; };
    10731                 B222791D0D00BF210071B782 /* SVGStyledLocatableElement.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SVGStyledLocatableElement.cpp; sourceTree = "<group>"; };
    10732                 B222791E0D00BF210071B782 /* SVGStyledLocatableElement.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SVGStyledLocatableElement.h; sourceTree = "<group>"; };
    1073310729                B222791F0D00BF210071B782 /* SVGGraphicsElement.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SVGGraphicsElement.cpp; sourceTree = "<group>"; };
    1073410730                B22279200D00BF210071B782 /* SVGGraphicsElement.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SVGGraphicsElement.h; sourceTree = "<group>"; };
    … …  
    1813818134                                B22279220D00BF210071B783 /* SVGStyledElement.h */,
    1813918135                                B22279230D00BF210071B783 /* SVGStyledElement.idl */,
    18140                                 B222791D0D00BF210071B782 /* SVGStyledLocatableElement.cpp */,
    18141                                 B222791E0D00BF210071B782 /* SVGStyledLocatableElement.h */,
    1814218136                                B222791F0D00BF210071B782 /* SVGGraphicsElement.cpp */,
    1814318137                                B22279200D00BF210071B782 /* SVGGraphicsElement.h */,
    … …  
    2368423678                                B2227AAC0D00BF220071B782 /* SVGStringList.h in Headers */,
    2368523679                                B2227AB80D00BF220071B783 /* SVGStyledElement.h in Headers */,
    23686                                 B2227AB40D00BF220071B782 /* SVGStyledLocatableElement.h in Headers */,
    2368723680                                B2227AB60D00BF220071B782 /* SVGGraphicsElement.h in Headers */,
    2368823681                                B2227AB80D00BF220071B782 /* SVGStyleElement.h in Headers */,
    … …  
    2671426707                                B2227AAB0D00BF220071B782 /* SVGStringList.cpp in Sources */,
    2671526708                                B2227AB70D00BF220071B783 /* SVGStyledElement.cpp in Sources */,
    26716                                 B2227AB30D00BF220071B782 /* SVGStyledLocatableElement.cpp in Sources */,
    2671726709                                B2227AB50D00BF220071B782 /* SVGGraphicsElement.cpp in Sources */,
    2671826710                                B2227AB70D00BF220071B782 /* SVGStyleElement.cpp in Sources */,

  • trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm

    r152168 r152299  
    15021502        || $typename eq "SVGRectElement"
    15031503        || $typename eq "SVGSVGElement"
    1504         || $typename eq "SVGStyledLocatableElement"
    15051504        || $typename eq "SVGGraphicsElement"
    15061505        || $typename eq "SVGSwitchElement"

  • trunk/Source/WebCore/svg/SVGAllInOne.cpp

    r152167 r152299  
    158158#include "SVGStyleElement.cpp"
    159159#include "SVGStyledElement.cpp"
    160 #include "SVGStyledLocatableElement.cpp"
    161160#include "SVGSwitchElement.cpp"
    162161#include "SVGSymbolElement.cpp"

  • trunk/Source/WebCore/svg/SVGElement.cpp

    r152156 r152299  
    3838#include "SVGElementInstance.h"
    3939#include "SVGElementRareData.h"
     40#include "SVGGraphicsElement.h"
    4041#include "SVGNames.h"
    4142#include "SVGSVGElement.h"
    42 #include "SVGStyledLocatableElement.h"
    4343#include "SVGTextElement.h"
    4444#include "ScriptEventListener.h"
    … …  
    256256bool SVGElement::getBoundingBox(FloatRect& rect, SVGLocatable::StyleUpdateStrategy styleUpdateStrategy)
    257257{
    258     if (isStyledLocatable()) {
    259         rect = toSVGStyledLocatableElement(this)->getBBox(styleUpdateStrategy);
     258    if (isSVGGraphicsElement()) {
     259        rect = toSVGGraphicsElement(this)->getBBox(styleUpdateStrategy);
    260260        return true;
    261261    }

  • trunk/Source/WebCore/svg/SVGElement.h

    r152167 r152299  
    6161    virtual bool isSVGStyledElement() const { return false; }
    6262    virtual bool isSVGGraphicsElement() const { return false; }
    63     virtual bool isStyledLocatable() const { return false; }
    6463    virtual bool isSVGSVGElement() const { return false; }
    6564    virtual bool isFilterEffect() const { return false; }

  • trunk/Source/WebCore/svg/SVGGraphicsElement.cpp

    r152167 r152299  
    3939BEGIN_REGISTER_ANIMATED_PROPERTIES(SVGGraphicsElement)
    4040    REGISTER_LOCAL_ANIMATED_PROPERTY(transform)
    41     REGISTER_PARENT_ANIMATED_PROPERTIES(SVGStyledLocatableElement)
     41    REGISTER_PARENT_ANIMATED_PROPERTIES(SVGStyledElement)
    4242    REGISTER_PARENT_ANIMATED_PROPERTIES(SVGTests)
    4343END_REGISTER_ANIMATED_PROPERTIES
    4444
    4545SVGGraphicsElement::SVGGraphicsElement(const QualifiedName& tagName, Document* document, ConstructionType constructionType)
    46     : SVGStyledLocatableElement(tagName, document, constructionType)
     46    : SVGStyledElement(tagName, document, constructionType)
    4747{
    4848    registerAnimatedPropertiesForSVGGraphicsElement();
    … …  
    103103{
    104104    if (!isSupportedAttribute(name)) {
    105         SVGStyledLocatableElement::parseAttribute(name, value);
     105        SVGStyledElement::parseAttribute(name, value);
    106106        return;
    107107    }
    … …  
    121121{
    122122    if (!isSupportedAttribute(attrName)) {
    123         SVGStyledLocatableElement::svgAttributeChanged(attrName);
     123        SVGStyledElement::svgAttributeChanged(attrName);
    124124        return;
    125125    }

  • trunk/Source/WebCore/svg/SVGGraphicsElement.h

    r152167 r152299  
    2424#if ENABLE(SVG)
    2525#include "SVGAnimatedTransformList.h"
    26 #include "SVGStyledLocatableElement.h"
     26#include "SVGStyledElement.h"
    2727#include "SVGTests.h"
    2828#include "SVGTransformable.h"
    … …  
    3333class Path;
    3434
    35 class SVGGraphicsElement : public SVGStyledLocatableElement, public SVGTransformable, public SVGTests {
     35class SVGGraphicsElement : public SVGStyledElement, public SVGTransformable, public SVGTests {
    3636public:
    3737    virtual ~SVGGraphicsElement();

  • trunk/Source/WebCore/svg/SVGLocatable.cpp

    r145598 r152299  
    2828#include "RenderObject.h"
    2929#include "SVGException.h"
     30#include "SVGGraphicsElement.h"
    3031#include "SVGNames.h"
    31 #include "SVGStyledLocatableElement.h"
    3232
    3333namespace WebCore {
    … …  
    104104    AffineTransform ctm = getCTM(styleUpdateStrategy);
    105105
    106     if (target && target->isStyledLocatable()) {
    107         AffineTransform targetCTM = toSVGStyledLocatableElement(target)->getCTM(styleUpdateStrategy);
     106    if (target && target->isSVGGraphicsElement()) {
     107        AffineTransform targetCTM = toSVGGraphicsElement(target)->getCTM(styleUpdateStrategy);
    108108        if (!targetCTM.isInvertible()) {
    109109            ec = SVGException::SVG_MATRIX_NOT_INVERTABLE;

  • trunk/Source/WebCore/svg/SVGStyledElement.cpp

    r152167 r152299  
    427427AffineTransform SVGStyledElement::localCoordinateSpaceTransform(SVGLocatable::CTMScope) const
    428428{
    429     // To be overriden by SVGStyledLocatableElement/SVGGraphicsElement (or as special case SVGTextElement and SVGPatternElement)
     429    // To be overriden by SVGGraphicsElement (or as special case SVGTextElement and SVGPatternElement)
    430430    return AffineTransform();
    431431}
Note: See TracChangeset for help on using the changeset viewer.