Diff
Modified: trunk/Source/WebCore/CMakeLists.txt (152298 => 152299)
--- trunk/Source/WebCore/CMakeLists.txt 2013-07-02 16:50:49 UTC (rev 152298)
+++ trunk/Source/WebCore/CMakeLists.txt 2013-07-02 17:37:32 UTC (rev 152299)
@@ -2463,7 +2463,6 @@
svg/SVGStringList.cpp
svg/SVGStyleElement.cpp
svg/SVGStyledElement.cpp
- svg/SVGStyledLocatableElement.cpp
svg/SVGSwitchElement.cpp
svg/SVGSymbolElement.cpp
svg/SVGTRefElement.cpp
Modified: trunk/Source/WebCore/ChangeLog (152298 => 152299)
--- trunk/Source/WebCore/ChangeLog 2013-07-02 16:50:49 UTC (rev 152298)
+++ trunk/Source/WebCore/ChangeLog 2013-07-02 17:37:32 UTC (rev 152299)
@@ -1,3 +1,43 @@
+2013-07-02 Christophe Dumez <[email protected]>
+
+ 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.
+
2013-07-02 [email protected] <[email protected]>
[Curl] Crash after download.
Modified: trunk/Source/WebCore/GNUmakefile.list.am (152298 => 152299)
--- trunk/Source/WebCore/GNUmakefile.list.am 2013-07-02 16:50:49 UTC (rev 152298)
+++ trunk/Source/WebCore/GNUmakefile.list.am 2013-07-02 17:37:32 UTC (rev 152299)
@@ -5300,8 +5300,6 @@
Source/WebCore/svg/SVGStyleElement.h \
Source/WebCore/svg/SVGStyledElement.cpp \
Source/WebCore/svg/SVGStyledElement.h \
- Source/WebCore/svg/SVGStyledLocatableElement.cpp \
- Source/WebCore/svg/SVGStyledLocatableElement.h \
Source/WebCore/svg/SVGSVGElement.cpp \
Source/WebCore/svg/SVGSVGElement.h \
Source/WebCore/svg/SVGSwitchElement.cpp \
Modified: trunk/Source/WebCore/Target.pri (152298 => 152299)
--- trunk/Source/WebCore/Target.pri 2013-07-02 16:50:49 UTC (rev 152298)
+++ trunk/Source/WebCore/Target.pri 2013-07-02 17:37:32 UTC (rev 152299)
@@ -2781,7 +2781,6 @@
svg/SVGStringList.h \
svg/SVGStyleElement.h \
svg/SVGStyledElement.h \
- svg/SVGStyledLocatableElement.h \
svg/SVGSVGElement.h \
svg/SVGSwitchElement.h \
svg/SVGSymbolElement.h \
@@ -3843,7 +3842,6 @@
svg/SVGStringList.cpp \
svg/SVGStyleElement.cpp \
svg/SVGStyledElement.cpp \
- svg/SVGStyledLocatableElement.cpp \
svg/SVGSwitchElement.cpp \
svg/SVGSymbolElement.cpp \
svg/SVGTRefElement.cpp \
Modified: trunk/Source/WebCore/WebCore.order (152298 => 152299)
--- trunk/Source/WebCore/WebCore.order 2013-07-02 16:50:49 UTC (rev 152298)
+++ trunk/Source/WebCore/WebCore.order 2013-07-02 17:37:32 UTC (rev 152299)
@@ -10008,7 +10008,6 @@
__ZN7WebCoreL14svgConstructorERKNS_13QualifiedNameEPNS_8DocumentEb
__ZN7WebCore13SVGSVGElement6createERKNS_13QualifiedNameEPNS_8DocumentE
__ZN7WebCore13SVGSVGElementC1ERKNS_13QualifiedNameEPNS_8DocumentE
-__ZN7WebCore25SVGStyledLocatableElementC2ERKNS_13QualifiedNameEPNS_8DocumentE
__ZN7WebCore16SVGStyledElementC2ERKNS_13QualifiedNameEPNS_8DocumentE
__ZN7WebCore10SVGElementC2ERKNS_13QualifiedNameEPNS_8DocumentE
__ZN7WebCore8SVGTestsC2Ev
@@ -10021,7 +10020,6 @@
__ZNK7WebCore16SVGStyledElement10mapToEntryERKNS_13QualifiedNameERNS_20MappedAttributeEntryE
__ZN7WebCore16SVGStyledElement32cssPropertyIdForSVGAttributeNameERKNS_13QualifiedNameE
__ZN7WebCore13SVGSVGElement20parseMappedAttributeEPNS_9AttributeE
-__ZNK7WebCore25SVGStyledLocatableElement22nearestViewportElementEv
__ZN7WebCore12SVGLocatable22nearestViewportElementEPKNS_10SVGElementE
__ZN7WebCore8SVGTests20parseMappedAttributeEPNS_9AttributeE
__ZN7WebCore12SVGLangSpace20parseMappedAttributeEPNS_9AttributeE
@@ -11439,8 +11437,6 @@
__ZN7WebCore24JSSVGSVGElementPrototype18getOwnPropertySlotEPN3JSC9ExecStateERKNS1_10IdentifierERNS1_12PropertySlotE
__ZN3JSC21getStaticPropertySlotIN7WebCore24JSSVGSVGElementPrototypeENS_8JSObjectEEEbPNS_9ExecStateEPKNS_9HashTableEPT_RKNS_10IdentifierERNS_12PropertySlotE
__ZNK7WebCore10SVGElement11boundingBoxERNS_9FloatRectENS_12SVGLocatable19StyleUpdateStrategyE
-__ZNK7WebCore25SVGStyledLocatableElement17isStyledLocatableEv
-__ZNK7WebCore25SVGStyledLocatableElement7getBBoxENS_12SVGLocatable19StyleUpdateStrategyE
__ZN7WebCore12SVGLocatable7getBBoxEPKNS_10SVGElementENS0_19StyleUpdateStrategyE
__ZNK7WebCore13RenderSVGRoot17objectBoundingBoxEv
__ZN7WebCoreL27createSVGRectElementWrapperEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEN3WTF10PassRefPtrINS_10SVGElementEEE
@@ -30044,7 +30040,6 @@
__ZNK7WebCore13SVGSVGElement22pixelUnitToMillimeterYEv
__ZN7WebCore24jsSVGSVGElementClassNameEPN3JSC9ExecStateENS0_7JSValueERKNS0_10IdentifierE
__ZN7WebCore38jsSVGSVGElementFarthestViewportElementEPN3JSC9ExecStateENS0_7JSValueERKNS0_10IdentifierE
-__ZNK7WebCore25SVGStyledLocatableElement23farthestViewportElementEv
__ZN7WebCore39jsSVGSVGElementScreenPixelToMillimeterYEPN3JSC9ExecStateENS0_7JSValueERKNS0_10IdentifierE
__ZNK7WebCore13SVGSVGElement24screenPixelToMillimeterYEv
__ZN7WebCore33jsSVGSVGElementRequiredExtensionsEPN3JSC9ExecStateENS0_7JSValueERKNS0_10IdentifierE
@@ -30089,7 +30084,6 @@
__ZN7WebCore45jsSVGRectElementPrototypeFunctionGetScreenCTMEPN3JSC9ExecStateE
__ZNK7WebCore29SVGGraphicsElement12getScreenCTMENS_12SVGLocatable19StyleUpdateStrategyE
__ZN7WebCore44jsSVGSVGElementPrototypeFunctionGetScreenCTMEPN3JSC9ExecStateE
-__ZNK7WebCore25SVGStyledLocatableElement12getScreenCTMENS_12SVGLocatable19StyleUpdateStrategyE
__ZN7WebCoreL28createSVGGlyphElementWrapperEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEN3WTF10PassRefPtrINS_10SVGElementEEE
__ZN7WebCore13createWrapperINS_17JSSVGGlyphElementENS_15SVGGlyphElementEEEPNS_12JSDOMWrapperEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPT0_
__ZN7WebCore17JSSVGGlyphElementC1EPN3JSC9StructureEPNS_17JSDOMGlobalObjectEN3WTF10PassRefPtrINS_15SVGGlyphElementEEE
@@ -30217,7 +30211,6 @@
__ZN7WebCore46jsSVGSVGElementPrototypeFunctionGetElementByIdEPN3JSC9ExecStateE
__ZNK7WebCore13SVGSVGElement14getElementByIdERKN3WTF12AtomicStringE
__ZN7WebCore38jsSVGSVGElementPrototypeFunctionGetCTMEPN3JSC9ExecStateE
-__ZNK7WebCore25SVGStyledLocatableElement6getCTMENS_12SVGLocatable19StyleUpdateStrategyE
__ZN7WebCore36jsSVGGElementPrototypeFunctionGetCTMEPN3JSC9ExecStateE
__ZN7WebCore42jsSVGGElementPrototypeFunctionGetScreenCTMEPN3JSC9ExecStateE
__ZN7WebCore60jsSVGTextContentElementPrototypeFunctionGetCharNumAtPositionEPN3JSC9ExecStateE
@@ -30783,7 +30776,6 @@
__ZN7WebCore31jsSVGUseElementRequiredFeaturesEPN3JSC9ExecStateENS0_7JSValueERKNS0_10IdentifierE
__ZNK7WebCore15RenderSVGInline19mapLocalToContainerEPNS_20RenderBoxModelObjectEbbRNS_14TransformStateE
__ZN7WebCore53jsSVGSVGElementPrototypeFunctionGetTransformToElementEPN3JSC9ExecStateE
-__ZTv0_n56_NK7WebCore25SVGStyledLocatableElement6getCTMENS_12SVGLocatable19StyleUpdateStrategyE
__ZNK7WebCore4Font32selectionRectForTextUsingSVGFontERKNS_7TextRunERKNS_10FloatPointEiii
__ZNK7WebCore13RenderSVGText14firstLineBlockEv
__ZN7WebCore15SVGVKernElement24buildVerticalKerningPairERN3WTF6VectorINS_14SVGKerningPairELm0EEE
@@ -35521,7 +35513,6 @@
__ZTVN7WebCore11SVGAElementE
__ZTTN7WebCore11SVGAElementE
__ZTCN7WebCore11SVGAElementE0_NS_29SVGGraphicsElementE
-__ZTCN7WebCore11SVGAElementE0_NS_25SVGStyledLocatableElementE
__ZTCN7WebCore11SVGAElementE144_NS_16SVGTransformableE
__ZTVN7WebCore18SVGAltGlyphElementE
__ZTVN7WebCore22SVGAnimateColorElementE
@@ -35550,19 +35541,16 @@
__ZTVN7WebCore16SVGCircleElementE
__ZTTN7WebCore16SVGCircleElementE
__ZTCN7WebCore16SVGCircleElementE0_NS_29SVGGraphicsElementE
-__ZTCN7WebCore16SVGCircleElementE0_NS_25SVGStyledLocatableElementE
__ZTCN7WebCore16SVGCircleElementE144_NS_16SVGTransformableE
__ZTVN7WebCore18SVGClipPathElementE
__ZTTN7WebCore18SVGClipPathElementE
__ZTCN7WebCore18SVGClipPathElementE0_NS_29SVGGraphicsElementE
-__ZTCN7WebCore18SVGClipPathElementE0_NS_25SVGStyledLocatableElementE
__ZTCN7WebCore18SVGClipPathElementE144_NS_16SVGTransformableE
__ZTVN7WebCore35SVGComponentTransferFunctionElementE
__ZTVN7WebCore16SVGCursorElementE
__ZTVN7WebCore14SVGDefsElementE
__ZTTN7WebCore14SVGDefsElementE
__ZTCN7WebCore14SVGDefsElementE0_NS_29SVGGraphicsElementE
-__ZTCN7WebCore14SVGDefsElementE0_NS_25SVGStyledLocatableElementE
__ZTCN7WebCore14SVGDefsElementE144_NS_16SVGTransformableE
__ZTVN7WebCore11SVGDocumentE
__ZTVN7WebCore10SVGElementE
@@ -35571,7 +35559,6 @@
__ZTVN7WebCore17SVGEllipseElementE
__ZTTN7WebCore17SVGEllipseElementE
__ZTCN7WebCore17SVGEllipseElementE0_NS_29SVGGraphicsElementE
-__ZTCN7WebCore17SVGEllipseElementE0_NS_25SVGStyledLocatableElementE
__ZTCN7WebCore17SVGEllipseElementE144_NS_16SVGTransformableE
__ZN7WebCoreL13svgExceptionsE
__ZTVN7WebCore17SVGFEBlendElementE
@@ -35608,12 +35595,10 @@
__ZTVN7WebCore23SVGForeignObjectElementE
__ZTTN7WebCore23SVGForeignObjectElementE
__ZTCN7WebCore23SVGForeignObjectElementE0_NS_29SVGGraphicsElementE
-__ZTCN7WebCore23SVGForeignObjectElementE0_NS_25SVGStyledLocatableElementE
__ZTCN7WebCore23SVGForeignObjectElementE144_NS_16SVGTransformableE
__ZTVN7WebCore11SVGGElementE
__ZTTN7WebCore11SVGGElementE
__ZTCN7WebCore11SVGGElementE0_NS_29SVGGraphicsElementE
-__ZTCN7WebCore11SVGGElementE0_NS_25SVGStyledLocatableElementE
__ZTCN7WebCore11SVGGElementE144_NS_16SVGTransformableE
__ZTVN7WebCore15SVGGlyphElementE
__ZTVN7WebCore18SVGGlyphRefElementE
@@ -35623,14 +35608,12 @@
__ZTVN7WebCore15SVGImageElementE
__ZTTN7WebCore15SVGImageElementE
__ZTCN7WebCore15SVGImageElementE0_NS_29SVGGraphicsElementE
-__ZTCN7WebCore15SVGImageElementE0_NS_25SVGStyledLocatableElementE
__ZTCN7WebCore15SVGImageElementE144_NS_16SVGTransformableE
__ZTVN7WebCore14SVGImageLoaderE
__ZTVN7WebCore24SVGLinearGradientElementE
__ZTVN7WebCore14SVGLineElementE
__ZTTN7WebCore14SVGLineElementE
__ZTCN7WebCore14SVGLineElementE0_NS_29SVGGraphicsElementE
-__ZTCN7WebCore14SVGLineElementE0_NS_25SVGStyledLocatableElementE
__ZTCN7WebCore14SVGLineElementE144_NS_16SVGTransformableE
__ZTVN7WebCore16SVGMarkerElementE
__ZTVN7WebCore14SVGMaskElementE
@@ -35641,7 +35624,6 @@
__ZTVN7WebCore14SVGPathElementE
__ZTTN7WebCore14SVGPathElementE
__ZTCN7WebCore14SVGPathElementE0_NS_29SVGGraphicsElementE
-__ZTCN7WebCore14SVGPathElementE0_NS_25SVGStyledLocatableElementE
__ZTCN7WebCore14SVGPathElementE144_NS_16SVGTransformableE
__ZTVN7WebCore21SVGPathSegListBuilderE
__ZTVN7WebCore29SVGPathSegListPropertyTearOffE
@@ -35653,13 +35635,11 @@
__ZTVN7WebCore14SVGPolyElementE
__ZTTN7WebCore14SVGPolyElementE
__ZTCN7WebCore14SVGPolyElementE0_NS_29SVGGraphicsElementE
-__ZTCN7WebCore14SVGPolyElementE0_NS_25SVGStyledLocatableElementE
__ZTCN7WebCore14SVGPolyElementE144_NS_16SVGTransformableE
__ZTVN7WebCore24SVGRadialGradientElementE
__ZTVN7WebCore14SVGRectElementE
__ZTTN7WebCore14SVGRectElementE
__ZTCN7WebCore14SVGRectElementE0_NS_29SVGGraphicsElementE
-__ZTCN7WebCore14SVGRectElementE0_NS_25SVGStyledLocatableElementE
__ZTCN7WebCore14SVGRectElementE144_NS_16SVGTransformableE
__ZTVN7WebCore16SVGScriptElementE
__ZTVN7WebCore13SVGSetElementE
@@ -35667,19 +35647,15 @@
__ZTVN7WebCore22ConditionEventListenerE
__ZTVN7WebCore14SVGStopElementE
__ZTVN7WebCore16SVGStyledElementE
-__ZTVN7WebCore25SVGStyledLocatableElementE
__ZTVN7WebCore29SVGGraphicsElementE
__ZTTN7WebCore29SVGGraphicsElementE
-__ZTCN7WebCore29SVGGraphicsElementE0_NS_25SVGStyledLocatableElementE
__ZTCN7WebCore29SVGGraphicsElementE144_NS_16SVGTransformableE
__ZTVN7WebCore15SVGStyleElementE
__ZTVN7WebCore13SVGSVGElementE
__ZTTN7WebCore13SVGSVGElementE
-__ZTCN7WebCore13SVGSVGElementE0_NS_25SVGStyledLocatableElementE
__ZTVN7WebCore16SVGSwitchElementE
__ZTTN7WebCore16SVGSwitchElementE
__ZTCN7WebCore16SVGSwitchElementE0_NS_29SVGGraphicsElementE
-__ZTCN7WebCore16SVGSwitchElementE0_NS_25SVGStyledLocatableElementE
__ZTCN7WebCore16SVGSwitchElementE144_NS_16SVGTransformableE
__ZTVN7WebCore16SVGSymbolElementE
__ZTVN7WebCore21SVGTextContentElementE
@@ -35695,7 +35671,6 @@
__ZTVN7WebCore13SVGUseElementE
__ZTTN7WebCore13SVGUseElementE
__ZTCN7WebCore13SVGUseElementE0_NS_29SVGGraphicsElementE
-__ZTCN7WebCore13SVGUseElementE0_NS_25SVGStyledLocatableElementE
__ZTCN7WebCore13SVGUseElementE144_NS_16SVGTransformableE
__ZTVN7WebCore14SVGViewElementE
__ZTVN7WebCore15SVGVKernElementE
@@ -38357,13 +38332,11 @@
__ZTTN7WebCore17SVGPolygonElementE
__ZTCN7WebCore17SVGPolygonElementE0_NS_14SVGPolyElementE
__ZTCN7WebCore17SVGPolygonElementE0_NS_29SVGGraphicsElementE
-__ZTCN7WebCore17SVGPolygonElementE0_NS_25SVGStyledLocatableElementE
__ZTCN7WebCore17SVGPolygonElementE144_NS_16SVGTransformableE
__ZTVN7WebCore18SVGPolylineElementE
__ZTTN7WebCore18SVGPolylineElementE
__ZTCN7WebCore18SVGPolylineElementE0_NS_14SVGPolyElementE
__ZTCN7WebCore18SVGPolylineElementE0_NS_29SVGGraphicsElementE
-__ZTCN7WebCore18SVGPolylineElementE0_NS_25SVGStyledLocatableElementE
__ZTCN7WebCore18SVGPolylineElementE144_NS_16SVGTransformableE
__ZTVN7WebCore5TimerINS_10SVGElementEEE
__ZTVN7WebCore11SVGViewSpecE
Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (152298 => 152299)
--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2013-07-02 16:50:49 UTC (rev 152298)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2013-07-02 17:37:32 UTC (rev 152299)
@@ -13462,7 +13462,6 @@
<ClInclude Include="..\svg\SVGStopElement.h" />
<ClInclude Include="..\svg\SVGStringList.h" />
<ClInclude Include="..\svg\SVGStyledElement.h" />
- <ClInclude Include="..\svg\SVGStyledLocatableElement.h" />
<ClInclude Include="..\svg\SVGGraphicsElement.h" />
<ClInclude Include="..\svg\SVGStyleElement.h" />
<ClInclude Include="..\svg\SVGSVGElement.h" />
Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (152298 => 152299)
--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2013-07-02 16:50:49 UTC (rev 152298)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2013-07-02 17:37:32 UTC (rev 152299)
@@ -12123,9 +12123,6 @@
<ClInclude Include="..\svg\SVGStyledElement.h">
<Filter>rendering\svg</Filter>
</ClInclude>
- <ClInclude Include="..\svg\SVGStyledLocatableElement.h">
- <Filter>rendering\svg</Filter>
- </ClInclude>
<ClInclude Include="..\svg\SVGGraphicsElement.h">
<Filter>rendering\svg</Filter>
</ClInclude>
@@ -15712,4 +15709,4 @@
<Filter>rendering</Filter>
</CustomBuildStep>
</ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (152298 => 152299)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2013-07-02 16:50:49 UTC (rev 152298)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2013-07-02 17:37:32 UTC (rev 152299)
@@ -4087,8 +4087,6 @@
B2227AA90D00BF220071B782 /* SVGStopElement.h in Headers */ = {isa = PBXBuildFile; fileRef = B22279130D00BF210071B782 /* SVGStopElement.h */; };
B2227AAB0D00BF220071B782 /* SVGStringList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B22279150D00BF210071B782 /* SVGStringList.cpp */; };
B2227AAC0D00BF220071B782 /* SVGStringList.h in Headers */ = {isa = PBXBuildFile; fileRef = B22279160D00BF210071B782 /* SVGStringList.h */; };
- B2227AB30D00BF220071B782 /* SVGStyledLocatableElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B222791D0D00BF210071B782 /* SVGStyledLocatableElement.cpp */; };
- B2227AB40D00BF220071B782 /* SVGStyledLocatableElement.h in Headers */ = {isa = PBXBuildFile; fileRef = B222791E0D00BF210071B782 /* SVGStyledLocatableElement.h */; };
B2227AB50D00BF220071B782 /* SVGGraphicsElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B222791F0D00BF210071B782 /* SVGGraphicsElement.cpp */; };
B2227AB60D00BF220071B782 /* SVGGraphicsElement.h in Headers */ = {isa = PBXBuildFile; fileRef = B22279200D00BF210071B782 /* SVGGraphicsElement.h */; };
B2227AB70D00BF220071B782 /* SVGStyleElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B22279210D00BF210071B782 /* SVGStyleElement.cpp */; };
@@ -10728,8 +10726,6 @@
B22279150D00BF210071B782 /* SVGStringList.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SVGStringList.cpp; sourceTree = "<group>"; };
B22279160D00BF210071B782 /* SVGStringList.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SVGStringList.h; sourceTree = "<group>"; };
B22279170D00BF210071B782 /* SVGStringList.idl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = SVGStringList.idl; sourceTree = "<group>"; };
- B222791D0D00BF210071B782 /* SVGStyledLocatableElement.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SVGStyledLocatableElement.cpp; sourceTree = "<group>"; };
- B222791E0D00BF210071B782 /* SVGStyledLocatableElement.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SVGStyledLocatableElement.h; sourceTree = "<group>"; };
B222791F0D00BF210071B782 /* SVGGraphicsElement.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SVGGraphicsElement.cpp; sourceTree = "<group>"; };
B22279200D00BF210071B782 /* SVGGraphicsElement.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SVGGraphicsElement.h; sourceTree = "<group>"; };
B22279210D00BF210071B782 /* SVGStyleElement.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SVGStyleElement.cpp; sourceTree = "<group>"; };
@@ -18137,8 +18133,6 @@
B22279210D00BF210071B783 /* SVGStyledElement.cpp */,
B22279220D00BF210071B783 /* SVGStyledElement.h */,
B22279230D00BF210071B783 /* SVGStyledElement.idl */,
- B222791D0D00BF210071B782 /* SVGStyledLocatableElement.cpp */,
- B222791E0D00BF210071B782 /* SVGStyledLocatableElement.h */,
B222791F0D00BF210071B782 /* SVGGraphicsElement.cpp */,
B22279200D00BF210071B782 /* SVGGraphicsElement.h */,
B22279210D00BF210071B782 /* SVGStyleElement.cpp */,
@@ -23683,7 +23677,6 @@
B2227AA90D00BF220071B782 /* SVGStopElement.h in Headers */,
B2227AAC0D00BF220071B782 /* SVGStringList.h in Headers */,
B2227AB80D00BF220071B783 /* SVGStyledElement.h in Headers */,
- B2227AB40D00BF220071B782 /* SVGStyledLocatableElement.h in Headers */,
B2227AB60D00BF220071B782 /* SVGGraphicsElement.h in Headers */,
B2227AB80D00BF220071B782 /* SVGStyleElement.h in Headers */,
B2227ABB0D00BF220071B782 /* SVGSVGElement.h in Headers */,
@@ -26713,7 +26706,6 @@
B2227AA80D00BF220071B782 /* SVGStopElement.cpp in Sources */,
B2227AAB0D00BF220071B782 /* SVGStringList.cpp in Sources */,
B2227AB70D00BF220071B783 /* SVGStyledElement.cpp in Sources */,
- B2227AB30D00BF220071B782 /* SVGStyledLocatableElement.cpp in Sources */,
B2227AB50D00BF220071B782 /* SVGGraphicsElement.cpp in Sources */,
B2227AB70D00BF220071B782 /* SVGStyleElement.cpp in Sources */,
B2227ABA0D00BF220071B782 /* SVGSVGElement.cpp in Sources */,
Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (152298 => 152299)
--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2013-07-02 16:50:49 UTC (rev 152298)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2013-07-02 17:37:32 UTC (rev 152299)
@@ -1501,7 +1501,6 @@
|| $typename eq "SVGPolylineElement"
|| $typename eq "SVGRectElement"
|| $typename eq "SVGSVGElement"
- || $typename eq "SVGStyledLocatableElement"
|| $typename eq "SVGGraphicsElement"
|| $typename eq "SVGSwitchElement"
|| $typename eq "SVGTextElement"
Modified: trunk/Source/WebCore/svg/SVGAllInOne.cpp (152298 => 152299)
--- trunk/Source/WebCore/svg/SVGAllInOne.cpp 2013-07-02 16:50:49 UTC (rev 152298)
+++ trunk/Source/WebCore/svg/SVGAllInOne.cpp 2013-07-02 17:37:32 UTC (rev 152299)
@@ -157,7 +157,6 @@
#include "SVGStringList.cpp"
#include "SVGStyleElement.cpp"
#include "SVGStyledElement.cpp"
-#include "SVGStyledLocatableElement.cpp"
#include "SVGSwitchElement.cpp"
#include "SVGSymbolElement.cpp"
#include "SVGTRefElement.cpp"
Modified: trunk/Source/WebCore/svg/SVGElement.cpp (152298 => 152299)
--- trunk/Source/WebCore/svg/SVGElement.cpp 2013-07-02 16:50:49 UTC (rev 152298)
+++ trunk/Source/WebCore/svg/SVGElement.cpp 2013-07-02 17:37:32 UTC (rev 152299)
@@ -37,9 +37,9 @@
#include "SVGDocumentExtensions.h"
#include "SVGElementInstance.h"
#include "SVGElementRareData.h"
+#include "SVGGraphicsElement.h"
#include "SVGNames.h"
#include "SVGSVGElement.h"
-#include "SVGStyledLocatableElement.h"
#include "SVGTextElement.h"
#include "ScriptEventListener.h"
#include "XMLNames.h"
@@ -255,8 +255,8 @@
bool SVGElement::getBoundingBox(FloatRect& rect, SVGLocatable::StyleUpdateStrategy styleUpdateStrategy)
{
- if (isStyledLocatable()) {
- rect = toSVGStyledLocatableElement(this)->getBBox(styleUpdateStrategy);
+ if (isSVGGraphicsElement()) {
+ rect = toSVGGraphicsElement(this)->getBBox(styleUpdateStrategy);
return true;
}
if (hasTagName(SVGNames::textTag)) {
Modified: trunk/Source/WebCore/svg/SVGElement.h (152298 => 152299)
--- trunk/Source/WebCore/svg/SVGElement.h 2013-07-02 16:50:49 UTC (rev 152298)
+++ trunk/Source/WebCore/svg/SVGElement.h 2013-07-02 17:37:32 UTC (rev 152299)
@@ -60,7 +60,6 @@
virtual bool isSVGStyledElement() const { return false; }
virtual bool isSVGGraphicsElement() const { return false; }
- virtual bool isStyledLocatable() const { return false; }
virtual bool isSVGSVGElement() const { return false; }
virtual bool isFilterEffect() const { return false; }
virtual bool isGradientStop() const { return false; }
Modified: trunk/Source/WebCore/svg/SVGGraphicsElement.cpp (152298 => 152299)
--- trunk/Source/WebCore/svg/SVGGraphicsElement.cpp 2013-07-02 16:50:49 UTC (rev 152298)
+++ trunk/Source/WebCore/svg/SVGGraphicsElement.cpp 2013-07-02 17:37:32 UTC (rev 152299)
@@ -38,12 +38,12 @@
BEGIN_REGISTER_ANIMATED_PROPERTIES(SVGGraphicsElement)
REGISTER_LOCAL_ANIMATED_PROPERTY(transform)
- REGISTER_PARENT_ANIMATED_PROPERTIES(SVGStyledLocatableElement)
+ REGISTER_PARENT_ANIMATED_PROPERTIES(SVGStyledElement)
REGISTER_PARENT_ANIMATED_PROPERTIES(SVGTests)
END_REGISTER_ANIMATED_PROPERTIES
SVGGraphicsElement::SVGGraphicsElement(const QualifiedName& tagName, Document* document, ConstructionType constructionType)
- : SVGStyledLocatableElement(tagName, document, constructionType)
+ : SVGStyledElement(tagName, document, constructionType)
{
registerAnimatedPropertiesForSVGGraphicsElement();
}
@@ -102,7 +102,7 @@
void SVGGraphicsElement::parseAttribute(const QualifiedName& name, const AtomicString& value)
{
if (!isSupportedAttribute(name)) {
- SVGStyledLocatableElement::parseAttribute(name, value);
+ SVGStyledElement::parseAttribute(name, value);
return;
}
@@ -120,7 +120,7 @@
void SVGGraphicsElement::svgAttributeChanged(const QualifiedName& attrName)
{
if (!isSupportedAttribute(attrName)) {
- SVGStyledLocatableElement::svgAttributeChanged(attrName);
+ SVGStyledElement::svgAttributeChanged(attrName);
return;
}
Modified: trunk/Source/WebCore/svg/SVGGraphicsElement.h (152298 => 152299)
--- trunk/Source/WebCore/svg/SVGGraphicsElement.h 2013-07-02 16:50:49 UTC (rev 152298)
+++ trunk/Source/WebCore/svg/SVGGraphicsElement.h 2013-07-02 17:37:32 UTC (rev 152299)
@@ -23,7 +23,7 @@
#if ENABLE(SVG)
#include "SVGAnimatedTransformList.h"
-#include "SVGStyledLocatableElement.h"
+#include "SVGStyledElement.h"
#include "SVGTests.h"
#include "SVGTransformable.h"
@@ -32,7 +32,7 @@
class AffineTransform;
class Path;
-class SVGGraphicsElement : public SVGStyledLocatableElement, public SVGTransformable, public SVGTests {
+class SVGGraphicsElement : public SVGStyledElement, public SVGTransformable, public SVGTests {
public:
virtual ~SVGGraphicsElement();
Modified: trunk/Source/WebCore/svg/SVGLocatable.cpp (152298 => 152299)
--- trunk/Source/WebCore/svg/SVGLocatable.cpp 2013-07-02 16:50:49 UTC (rev 152298)
+++ trunk/Source/WebCore/svg/SVGLocatable.cpp 2013-07-02 17:37:32 UTC (rev 152299)
@@ -27,8 +27,8 @@
#include "RenderObject.h"
#include "SVGException.h"
+#include "SVGGraphicsElement.h"
#include "SVGNames.h"
-#include "SVGStyledLocatableElement.h"
namespace WebCore {
@@ -103,8 +103,8 @@
{
AffineTransform ctm = getCTM(styleUpdateStrategy);
- if (target && target->isStyledLocatable()) {
- AffineTransform targetCTM = toSVGStyledLocatableElement(target)->getCTM(styleUpdateStrategy);
+ if (target && target->isSVGGraphicsElement()) {
+ AffineTransform targetCTM = toSVGGraphicsElement(target)->getCTM(styleUpdateStrategy);
if (!targetCTM.isInvertible()) {
ec = SVGException::SVG_MATRIX_NOT_INVERTABLE;
return ctm;
Modified: trunk/Source/WebCore/svg/SVGStyledElement.cpp (152298 => 152299)
--- trunk/Source/WebCore/svg/SVGStyledElement.cpp 2013-07-02 16:50:49 UTC (rev 152298)
+++ trunk/Source/WebCore/svg/SVGStyledElement.cpp 2013-07-02 17:37:32 UTC (rev 152299)
@@ -426,7 +426,7 @@
AffineTransform SVGStyledElement::localCoordinateSpaceTransform(SVGLocatable::CTMScope) const
{
- // To be overriden by SVGStyledLocatableElement/SVGGraphicsElement (or as special case SVGTextElement and SVGPatternElement)
+ // To be overriden by SVGGraphicsElement (or as special case SVGTextElement and SVGPatternElement)
return AffineTransform();
}
Deleted: trunk/Source/WebCore/svg/SVGStyledLocatableElement.cpp (152298 => 152299)
--- trunk/Source/WebCore/svg/SVGStyledLocatableElement.cpp 2013-07-02 16:50:49 UTC (rev 152298)
+++ trunk/Source/WebCore/svg/SVGStyledLocatableElement.cpp 2013-07-02 17:37:32 UTC (rev 152299)
@@ -1,64 +0,0 @@
-/*
- * Copyright (C) 2004, 2005, 2008 Nikolas Zimmermann <[email protected]>
- * Copyright (C) 2004, 2005, 2006 Rob Buis <[email protected]>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#include "config.h"
-
-#if ENABLE(SVG)
-#include "SVGStyledLocatableElement.h"
-
-#include "AffineTransform.h"
-#include "SVGElement.h"
-#include "SVGSVGElement.h"
-
-namespace WebCore {
-
-SVGStyledLocatableElement::SVGStyledLocatableElement(const QualifiedName& tagName, Document* document, ConstructionType constructionType)
- : SVGStyledElement(tagName, document, constructionType)
-{
-}
-
-SVGElement* SVGStyledLocatableElement::nearestViewportElement() const
-{
- return SVGLocatable::nearestViewportElement(this);
-}
-
-SVGElement* SVGStyledLocatableElement::farthestViewportElement() const
-{
- return SVGLocatable::farthestViewportElement(this);
-}
-
-FloatRect SVGStyledLocatableElement::getBBox(StyleUpdateStrategy styleUpdateStrategy)
-{
- return SVGLocatable::getBBox(this, styleUpdateStrategy);
-}
-
-AffineTransform SVGStyledLocatableElement::getCTM(StyleUpdateStrategy styleUpdateStrategy)
-{
- return SVGLocatable::computeCTM(this, SVGLocatable::NearestViewportScope, styleUpdateStrategy);
-}
-
-AffineTransform SVGStyledLocatableElement::getScreenCTM(StyleUpdateStrategy styleUpdateStrategy)
-{
- return SVGLocatable::computeCTM(this, SVGLocatable::ScreenScope, styleUpdateStrategy);
-}
-
-}
-
-#endif // ENABLE(SVG)
Deleted: trunk/Source/WebCore/svg/SVGStyledLocatableElement.h (152298 => 152299)
--- trunk/Source/WebCore/svg/SVGStyledLocatableElement.h 2013-07-02 16:50:49 UTC (rev 152298)
+++ trunk/Source/WebCore/svg/SVGStyledLocatableElement.h 2013-07-02 17:37:32 UTC (rev 152299)
@@ -1,60 +0,0 @@
-/*
- * Copyright (C) 2004, 2005, 2008 Nikolas Zimmermann <[email protected]>
- * Copyright (C) 2004, 2005, 2006 Rob Buis <[email protected]>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef SVGStyledLocatableElement_h
-#define SVGStyledLocatableElement_h
-
-#if ENABLE(SVG)
-#include "SVGLocatable.h"
-#include "SVGStyledElement.h"
-
-namespace WebCore {
-
-class SVGElement;
-
-class SVGStyledLocatableElement : public SVGStyledElement,
- virtual public SVGLocatable {
-public:
- virtual SVGElement* nearestViewportElement() const;
- virtual SVGElement* farthestViewportElement() const;
-
- virtual FloatRect getBBox(StyleUpdateStrategy = AllowStyleUpdate);
- virtual AffineTransform getCTM(StyleUpdateStrategy = AllowStyleUpdate);
- virtual AffineTransform getScreenCTM(StyleUpdateStrategy = AllowStyleUpdate);
-
- virtual AffineTransform localCoordinateSpaceTransform(SVGLocatable::CTMScope mode) const { return SVGLocatable::localCoordinateSpaceTransform(mode); }
-
-protected:
- SVGStyledLocatableElement(const QualifiedName&, Document*, ConstructionType = CreateSVGElement);
-
-private:
- virtual bool isStyledLocatable() const OVERRIDE { return true; }
-};
-
-inline SVGStyledLocatableElement* toSVGStyledLocatableElement(SVGElement* element)
-{
- ASSERT_WITH_SECURITY_IMPLICATION(!element || element->isStyledLocatable());
- return static_cast<SVGStyledLocatableElement*>(element);
-}
-
-} // namespace WebCore
-
-#endif // ENABLE(SVG)
-#endif // SVGStyledLocatableElement_h
