Changeset 152167 in webkit


Ignore:
Timestamp:
Jun 28, 2013, 8:58:03 AM (13 years ago)
Author:
Christophe Dumez
Message:

Introduce SVGGraphicsElement IDL interface
​https://bugs.webkit.org/show_bug.cgi?id=118178

Reviewed by Kentaro Hara.

Source/WebCore:

Introduce SVGGraphicsElement IDL interface as per the latest SVG
specification:

SVGGraphicsElement is a merge of SVGLocatable and SVGTransformable.
This is one step towards simplifying inheritance in SVG and matching
the latest SVG2 specification.

No new tests, already covered by existing tests.

  • CMakeLists.txt:
  • DerivedSources.cpp:
  • DerivedSources.make:
  • DerivedSources.pri:
  • 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):

  • rendering/svg/RenderSVGEllipse.cpp:

(WebCore::RenderSVGEllipse::RenderSVGEllipse):

  • rendering/svg/RenderSVGEllipse.h:
  • rendering/svg/RenderSVGPath.cpp:

(WebCore::RenderSVGPath::RenderSVGPath):

  • rendering/svg/RenderSVGPath.h:
  • rendering/svg/RenderSVGResourceClipper.cpp:

(WebCore::RenderSVGResourceClipper::pathOnlyClipping):

  • rendering/svg/RenderSVGResourceContainer.cpp:

(WebCore::RenderSVGResourceContainer::transformOnNonScalingStroke):

  • rendering/svg/RenderSVGResourceMarker.cpp:
  • rendering/svg/RenderSVGShape.cpp:

(WebCore::RenderSVGShape::RenderSVGShape):
(WebCore::RenderSVGShape::updateShapeFromElement):
(WebCore::RenderSVGShape::layout):
(WebCore::RenderSVGShape::nonScalingStrokeTransform):
(WebCore::RenderSVGShape::shouldGenerateMarkerPositions):

  • rendering/svg/RenderSVGShape.h:
  • rendering/svg/RenderSVGTransformableContainer.cpp:

(WebCore::RenderSVGTransformableContainer::RenderSVGTransformableContainer):
(WebCore::RenderSVGTransformableContainer::calculateLocalTransform):

  • rendering/svg/RenderSVGTransformableContainer.h:
  • svg/SVGAElement.cpp:

(WebCore::SVGAElement::SVGAElement):
(WebCore::SVGAElement::parseAttribute):
(WebCore::SVGAElement::svgAttributeChanged):
(WebCore::SVGAElement::defaultEventHandler):
(WebCore::SVGAElement::supportsFocus):
(WebCore::SVGAElement::isURLAttribute):

  • svg/SVGAElement.h:
  • svg/SVGAElement.idl:
  • svg/SVGAllInOne.cpp:
  • svg/SVGAnimateMotionElement.cpp:

(WebCore::SVGAnimateMotionElement::hasValidAttributeType):

  • svg/SVGCircleElement.cpp:

(WebCore::SVGCircleElement::SVGCircleElement):
(WebCore::SVGCircleElement::parseAttribute):
(WebCore::SVGCircleElement::svgAttributeChanged):

  • svg/SVGCircleElement.h:
  • svg/SVGCircleElement.idl:
  • svg/SVGClipPathElement.cpp:

(WebCore::SVGClipPathElement::SVGClipPathElement):
(WebCore::SVGClipPathElement::parseAttribute):
(WebCore::SVGClipPathElement::svgAttributeChanged):
(WebCore::SVGClipPathElement::childrenChanged):

  • svg/SVGClipPathElement.h:
  • svg/SVGClipPathElement.idl:
  • svg/SVGDefsElement.cpp:

(WebCore::SVGDefsElement::SVGDefsElement):

  • svg/SVGDefsElement.h:
  • svg/SVGDefsElement.idl:
  • svg/SVGElement.h:

(WebCore::SVGElement::isSVGGraphicsElement):

  • svg/SVGEllipseElement.cpp:

(WebCore::SVGEllipseElement::SVGEllipseElement):
(WebCore::SVGEllipseElement::parseAttribute):
(WebCore::SVGEllipseElement::svgAttributeChanged):

  • svg/SVGEllipseElement.h:
  • svg/SVGEllipseElement.idl:
  • svg/SVGForeignObjectElement.cpp:

(WebCore::SVGForeignObjectElement::SVGForeignObjectElement):
(WebCore::SVGForeignObjectElement::parseAttribute):
(WebCore::SVGForeignObjectElement::svgAttributeChanged):
(WebCore::SVGForeignObjectElement::rendererIsNeeded):

  • svg/SVGForeignObjectElement.h:
  • svg/SVGForeignObjectElement.idl:
  • svg/SVGGElement.cpp:

(WebCore::SVGGElement::SVGGElement):
(WebCore::SVGGElement::parseAttribute):
(WebCore::SVGGElement::svgAttributeChanged):

  • svg/SVGGElement.h:
  • svg/SVGGElement.idl:
  • svg/SVGGraphicsElement.cpp: Renamed from Source/WebCore/svg/SVGStyledTransformableElement.cpp.

(WebCore::SVGGraphicsElement::SVGGraphicsElement):
(WebCore::SVGGraphicsElement::~SVGGraphicsElement):
(WebCore::SVGGraphicsElement::getCTM):
(WebCore::SVGGraphicsElement::getScreenCTM):
(WebCore::SVGGraphicsElement::animatedLocalTransform):
(WebCore::SVGGraphicsElement::supplementalTransform):
(WebCore::SVGGraphicsElement::isSupportedAttribute):
(WebCore::SVGGraphicsElement::parseAttribute):
(WebCore::SVGGraphicsElement::svgAttributeChanged):
(WebCore::SVGGraphicsElement::nearestViewportElement):
(WebCore::SVGGraphicsElement::farthestViewportElement):
(WebCore::SVGGraphicsElement::getBBox):
(WebCore::SVGGraphicsElement::createRenderer):
(WebCore::SVGGraphicsElement::toClipPath):

  • svg/SVGGraphicsElement.h: Renamed from Source/WebCore/svg/SVGStyledTransformableElement.h.

(WebCore::SVGGraphicsElement::localCoordinateSpaceTransform):
(WebCore::SVGGraphicsElement::synchronizeRequiredFeatures):
(WebCore::SVGGraphicsElement::synchronizeRequiredExtensions):
(WebCore::SVGGraphicsElement::synchronizeSystemLanguage):
(WebCore::toSVGGraphicsElement):

  • svg/SVGGraphicsElement.idl: Copied from Source/WebCore/svg/SVGForeignObjectElement.idl.
  • svg/SVGImageElement.cpp:

(WebCore::SVGImageElement::SVGImageElement):
(WebCore::SVGImageElement::isPresentationAttribute):
(WebCore::SVGImageElement::collectStyleForPresentationAttribute):
(WebCore::SVGImageElement::parseAttribute):
(WebCore::SVGImageElement::svgAttributeChanged):
(WebCore::SVGImageElement::attach):
(WebCore::SVGImageElement::insertedInto):
(WebCore::SVGImageElement::addSubresourceAttributeURLs):
(WebCore::SVGImageElement::didMoveToNewDocument):

  • svg/SVGImageElement.h:
  • svg/SVGImageElement.idl:
  • svg/SVGLineElement.cpp:

(WebCore::SVGLineElement::SVGLineElement):
(WebCore::SVGLineElement::parseAttribute):
(WebCore::SVGLineElement::svgAttributeChanged):

  • svg/SVGLineElement.h:
  • svg/SVGLineElement.idl:
  • svg/SVGPathElement.cpp:

(WebCore::SVGPathElement::SVGPathElement):
(WebCore::SVGPathElement::parseAttribute):
(WebCore::SVGPathElement::svgAttributeChanged):
(WebCore::SVGPathElement::insertedInto):
(WebCore::SVGPathElement::removedFrom):

  • svg/SVGPathElement.h:
  • svg/SVGPathElement.idl:
  • svg/SVGPatternElement.cpp:
  • svg/SVGPolyElement.cpp:

(WebCore::SVGPolyElement::SVGPolyElement):
(WebCore::SVGPolyElement::parseAttribute):
(WebCore::SVGPolyElement::svgAttributeChanged):

  • svg/SVGPolyElement.h:
  • svg/SVGPolygonElement.idl:
  • svg/SVGPolylineElement.idl:
  • svg/SVGRectElement.cpp:

(WebCore::SVGRectElement::SVGRectElement):
(WebCore::SVGRectElement::parseAttribute):
(WebCore::SVGRectElement::svgAttributeChanged):

  • svg/SVGRectElement.h:
  • svg/SVGRectElement.idl:
  • svg/SVGSVGElement.cpp:

(WebCore::SVGSVGElement::SVGSVGElement):
(WebCore::SVGSVGElement::didMoveToNewDocument):
(WebCore::SVGSVGElement::parseAttribute):
(WebCore::SVGSVGElement::insertedInto):
(WebCore::SVGSVGElement::removedFrom):

  • svg/SVGSVGElement.h:
  • svg/SVGSVGElement.idl:
  • svg/SVGStyledElement.cpp:

(WebCore::SVGStyledElement::localCoordinateSpaceTransform):

  • svg/SVGSwitchElement.cpp:

(WebCore::SVGSwitchElement::SVGSwitchElement):

  • svg/SVGSwitchElement.h:
  • svg/SVGSwitchElement.idl:
  • svg/SVGUseElement.cpp:

(WebCore::SVGUseElement::SVGUseElement):
(WebCore::SVGUseElement::parseAttribute):
(WebCore::SVGUseElement::insertedInto):
(WebCore::SVGUseElement::removedFrom):
(WebCore::SVGUseElement::svgAttributeChanged):
(WebCore::SVGUseElement::toClipPath):
(WebCore::SVGUseElement::finishParsingChildren):

  • svg/SVGUseElement.h:
  • svg/SVGUseElement.idl:

LayoutTests:

Rebaseline js/global-constructors-attributes.html test case now that
SVGGraphicsElement is exposed on the global Window object.

  • fast/js/global-constructors-attributes-expected.txt:
  • platform/efl/fast/js/global-constructors-attributes-expected.txt:
  • platform/gtk/fast/js/global-constructors-attributes-expected.txt:
  • platform/mac-lion/fast/js/global-constructors-attributes-expected.txt:
  • platform/qt/fast/js/global-constructors-attributes-expected.txt:
Location:
trunk
Files:
80 edited
1 copied
2 moved

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r152164 r152167  
     12013-06-28  Christophe Dumez  <ch.dumez@sisa.samsung.com>
     2
     3        Introduce SVGGraphicsElement IDL interface
     4        https://bugs.webkit.org/show_bug.cgi?id=118178
     5
     6        Reviewed by Kentaro Hara.
     7
     8        Rebaseline js/global-constructors-attributes.html test case now that
     9        SVGGraphicsElement is exposed on the global Window object.
     10
     11        * fast/js/global-constructors-attributes-expected.txt:
     12        * platform/efl/fast/js/global-constructors-attributes-expected.txt:
     13        * platform/gtk/fast/js/global-constructors-attributes-expected.txt:
     14        * platform/mac-lion/fast/js/global-constructors-attributes-expected.txt:
     15        * platform/qt/fast/js/global-constructors-attributes-expected.txt:
     16
    1172013-06-28  Gabor Abraham  <abrhm@inf.u-szeged.hu>
    218

  • trunk/LayoutTests/fast/js/global-constructors-attributes-expected.txt

    r151985 r152167  
    13191319PASS Object.getOwnPropertyDescriptor(global, 'SVGGradientElement').enumerable is false
    13201320PASS Object.getOwnPropertyDescriptor(global, 'SVGGradientElement').configurable is true
     1321PASS Object.getOwnPropertyDescriptor(global, 'SVGGraphicsElement').value is SVGGraphicsElement
     1322PASS Object.getOwnPropertyDescriptor(global, 'SVGGraphicsElement').hasOwnProperty('get') is false
     1323PASS Object.getOwnPropertyDescriptor(global, 'SVGGraphicsElement').hasOwnProperty('set') is false
     1324PASS Object.getOwnPropertyDescriptor(global, 'SVGGraphicsElement').enumerable is false
     1325PASS Object.getOwnPropertyDescriptor(global, 'SVGGraphicsElement').configurable is true
    13211326PASS Object.getOwnPropertyDescriptor(global, 'SVGHKernElement').value is SVGHKernElement
    13221327PASS Object.getOwnPropertyDescriptor(global, 'SVGHKernElement').hasOwnProperty('get') is false

  • trunk/LayoutTests/platform/efl/fast/js/global-constructors-attributes-expected.txt

    r152090 r152167  
    14041404PASS Object.getOwnPropertyDescriptor(global, 'SVGGradientElement').enumerable is false
    14051405PASS Object.getOwnPropertyDescriptor(global, 'SVGGradientElement').configurable is true
     1406PASS Object.getOwnPropertyDescriptor(global, 'SVGGraphicsElement').value is SVGGraphicsElement
     1407PASS Object.getOwnPropertyDescriptor(global, 'SVGGraphicsElement').hasOwnProperty('get') is false
     1408PASS Object.getOwnPropertyDescriptor(global, 'SVGGraphicsElement').hasOwnProperty('set') is false
     1409PASS Object.getOwnPropertyDescriptor(global, 'SVGGraphicsElement').enumerable is false
     1410PASS Object.getOwnPropertyDescriptor(global, 'SVGGraphicsElement').configurable is true
    14061411PASS Object.getOwnPropertyDescriptor(global, 'SVGHKernElement').value is SVGHKernElement
    14071412PASS Object.getOwnPropertyDescriptor(global, 'SVGHKernElement').hasOwnProperty('get') is false

  • trunk/LayoutTests/platform/gtk/fast/js/global-constructors-attributes-expected.txt

    r151985 r152167  
    14141414PASS Object.getOwnPropertyDescriptor(global, 'SVGGradientElement').enumerable is false
    14151415PASS Object.getOwnPropertyDescriptor(global, 'SVGGradientElement').configurable is true
     1416PASS Object.getOwnPropertyDescriptor(global, 'SVGGraphicsElement').value is SVGGraphicsElement
     1417PASS Object.getOwnPropertyDescriptor(global, 'SVGGraphicsElement').hasOwnProperty('get') is false
     1418PASS Object.getOwnPropertyDescriptor(global, 'SVGGraphicsElement').hasOwnProperty('set') is false
     1419PASS Object.getOwnPropertyDescriptor(global, 'SVGGraphicsElement').enumerable is false
     1420PASS Object.getOwnPropertyDescriptor(global, 'SVGGraphicsElement').configurable is true
    14161421PASS Object.getOwnPropertyDescriptor(global, 'SVGHKernElement').value is SVGHKernElement
    14171422PASS Object.getOwnPropertyDescriptor(global, 'SVGHKernElement').hasOwnProperty('get') is false

  • trunk/LayoutTests/platform/mac-lion/fast/js/global-constructors-attributes-expected.txt

    r151985 r152167  
    13091309PASS Object.getOwnPropertyDescriptor(global, 'SVGGradientElement').enumerable is false
    13101310PASS Object.getOwnPropertyDescriptor(global, 'SVGGradientElement').configurable is true
     1311PASS Object.getOwnPropertyDescriptor(global, 'SVGGraphicsElement').value is SVGGraphicsElement
     1312PASS Object.getOwnPropertyDescriptor(global, 'SVGGraphicsElement').hasOwnProperty('get') is false
     1313PASS Object.getOwnPropertyDescriptor(global, 'SVGGraphicsElement').hasOwnProperty('set') is false
     1314PASS Object.getOwnPropertyDescriptor(global, 'SVGGraphicsElement').enumerable is false
     1315PASS Object.getOwnPropertyDescriptor(global, 'SVGGraphicsElement').configurable is true
    13111316PASS Object.getOwnPropertyDescriptor(global, 'SVGHKernElement').value is SVGHKernElement
    13121317PASS Object.getOwnPropertyDescriptor(global, 'SVGHKernElement').hasOwnProperty('get') is false

  • trunk/LayoutTests/platform/qt/fast/js/global-constructors-attributes-expected.txt

    r151985 r152167  
    12491249PASS Object.getOwnPropertyDescriptor(global, 'SVGGradientElement').enumerable is false
    12501250PASS Object.getOwnPropertyDescriptor(global, 'SVGGradientElement').configurable is true
     1251PASS Object.getOwnPropertyDescriptor(global, 'SVGGraphicsElement').value is SVGGraphicsElement
     1252PASS Object.getOwnPropertyDescriptor(global, 'SVGGraphicsElement').hasOwnProperty('get') is false
     1253PASS Object.getOwnPropertyDescriptor(global, 'SVGGraphicsElement').hasOwnProperty('set') is false
     1254PASS Object.getOwnPropertyDescriptor(global, 'SVGGraphicsElement').enumerable is false
     1255PASS Object.getOwnPropertyDescriptor(global, 'SVGGraphicsElement').configurable is true
    12511256PASS Object.getOwnPropertyDescriptor(global, 'SVGHKernElement').value is SVGHKernElement
    12521257PASS Object.getOwnPropertyDescriptor(global, 'SVGHKernElement').hasOwnProperty('get') is false

  • trunk/Source/WebCore/CMakeLists.txt

    r152120 r152167  
    689689    svg/SVGGlyphRefElement.idl
    690690    svg/SVGGradientElement.idl
     691    svg/SVGGraphicsElement.idl
    691692    svg/SVGHKernElement.idl
    692693    svg/SVGImageElement.idl
    … …  
    24142415    svg/SVGGlyphRefElement.cpp
    24152416    svg/SVGGradientElement.cpp
     2417    svg/SVGGraphicsElement.cpp
    24162418    svg/SVGHKernElement.cpp
    24172419    svg/SVGImageElement.cpp
    … …  
    24612463    svg/SVGStyledElement.cpp
    24622464    svg/SVGStyledLocatableElement.cpp
    2463     svg/SVGStyledTransformableElement.cpp
    24642465    svg/SVGSwitchElement.cpp
    24652466    svg/SVGSymbolElement.cpp

  • trunk/Source/WebCore/ChangeLog

    r152162 r152167  
     12013-06-28  Christophe Dumez  <ch.dumez@sisa.samsung.com>
     2
     3        Introduce SVGGraphicsElement IDL interface
     4        https://bugs.webkit.org/show_bug.cgi?id=118178
     5
     6        Reviewed by Kentaro Hara.
     7
     8        Introduce SVGGraphicsElement IDL interface as per the latest SVG
     9        specification:
     10        - https://svgwg.org/svg2-draft/types.html#InterfaceSVGGraphicsElement
     11
     12        SVGGraphicsElement is a merge of SVGLocatable and SVGTransformable.
     13        This is one step towards simplifying inheritance in SVG and matching
     14        the latest SVG2 specification.
     15
     16        No new tests, already covered by existing tests.
     17
     18        * CMakeLists.txt:
     19        * DerivedSources.cpp:
     20        * DerivedSources.make:
     21        * DerivedSources.pri:
     22        * GNUmakefile.list.am:
     23        * Target.pri:
     24        * WebCore.order:
     25        * WebCore.vcxproj/WebCore.vcxproj:
     26        * WebCore.vcxproj/WebCore.vcxproj.filters:
     27        * WebCore.xcodeproj/project.pbxproj:
     28        * bindings/scripts/CodeGeneratorJS.pm:
     29        (GetGnuVTableOffsetForType):
     30        * rendering/svg/RenderSVGEllipse.cpp:
     31        (WebCore::RenderSVGEllipse::RenderSVGEllipse):
     32        * rendering/svg/RenderSVGEllipse.h:
     33        * rendering/svg/RenderSVGPath.cpp:
     34        (WebCore::RenderSVGPath::RenderSVGPath):
     35        * rendering/svg/RenderSVGPath.h:
     36        * rendering/svg/RenderSVGResourceClipper.cpp:
     37        (WebCore::RenderSVGResourceClipper::pathOnlyClipping):
     38        * rendering/svg/RenderSVGResourceContainer.cpp:
     39        (WebCore::RenderSVGResourceContainer::transformOnNonScalingStroke):
     40        * rendering/svg/RenderSVGResourceMarker.cpp:
     41        * rendering/svg/RenderSVGShape.cpp:
     42        (WebCore::RenderSVGShape::RenderSVGShape):
     43        (WebCore::RenderSVGShape::updateShapeFromElement):
     44        (WebCore::RenderSVGShape::layout):
     45        (WebCore::RenderSVGShape::nonScalingStrokeTransform):
     46        (WebCore::RenderSVGShape::shouldGenerateMarkerPositions):
     47        * rendering/svg/RenderSVGShape.h:
     48        * rendering/svg/RenderSVGTransformableContainer.cpp:
     49        (WebCore::RenderSVGTransformableContainer::RenderSVGTransformableContainer):
     50        (WebCore::RenderSVGTransformableContainer::calculateLocalTransform):
     51        * rendering/svg/RenderSVGTransformableContainer.h:
     52        * svg/SVGAElement.cpp:
     53        (WebCore::SVGAElement::SVGAElement):
     54        (WebCore::SVGAElement::parseAttribute):
     55        (WebCore::SVGAElement::svgAttributeChanged):
     56        (WebCore::SVGAElement::defaultEventHandler):
     57        (WebCore::SVGAElement::supportsFocus):
     58        (WebCore::SVGAElement::isURLAttribute):
     59        * svg/SVGAElement.h:
     60        * svg/SVGAElement.idl:
     61        * svg/SVGAllInOne.cpp:
     62        * svg/SVGAnimateMotionElement.cpp:
     63        (WebCore::SVGAnimateMotionElement::hasValidAttributeType):
     64        * svg/SVGCircleElement.cpp:
     65        (WebCore::SVGCircleElement::SVGCircleElement):
     66        (WebCore::SVGCircleElement::parseAttribute):
     67        (WebCore::SVGCircleElement::svgAttributeChanged):
     68        * svg/SVGCircleElement.h:
     69        * svg/SVGCircleElement.idl:
     70        * svg/SVGClipPathElement.cpp:
     71        (WebCore::SVGClipPathElement::SVGClipPathElement):
     72        (WebCore::SVGClipPathElement::parseAttribute):
     73        (WebCore::SVGClipPathElement::svgAttributeChanged):
     74        (WebCore::SVGClipPathElement::childrenChanged):
     75        * svg/SVGClipPathElement.h:
     76        * svg/SVGClipPathElement.idl:
     77        * svg/SVGDefsElement.cpp:
     78        (WebCore::SVGDefsElement::SVGDefsElement):
     79        * svg/SVGDefsElement.h:
     80        * svg/SVGDefsElement.idl:
     81        * svg/SVGElement.h:
     82        (WebCore::SVGElement::isSVGGraphicsElement):
     83        * svg/SVGEllipseElement.cpp:
     84        (WebCore::SVGEllipseElement::SVGEllipseElement):
     85        (WebCore::SVGEllipseElement::parseAttribute):
     86        (WebCore::SVGEllipseElement::svgAttributeChanged):
     87        * svg/SVGEllipseElement.h:
     88        * svg/SVGEllipseElement.idl:
     89        * svg/SVGForeignObjectElement.cpp:
     90        (WebCore::SVGForeignObjectElement::SVGForeignObjectElement):
     91        (WebCore::SVGForeignObjectElement::parseAttribute):
     92        (WebCore::SVGForeignObjectElement::svgAttributeChanged):
     93        (WebCore::SVGForeignObjectElement::rendererIsNeeded):
     94        * svg/SVGForeignObjectElement.h:
     95        * svg/SVGForeignObjectElement.idl:
     96        * svg/SVGGElement.cpp:
     97        (WebCore::SVGGElement::SVGGElement):
     98        (WebCore::SVGGElement::parseAttribute):
     99        (WebCore::SVGGElement::svgAttributeChanged):
     100        * svg/SVGGElement.h:
     101        * svg/SVGGElement.idl:
     102        * svg/SVGGraphicsElement.cpp: Renamed from Source/WebCore/svg/SVGStyledTransformableElement.cpp.
     103        (WebCore::SVGGraphicsElement::SVGGraphicsElement):
     104        (WebCore::SVGGraphicsElement::~SVGGraphicsElement):
     105        (WebCore::SVGGraphicsElement::getCTM):
     106        (WebCore::SVGGraphicsElement::getScreenCTM):
     107        (WebCore::SVGGraphicsElement::animatedLocalTransform):
     108        (WebCore::SVGGraphicsElement::supplementalTransform):
     109        (WebCore::SVGGraphicsElement::isSupportedAttribute):
     110        (WebCore::SVGGraphicsElement::parseAttribute):
     111        (WebCore::SVGGraphicsElement::svgAttributeChanged):
     112        (WebCore::SVGGraphicsElement::nearestViewportElement):
     113        (WebCore::SVGGraphicsElement::farthestViewportElement):
     114        (WebCore::SVGGraphicsElement::getBBox):
     115        (WebCore::SVGGraphicsElement::createRenderer):
     116        (WebCore::SVGGraphicsElement::toClipPath):
     117        * svg/SVGGraphicsElement.h: Renamed from Source/WebCore/svg/SVGStyledTransformableElement.h.
     118        (WebCore::SVGGraphicsElement::localCoordinateSpaceTransform):
     119        (WebCore::SVGGraphicsElement::synchronizeRequiredFeatures):
     120        (WebCore::SVGGraphicsElement::synchronizeRequiredExtensions):
     121        (WebCore::SVGGraphicsElement::synchronizeSystemLanguage):
     122        (WebCore::toSVGGraphicsElement):
     123        * svg/SVGGraphicsElement.idl: Copied from Source/WebCore/svg/SVGForeignObjectElement.idl.
     124        * svg/SVGImageElement.cpp:
     125        (WebCore::SVGImageElement::SVGImageElement):
     126        (WebCore::SVGImageElement::isPresentationAttribute):
     127        (WebCore::SVGImageElement::collectStyleForPresentationAttribute):
     128        (WebCore::SVGImageElement::parseAttribute):
     129        (WebCore::SVGImageElement::svgAttributeChanged):
     130        (WebCore::SVGImageElement::attach):
     131        (WebCore::SVGImageElement::insertedInto):
     132        (WebCore::SVGImageElement::addSubresourceAttributeURLs):
     133        (WebCore::SVGImageElement::didMoveToNewDocument):
     134        * svg/SVGImageElement.h:
     135        * svg/SVGImageElement.idl:
     136        * svg/SVGLineElement.cpp:
     137        (WebCore::SVGLineElement::SVGLineElement):
     138        (WebCore::SVGLineElement::parseAttribute):
     139        (WebCore::SVGLineElement::svgAttributeChanged):
     140        * svg/SVGLineElement.h:
     141        * svg/SVGLineElement.idl:
     142        * svg/SVGPathElement.cpp:
     143        (WebCore::SVGPathElement::SVGPathElement):
     144        (WebCore::SVGPathElement::parseAttribute):
     145        (WebCore::SVGPathElement::svgAttributeChanged):
     146        (WebCore::SVGPathElement::insertedInto):
     147        (WebCore::SVGPathElement::removedFrom):
     148        * svg/SVGPathElement.h:
     149        * svg/SVGPathElement.idl:
     150        * svg/SVGPatternElement.cpp:
     151        * svg/SVGPolyElement.cpp:
     152        (WebCore::SVGPolyElement::SVGPolyElement):
     153        (WebCore::SVGPolyElement::parseAttribute):
     154        (WebCore::SVGPolyElement::svgAttributeChanged):
     155        * svg/SVGPolyElement.h:
     156        * svg/SVGPolygonElement.idl:
     157        * svg/SVGPolylineElement.idl:
     158        * svg/SVGRectElement.cpp:
     159        (WebCore::SVGRectElement::SVGRectElement):
     160        (WebCore::SVGRectElement::parseAttribute):
     161        (WebCore::SVGRectElement::svgAttributeChanged):
     162        * svg/SVGRectElement.h:
     163        * svg/SVGRectElement.idl:
     164        * svg/SVGSVGElement.cpp:
     165        (WebCore::SVGSVGElement::SVGSVGElement):
     166        (WebCore::SVGSVGElement::didMoveToNewDocument):
     167        (WebCore::SVGSVGElement::parseAttribute):
     168        (WebCore::SVGSVGElement::insertedInto):
     169        (WebCore::SVGSVGElement::removedFrom):
     170        * svg/SVGSVGElement.h:
     171        * svg/SVGSVGElement.idl:
     172        * svg/SVGStyledElement.cpp:
     173        (WebCore::SVGStyledElement::localCoordinateSpaceTransform):
     174        * svg/SVGSwitchElement.cpp:
     175        (WebCore::SVGSwitchElement::SVGSwitchElement):
     176        * svg/SVGSwitchElement.h:
     177        * svg/SVGSwitchElement.idl:
     178        * svg/SVGUseElement.cpp:
     179        (WebCore::SVGUseElement::SVGUseElement):
     180        (WebCore::SVGUseElement::parseAttribute):
     181        (WebCore::SVGUseElement::insertedInto):
     182        (WebCore::SVGUseElement::removedFrom):
     183        (WebCore::SVGUseElement::svgAttributeChanged):
     184        (WebCore::SVGUseElement::toClipPath):
     185        (WebCore::SVGUseElement::finishParsingChildren):
     186        * svg/SVGUseElement.h:
     187        * svg/SVGUseElement.idl:
     188
    11892013-06-28  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
    2190

  • trunk/Source/WebCore/DerivedSources.cpp

    r152080 r152167  
    418418#include "JSSVGGlyphRefElement.cpp"
    419419#include "JSSVGGradientElement.cpp"
     420#include "JSSVGGraphicsElement.cpp"
    420421#include "JSSVGHKernElement.cpp"
    421422#include "JSSVGImageElement.cpp"

  • trunk/Source/WebCore/DerivedSources.make

    r152156 r152167  
    549549    $(WebCore)/svg/SVGGlyphRefElement.idl \
    550550    $(WebCore)/svg/SVGGradientElement.idl \
     551    $(WebCore)/svg/SVGGraphicsElement.idl \
    551552    $(WebCore)/svg/SVGHKernElement.idl \
    552553    $(WebCore)/svg/SVGImageElement.idl \

  • trunk/Source/WebCore/DerivedSources.pri

    r152120 r152167  
    572572    $$PWD/svg/SVGGlyphRefElement.idl \
    573573    $$PWD/svg/SVGGradientElement.idl \
     574    $$PWD/svg/SVGGraphicsElement.idl \
    574575    $$PWD/svg/SVGHKernElement.idl \
    575576    $$PWD/svg/SVGImageElement.idl \

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

    r152157 r152167  
    10641064        DerivedSources/WebCore/JSSVGGradientElement.cpp \
    10651065        DerivedSources/WebCore/JSSVGGradientElement.h \
     1066        DerivedSources/WebCore/JSSVGGraphicsElement.cpp \
     1067        DerivedSources/WebCore/JSSVGGraphicsElement.h \
    10661068        DerivedSources/WebCore/JSSVGHKernElement.cpp \
    10671069        DerivedSources/WebCore/JSSVGHKernElement.h \
    … …  
    17171719        $(WebCore)/svg/SVGGlyphRefElement.idl \
    17181720        $(WebCore)/svg/SVGGradientElement.idl \
     1721        $(WebCore)/svg/SVGGraphicsElement.idl \
    17191722        $(WebCore)/svg/SVGHKernElement.idl \
    17201723        $(WebCore)/svg/SVGImageElement.idl \
    … …  
    51855188        Source/WebCore/svg/SVGGradientElement.cpp \
    51865189        Source/WebCore/svg/SVGGradientElement.h \
     5190        Source/WebCore/svg/SVGGraphicsElement.cpp \
     5191        Source/WebCore/svg/SVGGraphicsElement.h \
    51875192        Source/WebCore/svg/SVGHKernElement.cpp \
    51885193        Source/WebCore/svg/SVGHKernElement.h \
    … …  
    52965301        Source/WebCore/svg/SVGStyledLocatableElement.cpp \
    52975302        Source/WebCore/svg/SVGStyledLocatableElement.h \
    5298         Source/WebCore/svg/SVGStyledTransformableElement.cpp \
    5299         Source/WebCore/svg/SVGStyledTransformableElement.h \
    53005303        Source/WebCore/svg/SVGSVGElement.cpp \
    53015304        Source/WebCore/svg/SVGSVGElement.h \

  • trunk/Source/WebCore/Target.pri

    r152099 r152167  
    27292729    svg/SVGGlyphRefElement.h \
    27302730    svg/SVGGradientElement.h \
     2731    svg/SVGGraphicsElement.h \
    27312732    svg/SVGHKernElement.h \
    27322733    svg/SVGImageElement.h \
    … …  
    27812782    svg/SVGStyledElement.h \
    27822783    svg/SVGStyledLocatableElement.h \
    2783     svg/SVGStyledTransformableElement.h \
    27842784    svg/SVGSVGElement.h \
    27852785    svg/SVGSwitchElement.h \
    … …  
    37983798        svg/SVGGlyphRefElement.cpp \
    37993799        svg/SVGGradientElement.cpp \
     3800        svg/SVGGraphicsElement.cpp \
    38003801        svg/SVGHKernElement.cpp \
    38013802        svg/SVGImageElement.cpp \
    … …  
    38453846        svg/SVGStyledElement.cpp \
    38463847        svg/SVGStyledLocatableElement.cpp \
    3847         svg/SVGStyledTransformableElement.cpp \
    38483848        svg/SVGSwitchElement.cpp \
    38493849        svg/SVGSymbolElement.cpp \

  • trunk/Source/WebCore/WebCore.order

    r152080 r152167  
    1009310093__ZN7WebCore14SVGRectElement6createERKNS_13QualifiedNameEPNS_8DocumentE
    1009410094__ZN7WebCore14SVGRectElementC1ERKNS_13QualifiedNameEPNS_8DocumentE
    10095 __ZN7WebCore29SVGStyledTransformableElementC2ERKNS_13QualifiedNameEPNS_8DocumentE
     10095__ZN7WebCore29SVGGraphicsElementC2ERKNS_13QualifiedNameEPNS_8DocumentE
    1009610096__ZN7WebCore14SVGRectElement20parseMappedAttributeEPNS_9AttributeE
    10097 __ZN7WebCore29SVGStyledTransformableElement20parseMappedAttributeEPNS_9AttributeE
     10097__ZN7WebCore29SVGGraphicsElement20parseMappedAttributeEPNS_9AttributeE
    1009810098__ZN7WebCore16SVGTransformable16isKnownAttributeERKNS_13QualifiedNameE
    1009910099__ZN7WebCore9CSSParser13parseSVGValueEib
    … …  
    1010210102__ZN7WebCore8SVGColorC2ERKNS0_12SVGColorTypeE
    1010310103__ZN7WebCore14SVGRectElement19svgAttributeChangedERKNS_13QualifiedNameE
    10104 __ZN7WebCore29SVGStyledTransformableElement19svgAttributeChangedERKNS_13QualifiedNameE
     10104__ZN7WebCore29SVGGraphicsElement19svgAttributeChangedERKNS_13QualifiedNameE
    1010510105__ZN7WebCore16SVGStyledElement16isKnownAttributeERKNS_13QualifiedNameE
    1010610106__ZNK7WebCore14SVGRectElement22selfHasRelativeLengthsEv
    … …  
    1011410114__ZN7WebCore13StyleFillDataC1ERKS0_
    1011510115__ZN7WebCore16SVGStyledElement16rendererIsNeededEPNS_11RenderStyleE
    10116 __ZN7WebCore29SVGStyledTransformableElement14createRendererEPNS_11RenderArenaEPNS_11RenderStyleE
    10117 __ZN7WebCore13RenderSVGPathC1EPNS_29SVGStyledTransformableElementE
     10116__ZN7WebCore29SVGGraphicsElement14createRendererEPNS_11RenderArenaEPNS_11RenderStyleE
     10117__ZN7WebCore13RenderSVGPathC1EPNS_29SVGGraphicsElementE
    1011810118__ZN7WebCore20RenderSVGModelObject15styleWillChangeENS_15StyleDifferenceEPKNS_11RenderStyleE
    1011910119__ZN7WebCore20RenderSVGModelObject14styleDidChangeENS_15StyleDifferenceEPKNS_11RenderStyleE
    … …  
    1018110181__ZN7WebCore13RenderSVGPath6layoutEv
    1018210182__ZNK7WebCore14SVGRectElement10toPathDataERNS_4PathE
    10183 __ZNK7WebCore29SVGStyledTransformableElement22animatedLocalTransformEv
     10183__ZNK7WebCore29SVGGraphicsElement22animatedLocalTransformEv
    1018410184__ZNK7WebCore16SVGTransformList11concatenateERNS_15AffineTransformE
    1018510185__ZN7WebCore13RenderSVGPath22updateCachedBoundariesEv
    … …  
    1145211452__ZN7WebCore16JSSVGRectElement18getOwnPropertySlotEPN3JSC9ExecStateERKNS1_10IdentifierERNS1_12PropertySlotE
    1145311453__ZN7WebCore25JSSVGRectElementPrototype18getOwnPropertySlotEPN3JSC9ExecStateERKNS1_10IdentifierERNS1_12PropertySlotE
    11454 __ZNK7WebCore29SVGStyledTransformableElement7getBBoxENS_12SVGLocatable19StyleUpdateStrategyE
     11454__ZNK7WebCore29SVGGraphicsElement7getBBoxENS_12SVGLocatable19StyleUpdateStrategyE
    1145511455__ZNK7WebCore20RenderSVGModelObject19mapLocalToContainerEPNS_20RenderBoxModelObjectEbbRNS_14TransformStateE
    1145611456__ZN7WebCoreL28createSVGImageElementWrapperEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEN3WTF10PassRefPtrINS_10SVGElementEEE
    … …  
    1156911569__ZN7WebCore10SVGElementD2Ev
    1157011570__ZN7WebCore14SVGRectElementD0Ev
    11571 __ZN7WebCore29SVGStyledTransformableElementD2Ev
     11571__ZN7WebCore29SVGGraphicsElementD2Ev
    1157211572__ZN7WebCore16SVGTransformableD2Ev
    1157311573__ZN7WebCore15SVGImageElementD0Ev
    … …  
    1581415814__ZN7WebCore11SVGAElement14createRendererEPNS_11RenderArenaEPNS_11RenderStyleE
    1581515815__ZNK7WebCore10SVGElement13isTextContentEv
    15816 __ZN7WebCore31RenderSVGTransformableContainerC1EPNS_29SVGStyledTransformableElementE
     15816__ZN7WebCore31RenderSVGTransformableContainerC1EPNS_29SVGGraphicsElementE
    1581715817__ZNK7WebCore18RenderSVGContainer15virtualChildrenEv
    1581815818__ZNK7WebCore11SVGAElement25childShouldCreateRendererEPNS_4NodeE
    … …  
    1647016470__ZN7WebCore14SVGRectElement26attributeToPropertyTypeMapEv
    1647116471__ZN7WebCore14SVGRectElement30fillAttributeToPropertyTypeMapEv
    16472 __ZN7WebCore29SVGStyledTransformableElement36fillPassedAttributeToPropertyTypeMapERN3WTF7HashMapINS_13QualifiedNameENS_21AnimatedAttributeTypeENS_17QualifiedNameHashENS1_10HashTraitsIS3_EENS6_IS4_EEEE
     16472__ZN7WebCore29SVGGraphicsElement36fillPassedAttributeToPropertyTypeMapERN3WTF7HashMapINS_13QualifiedNameENS_21AnimatedAttributeTypeENS_17QualifiedNameHashENS1_10HashTraitsIS3_EENS6_IS4_EEEE
    1647316473__ZN7WebCore16SVGStyledElement36fillPassedAttributeToPropertyTypeMapERN3WTF7HashMapINS_13QualifiedNameENS_21AnimatedAttributeTypeENS_17QualifiedNameHashENS1_10HashTraitsIS3_EENS6_IS4_EEEE
    1647416474__ZN3WTF9HashTableIN7WebCore13QualifiedNameESt4pairIS2_NS1_21AnimatedAttributeTypeEENS_18PairFirstExtractorIS5_EENS1_17QualifiedNameHashENS_14PairHashTraitsINS_10HashTraitsIS2_EENSA_IS4_EEEESB_E13allocateTableEi
    … …  
    2689526895__ZThn8_N7WebCore17MathMLTextElementD0Ev
    2689626896__ZN7WebCore17MathMLTextElementD0Ev
     26897__ZN7WebCore29JSSVGGraphicsElementPrototype4selfEPN3JSC9ExecStateEPNS1_14JSGlobalObjectE
     26898__ZN7WebCore20JSSVGGraphicsElement18getOwnPropertySlotEPN3JSC6JSCellEPNS1_9ExecStateENS1_12PropertyNameERNS1_12PropertySlotE
     26899__ZN7WebCore20JSSVGGraphicsElement14getConstructorEPN3JSC9ExecStateEPNS1_14JSGlobalObjectE
    2689726900__ZN7WebCoreL36createSVGForeignObjectElementWrapperEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEN3WTF10PassRefPtrINS_10SVGElementEEE
    2689826901__ZN7WebCore13createWrapperINS_25JSSVGForeignObjectElementENS_23SVGForeignObjectElementEEEPNS_12JSDOMWrapperEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPT0_
    … …  
    2862228625__ZN7WebCore24RenderSVGHiddenContainer29clippedOverflowRectForRepaintEPNS_20RenderBoxModelObjectE
    2862328626__ZN7WebCore22jsSVGGElementTransformEPN3JSC9ExecStateENS0_7JSValueERKNS0_10IdentifierE
    28624 __ZN7WebCore29SVGStyledTransformableElement17transformAnimatedEv
     28627__ZN7WebCore29SVGGraphicsElement17transformAnimatedEv
    2862528628__ZN7WebCore19SVGAnimatedProperty21lookupOrCreateWrapperINS_39SVGAnimatedTransformListPropertyTearOffENS_16SVGTransformListEEEN3WTF10PassRefPtrIT_EEPNS_10SVGElementERKNS_13QualifiedNameERKNS4_12AtomicStringERT0_
    2862628629__ZN7WebCore30SVGAnimatedListPropertyTearOffINS_16SVGTransformListEEC2EPNS_10SVGElementERKNS_13QualifiedNameERS1_
    … …  
    2915329156__ZNK7WebCore14SVGTextElement29localCoordinateSpaceTransformENS_12SVGLocatable8CTMScopeE
    2915429157__ZThn504_NK7WebCore14SVGTextElement22animatedLocalTransformEv
    29155 __ZNK7WebCore29SVGStyledTransformableElement29localCoordinateSpaceTransformENS_12SVGLocatable8CTMScopeE
    29156 __ZThn168_NK7WebCore29SVGStyledTransformableElement22animatedLocalTransformEv
     29158__ZNK7WebCore29SVGGraphicsElement29localCoordinateSpaceTransformENS_12SVGLocatable8CTMScopeE
     29159__ZThn168_NK7WebCore29SVGGraphicsElement22animatedLocalTransformEv
    2915729160__ZNK7WebCore13SVGSVGElement29localCoordinateSpaceTransformENS_12SVGLocatable8CTMScopeE
    2915829161__ZN7WebCore39jsSVGTextElementPrototypeFunctionGetCTMEPN3JSC9ExecStateE
    … …  
    2916229165__ZNK7WebCore12SVGLocatable21getTransformToElementEPNS_10SVGElementERiNS0_19StyleUpdateStrategyE
    2916329166__ZTv0_n56_NK7WebCore14SVGTextElement6getCTMENS_12SVGLocatable19StyleUpdateStrategyE
    29164 __ZNK7WebCore29SVGStyledTransformableElement6getCTMENS_12SVGLocatable19StyleUpdateStrategyE
     29167__ZNK7WebCore29SVGGraphicsElement6getCTMENS_12SVGLocatable19StyleUpdateStrategyE
    2916529168__ZN7WebCore42jsSVGCircleElementPrototypeFunctionGetBBoxEPN3JSC9ExecStateE
    2916629169__ZN7WebCore41jsSVGCircleElementFarthestViewportElementEPN3JSC9ExecStateENS0_7JSValueERKNS0_10IdentifierE
    29167 __ZNK7WebCore29SVGStyledTransformableElement23farthestViewportElementEv
     29170__ZNK7WebCore29SVGGraphicsElement23farthestViewportElementEv
    2916829171__ZN7WebCore12SVGLocatable23farthestViewportElementEPKNS_10SVGElementE
    2916929172__ZN7WebCore40jsSVGCircleElementNearestViewportElementEPN3JSC9ExecStateENS0_7JSValueERKNS0_10IdentifierE
    29170 __ZNK7WebCore29SVGStyledTransformableElement22nearestViewportElementEv
     29173__ZNK7WebCore29SVGGraphicsElement22nearestViewportElementEv
    2917129174__ZN7WebCore26RenderSVGViewportContainer17applyViewportClipERNS_9PaintInfoE
    2917229175__ZN7WebCore18SVGPropertyTearOffINS_9FloatRectEED0Ev
    … …  
    2924329246__ZN7WebCore15SVGListPropertyINS_13SVGStringListEE22insertItemBeforeValuesERS1_RKN3WTF6StringEjRi
    2924429247__ZN7WebCore14SVGRectElement19synchronizePropertyERKNS_13QualifiedNameE
    29245 __ZN7WebCore29SVGStyledTransformableElement19synchronizePropertyERKNS_13QualifiedNameE
     29248__ZN7WebCore29SVGGraphicsElement19synchronizePropertyERKNS_13QualifiedNameE
    2924629249__ZN7WebCore16SVGStyledElement19synchronizePropertyERKNS_13QualifiedNameE
    2924729250__ZN7WebCore16SVGStyledElement20synchronizeClassNameEv
    29248 __ZN7WebCore29SVGStyledTransformableElement20synchronizeTransformEv
     29251__ZN7WebCore29SVGGraphicsElement20synchronizeTransformEv
    2924929252__ZN7WebCore14SVGRectElement12synchronizeXEv
    2925029253__ZN7WebCore14SVGRectElement12synchronizeYEv
    … …  
    2928529288__ZNK7WebCore13ColorDistance18addToColorAndClampERKNS_5ColorE
    2928629289__ZN7WebCore23SVGAnimateMotionElement20parseMappedAttributeEPNS_9AttributeE
    29287 __ZNK7WebCore29SVGStyledTransformableElement21isStyledTransformableEv
     29290__ZNK7WebCore29SVGGraphicsElement21isStyledTransformableEv
    2928829291__ZN7WebCore23SVGAnimateMotionElement16resetToBaseValueERKN3WTF6StringE
    29289 __ZN7WebCore29SVGStyledTransformableElement21supplementalTransformEv
     29292__ZN7WebCore29SVGGraphicsElement21supplementalTransformEv
    2929029293__ZNK7WebCore23SVGAnimateMotionElement13animationPathEv
    2929129294__ZN7WebCore23SVGAnimateMotionElement24calculateFromAndToValuesERKN3WTF6StringES4_
    … …  
    2950629509__ZN3WTF9HashTableIPN7WebCore12RenderObjectESt4pairIS3_PNS1_11ClipperDataEENS_18PairFirstExtractorIS7_EENS_7PtrHashIS3_EENS_14PairHashTraitsINS_10HashTraitsIS3_EENSD_IS6_EEEESE_E6rehashEi
    2950729510__ZN7WebCore24RenderSVGResourceClipper16pathOnlyClippingEPNS_15GraphicsContextERKNS_9FloatRectE
    29508 __ZNK7WebCore29SVGStyledTransformableElement10toClipPathERNS_4PathE
     29511__ZNK7WebCore29SVGGraphicsElement10toClipPathERNS_4PathE
    2950929512__ZN7WebCore24RenderSVGResourceClipper24drawContentIntoMaskImageEPNS_11ClipperDataERKNS_9FloatRectE
    2951029513__ZNK7WebCore12RenderObject28isSVGShadowTreeRootContainerEv
    … …  
    2999830001__ZN7WebCore24RenderSVGHiddenContainer16nodeAtFloatPointERKNS_14HitTestRequestERNS_13HitTestResultERKNS_10FloatPointENS_13HitTestActionE
    2999930002__ZN7WebCore26RenderSVGResourceContainer9idChangedEv
    30000 __ZN7WebCore29SVGStyledTransformableElement16isKnownAttributeERKNS_13QualifiedNameE
     30003__ZN7WebCore29SVGGraphicsElement16isKnownAttributeERKNS_13QualifiedNameE
    3000130004__ZN7WebCore33jsSVGClipPathElementClipPathUnitsEPN3JSC9ExecStateENS0_7JSValueERKNS0_10IdentifierE
    3000230005__ZN7WebCore18SVGClipPathElement21clipPathUnitsAnimatedEv
    … …  
    3008530088__ZN7WebCore28jsSVGTextContentElementStyleEPN3JSC9ExecStateENS0_7JSValueERKNS0_10IdentifierE
    3008630089__ZN7WebCore45jsSVGRectElementPrototypeFunctionGetScreenCTMEPN3JSC9ExecStateE
    30087 __ZNK7WebCore29SVGStyledTransformableElement12getScreenCTMENS_12SVGLocatable19StyleUpdateStrategyE
     30090__ZNK7WebCore29SVGGraphicsElement12getScreenCTMENS_12SVGLocatable19StyleUpdateStrategyE
    3008830091__ZN7WebCore44jsSVGSVGElementPrototypeFunctionGetScreenCTMEPN3JSC9ExecStateE
    3008930092__ZNK7WebCore25SVGStyledLocatableElement12getScreenCTMENS_12SVGLocatable19StyleUpdateStrategyE
    … …  
    3551835521__ZTVN7WebCore11SVGAElementE
    3551935522__ZTTN7WebCore11SVGAElementE
    35520 __ZTCN7WebCore11SVGAElementE0_NS_29SVGStyledTransformableElementE
     35523__ZTCN7WebCore11SVGAElementE0_NS_29SVGGraphicsElementE
    3552135524__ZTCN7WebCore11SVGAElementE0_NS_25SVGStyledLocatableElementE
    3552235525__ZTCN7WebCore11SVGAElementE144_NS_16SVGTransformableE
    … …  
    3554735550__ZTVN7WebCore16SVGCircleElementE
    3554835551__ZTTN7WebCore16SVGCircleElementE
    35549 __ZTCN7WebCore16SVGCircleElementE0_NS_29SVGStyledTransformableElementE
     35552__ZTCN7WebCore16SVGCircleElementE0_NS_29SVGGraphicsElementE
    3555035553__ZTCN7WebCore16SVGCircleElementE0_NS_25SVGStyledLocatableElementE
    3555135554__ZTCN7WebCore16SVGCircleElementE144_NS_16SVGTransformableE
    3555235555__ZTVN7WebCore18SVGClipPathElementE
    3555335556__ZTTN7WebCore18SVGClipPathElementE
    35554 __ZTCN7WebCore18SVGClipPathElementE0_NS_29SVGStyledTransformableElementE
     35557__ZTCN7WebCore18SVGClipPathElementE0_NS_29SVGGraphicsElementE
    3555535558__ZTCN7WebCore18SVGClipPathElementE0_NS_25SVGStyledLocatableElementE
    3555635559__ZTCN7WebCore18SVGClipPathElementE144_NS_16SVGTransformableE
    … …  
    3555935562__ZTVN7WebCore14SVGDefsElementE
    3556035563__ZTTN7WebCore14SVGDefsElementE
    35561 __ZTCN7WebCore14SVGDefsElementE0_NS_29SVGStyledTransformableElementE
     35564__ZTCN7WebCore14SVGDefsElementE0_NS_29SVGGraphicsElementE
    3556235565__ZTCN7WebCore14SVGDefsElementE0_NS_25SVGStyledLocatableElementE
    3556335566__ZTCN7WebCore14SVGDefsElementE144_NS_16SVGTransformableE
    … …  
    3556835571__ZTVN7WebCore17SVGEllipseElementE
    3556935572__ZTTN7WebCore17SVGEllipseElementE
    35570 __ZTCN7WebCore17SVGEllipseElementE0_NS_29SVGStyledTransformableElementE
     35573__ZTCN7WebCore17SVGEllipseElementE0_NS_29SVGGraphicsElementE
    3557135574__ZTCN7WebCore17SVGEllipseElementE0_NS_25SVGStyledLocatableElementE
    3557235575__ZTCN7WebCore17SVGEllipseElementE144_NS_16SVGTransformableE
    … …  
    3560535608__ZTVN7WebCore23SVGForeignObjectElementE
    3560635609__ZTTN7WebCore23SVGForeignObjectElementE
    35607 __ZTCN7WebCore23SVGForeignObjectElementE0_NS_29SVGStyledTransformableElementE
     35610__ZTCN7WebCore23SVGForeignObjectElementE0_NS_29SVGGraphicsElementE
    3560835611__ZTCN7WebCore23SVGForeignObjectElementE0_NS_25SVGStyledLocatableElementE
    3560935612__ZTCN7WebCore23SVGForeignObjectElementE144_NS_16SVGTransformableE
    3561035613__ZTVN7WebCore11SVGGElementE
    3561135614__ZTTN7WebCore11SVGGElementE
    35612 __ZTCN7WebCore11SVGGElementE0_NS_29SVGStyledTransformableElementE
     35615__ZTCN7WebCore11SVGGElementE0_NS_29SVGGraphicsElementE
    3561335616__ZTCN7WebCore11SVGGElementE0_NS_25SVGStyledLocatableElementE
    3561435617__ZTCN7WebCore11SVGGElementE144_NS_16SVGTransformableE
    … …  
    3562035623__ZTVN7WebCore15SVGImageElementE
    3562135624__ZTTN7WebCore15SVGImageElementE
    35622 __ZTCN7WebCore15SVGImageElementE0_NS_29SVGStyledTransformableElementE
     35625__ZTCN7WebCore15SVGImageElementE0_NS_29SVGGraphicsElementE
    3562335626__ZTCN7WebCore15SVGImageElementE0_NS_25SVGStyledLocatableElementE
    3562435627__ZTCN7WebCore15SVGImageElementE144_NS_16SVGTransformableE
    … …  
    3562735630__ZTVN7WebCore14SVGLineElementE
    3562835631__ZTTN7WebCore14SVGLineElementE
    35629 __ZTCN7WebCore14SVGLineElementE0_NS_29SVGStyledTransformableElementE
     35632__ZTCN7WebCore14SVGLineElementE0_NS_29SVGGraphicsElementE
    3563035633__ZTCN7WebCore14SVGLineElementE0_NS_25SVGStyledLocatableElementE
    3563135634__ZTCN7WebCore14SVGLineElementE144_NS_16SVGTransformableE
    … …  
    3563835641__ZTVN7WebCore14SVGPathElementE
    3563935642__ZTTN7WebCore14SVGPathElementE
    35640 __ZTCN7WebCore14SVGPathElementE0_NS_29SVGStyledTransformableElementE
     35643__ZTCN7WebCore14SVGPathElementE0_NS_29SVGGraphicsElementE
    3564135644__ZTCN7WebCore14SVGPathElementE0_NS_25SVGStyledLocatableElementE
    3564235645__ZTCN7WebCore14SVGPathElementE144_NS_16SVGTransformableE
    … …  
    3565035653__ZTVN7WebCore14SVGPolyElementE
    3565135654__ZTTN7WebCore14SVGPolyElementE
    35652 __ZTCN7WebCore14SVGPolyElementE0_NS_29SVGStyledTransformableElementE
     35655__ZTCN7WebCore14SVGPolyElementE0_NS_29SVGGraphicsElementE
    3565335656__ZTCN7WebCore14SVGPolyElementE0_NS_25SVGStyledLocatableElementE
    3565435657__ZTCN7WebCore14SVGPolyElementE144_NS_16SVGTransformableE
    … …  
    3565635659__ZTVN7WebCore14SVGRectElementE
    3565735660__ZTTN7WebCore14SVGRectElementE
    35658 __ZTCN7WebCore14SVGRectElementE0_NS_29SVGStyledTransformableElementE
     35661__ZTCN7WebCore14SVGRectElementE0_NS_29SVGGraphicsElementE
    3565935662__ZTCN7WebCore14SVGRectElementE0_NS_25SVGStyledLocatableElementE
    3566035663__ZTCN7WebCore14SVGRectElementE144_NS_16SVGTransformableE
    … …  
    3566635669__ZTVN7WebCore16SVGStyledElementE
    3566735670__ZTVN7WebCore25SVGStyledLocatableElementE
    35668 __ZTVN7WebCore29SVGStyledTransformableElementE
    35669 __ZTTN7WebCore29SVGStyledTransformableElementE
    35670 __ZTCN7WebCore29SVGStyledTransformableElementE0_NS_25SVGStyledLocatableElementE
    35671 __ZTCN7WebCore29SVGStyledTransformableElementE144_NS_16SVGTransformableE
     35671__ZTVN7WebCore29SVGGraphicsElementE
     35672__ZTTN7WebCore29SVGGraphicsElementE
     35673__ZTCN7WebCore29SVGGraphicsElementE0_NS_25SVGStyledLocatableElementE
     35674__ZTCN7WebCore29SVGGraphicsElementE144_NS_16SVGTransformableE
    3567235675__ZTVN7WebCore15SVGStyleElementE
    3567335676__ZTVN7WebCore13SVGSVGElementE
    … …  
    3567635679__ZTVN7WebCore16SVGSwitchElementE
    3567735680__ZTTN7WebCore16SVGSwitchElementE
    35678 __ZTCN7WebCore16SVGSwitchElementE0_NS_29SVGStyledTransformableElementE
     35681__ZTCN7WebCore16SVGSwitchElementE0_NS_29SVGGraphicsElementE
    3567935682__ZTCN7WebCore16SVGSwitchElementE0_NS_25SVGStyledLocatableElementE
    3568035683__ZTCN7WebCore16SVGSwitchElementE144_NS_16SVGTransformableE
    … …  
    3569235695__ZTVN7WebCore13SVGUseElementE
    3569335696__ZTTN7WebCore13SVGUseElementE
    35694 __ZTCN7WebCore13SVGUseElementE0_NS_29SVGStyledTransformableElementE
     35697__ZTCN7WebCore13SVGUseElementE0_NS_29SVGGraphicsElementE
    3569535698__ZTCN7WebCore13SVGUseElementE0_NS_25SVGStyledLocatableElementE
    3569635699__ZTCN7WebCore13SVGUseElementE144_NS_16SVGTransformableE
    … …  
    3835438357__ZTTN7WebCore17SVGPolygonElementE
    3835538358__ZTCN7WebCore17SVGPolygonElementE0_NS_14SVGPolyElementE
    38356 __ZTCN7WebCore17SVGPolygonElementE0_NS_29SVGStyledTransformableElementE
     38359__ZTCN7WebCore17SVGPolygonElementE0_NS_29SVGGraphicsElementE
    3835738360__ZTCN7WebCore17SVGPolygonElementE0_NS_25SVGStyledLocatableElementE
    3835838361__ZTCN7WebCore17SVGPolygonElementE144_NS_16SVGTransformableE
    … …  
    3836038363__ZTTN7WebCore18SVGPolylineElementE
    3836138364__ZTCN7WebCore18SVGPolylineElementE0_NS_14SVGPolyElementE
    38362 __ZTCN7WebCore18SVGPolylineElementE0_NS_29SVGStyledTransformableElementE
     38365__ZTCN7WebCore18SVGPolylineElementE0_NS_29SVGGraphicsElementE
    3836338366__ZTCN7WebCore18SVGPolylineElementE0_NS_25SVGStyledLocatableElementE
    3836438367__ZTCN7WebCore18SVGPolylineElementE144_NS_16SVGTransformableE
    … …  
    4154841551__ZGVZN7WebCore16SVGStyledElement22attributeToPropertyMapEvE24s_attributeToPropertyMap.b
    4154941552__ZZN7WebCore16SVGStyledElement32cssPropertyIdForSVGAttributeNameERKNS_13QualifiedNameEE19propertyNameToIdMap
    41550 __ZZN7WebCore29SVGStyledTransformableElement21transformPropertyInfoEvE14s_propertyInfo
    41551 __ZGVZN7WebCore29SVGStyledTransformableElement21transformPropertyInfoEvE14s_propertyInfo.b
    41552 __ZZN7WebCore29SVGStyledTransformableElement22attributeToPropertyMapEvE24s_attributeToPropertyMap
    41553 __ZGVZN7WebCore29SVGStyledTransformableElement22attributeToPropertyMapEvE24s_attributeToPropertyMap.b
    41554 __ZZN7WebCore29SVGStyledTransformableElement20isSupportedAttributeERKNS_13QualifiedNameEE19supportedAttributes
    41555 __ZGVZN7WebCore29SVGStyledTransformableElement20isSupportedAttributeERKNS_13QualifiedNameEE19supportedAttributes.b
     41553__ZZN7WebCore29SVGGraphicsElement21transformPropertyInfoEvE14s_propertyInfo
     41554__ZGVZN7WebCore29SVGGraphicsElement21transformPropertyInfoEvE14s_propertyInfo.b
     41555__ZZN7WebCore29SVGGraphicsElement22attributeToPropertyMapEvE24s_attributeToPropertyMap
     41556__ZGVZN7WebCore29SVGGraphicsElement22attributeToPropertyMapEvE24s_attributeToPropertyMap.b
     41557__ZZN7WebCore29SVGGraphicsElement20isSupportedAttributeERKNS_13QualifiedNameEE19supportedAttributes
     41558__ZGVZN7WebCore29SVGGraphicsElement20isSupportedAttributeERKNS_13QualifiedNameEE19supportedAttributes.b
    4155641559__ZZN7WebCore13SVGSVGElement13xPropertyInfoEvE14s_propertyInfo
    4155741560__ZGVZN7WebCore13SVGSVGElement13xPropertyInfoEvE14s_propertyInfo.b

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

    r152080 r152167  
    29102910    </ClCompile>
    29112911    <ClCompile Include="$(ConfigurationBuildDir)\obj32\$(ProjectName)\DerivedSources\JSSVGGradientElement.cpp">
     2912      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
     2913      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
     2914      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
     2915      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     2916      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
     2917      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
     2918    </ClCompile>
     2919    <ClCompile Include="$(ConfigurationBuildDir)\obj32\$(ProjectName)\DerivedSources\JSSVGGraphicsElement.cpp">
    29122920      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
    29132921      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
    … …  
    1122211230    <ClInclude Include="$(ConfigurationBuildDir)\obj32\$(ProjectName)\DerivedSources\JSSVGGlyphRefElement.h" />
    1122311231    <ClInclude Include="$(ConfigurationBuildDir)\obj32\$(ProjectName)\DerivedSources\JSSVGGradientElement.h" />
     11232    <ClInclude Include="$(ConfigurationBuildDir)\obj32\$(ProjectName)\DerivedSources\JSSVGGraphicsElement.h" />
    1122411233    <ClInclude Include="$(ConfigurationBuildDir)\obj32\$(ProjectName)\DerivedSources\JSSVGHKernElement.h" />
    1122511234    <ClInclude Include="$(ConfigurationBuildDir)\obj32\$(ProjectName)\DerivedSources\JSSVGImageElement.h" />
    … …  
    1342113430    <ClInclude Include="..\svg\SVGStyledElement.h" />
    1342213431    <ClInclude Include="..\svg\SVGStyledLocatableElement.h" />
    13423     <ClInclude Include="..\svg\SVGStyledTransformableElement.h" />
     13432    <ClInclude Include="..\svg\SVGGraphicsElement.h" />
    1342413433    <ClInclude Include="..\svg\SVGStyleElement.h" />
    1342513434    <ClInclude Include="..\svg\SVGSVGElement.h" />

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

    r152080 r152167  
    1210012100      <Filter>rendering\svg</Filter>
    1210112101    </ClInclude>
    12102     <ClInclude Include="..\svg\SVGStyledTransformableElement.h">
     12102    <ClInclude Include="..\svg\SVGGraphicsElement.h">
    1210312103      <Filter>rendering\svg</Filter>
    1210412104    </ClInclude>
    … …  
    1412214122    </ClInclude>
    1412314123    <ClInclude Include="$(ConfigurationBuildDir)\obj32\$(ProjectName)\DerivedSources\JSSVGGradientElement.h">
     14124      <Filter>DerivedSources</Filter>
     14125    </ClInclude>
     14126    <ClInclude Include="$(ConfigurationBuildDir)\obj32\$(ProjectName)\DerivedSources\JSSVGGraphicsElement.h">
    1412414127      <Filter>DerivedSources</Filter>
    1412514128    </ClInclude>

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

    r152156 r152167  
    40894089                B2227AB30D00BF220071B782 /* SVGStyledLocatableElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B222791D0D00BF210071B782 /* SVGStyledLocatableElement.cpp */; };
    40904090                B2227AB40D00BF220071B782 /* SVGStyledLocatableElement.h in Headers */ = {isa = PBXBuildFile; fileRef = B222791E0D00BF210071B782 /* SVGStyledLocatableElement.h */; };
    4091                 B2227AB50D00BF220071B782 /* SVGStyledTransformableElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B222791F0D00BF210071B782 /* SVGStyledTransformableElement.cpp */; };
    4092                 B2227AB60D00BF220071B782 /* SVGStyledTransformableElement.h in Headers */ = {isa = PBXBuildFile; fileRef = B22279200D00BF210071B782 /* SVGStyledTransformableElement.h */; };
     4091                B2227AB50D00BF220071B782 /* SVGGraphicsElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B222791F0D00BF210071B782 /* SVGGraphicsElement.cpp */; };
     4092                B2227AB60D00BF220071B782 /* SVGGraphicsElement.h in Headers */ = {isa = PBXBuildFile; fileRef = B22279200D00BF210071B782 /* SVGGraphicsElement.h */; };
    40934093                B2227AB70D00BF220071B782 /* SVGStyleElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B22279210D00BF210071B782 /* SVGStyleElement.cpp */; };
    40944094                B2227AB70D00BF220071B783 /* SVGStyledElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B22279210D00BF210071B783 /* SVGStyledElement.cpp */; };
    … …  
    43934393                B2FA3D9C0AB75A6F000E5AC4 /* JSSVGGradientElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2FA3CB40AB75A6E000E5AC4 /* JSSVGGradientElement.cpp */; };
    43944394                B2FA3D9D0AB75A6F000E5AC4 /* JSSVGGradientElement.h in Headers */ = {isa = PBXBuildFile; fileRef = B2FA3CB50AB75A6E000E5AC4 /* JSSVGGradientElement.h */; };
     4395                85174EC2BCCAF17EAE3F46F8 /* JSSVGGraphicsElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5A91469E8E9F8485C37A2876 /* JSSVGGraphicsElement.cpp */; };
     4396                7BE7427381FA906FBB4F0F2C /* JSSVGGraphicsElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 950C4C02BED8936F818E2F99 /* JSSVGGraphicsElement.h */; };
    43954397                B2FA3D9E0AB75A6F000E5AC4 /* JSSVGImageElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2FA3CB60AB75A6E000E5AC4 /* JSSVGImageElement.cpp */; };
    43964398                B2FA3D9F0AB75A6F000E5AC4 /* JSSVGImageElement.h in Headers */ = {isa = PBXBuildFile; fileRef = B2FA3CB70AB75A6E000E5AC4 /* JSSVGImageElement.h */; };
    … …  
    1072710729                B222791D0D00BF210071B782 /* SVGStyledLocatableElement.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SVGStyledLocatableElement.cpp; sourceTree = "<group>"; };
    1072810730                B222791E0D00BF210071B782 /* SVGStyledLocatableElement.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SVGStyledLocatableElement.h; sourceTree = "<group>"; };
    10729                 B222791F0D00BF210071B782 /* SVGStyledTransformableElement.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SVGStyledTransformableElement.cpp; sourceTree = "<group>"; };
    10730                 B22279200D00BF210071B782 /* SVGStyledTransformableElement.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SVGStyledTransformableElement.h; sourceTree = "<group>"; };
     10731                B222791F0D00BF210071B782 /* SVGGraphicsElement.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SVGGraphicsElement.cpp; sourceTree = "<group>"; };
     10732                B22279200D00BF210071B782 /* SVGGraphicsElement.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SVGGraphicsElement.h; sourceTree = "<group>"; };
    1073110733                B22279210D00BF210071B782 /* SVGStyleElement.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SVGStyleElement.cpp; sourceTree = "<group>"; };
    1073210734                B22279210D00BF210071B783 /* SVGStyledElement.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SVGStyledElement.cpp; sourceTree = "<group>"; };
    … …  
    1106411066                B2FA3CB40AB75A6E000E5AC4 /* JSSVGGradientElement.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSSVGGradientElement.cpp; sourceTree = "<group>"; };
    1106511067                B2FA3CB50AB75A6E000E5AC4 /* JSSVGGradientElement.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSSVGGradientElement.h; sourceTree = "<group>"; };
     11068                5A91469E8E9F8485C37A2876 /* JSSVGGraphicsElement.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSSVGGraphicsElement.cpp; sourceTree = "<group>"; };
     11069                950C4C02BED8936F818E2F99 /* JSSVGGraphicsElement.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSSVGGraphicsElement.h; sourceTree = "<group>"; };
    1106611070                B2FA3CB60AB75A6E000E5AC4 /* JSSVGImageElement.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSSVGImageElement.cpp; sourceTree = "<group>"; };
    1106711071                B2FA3CB70AB75A6E000E5AC4 /* JSSVGImageElement.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSSVGImageElement.h; sourceTree = "<group>"; };
    … …  
    1705917063                                B2FA3CB40AB75A6E000E5AC4 /* JSSVGGradientElement.cpp */,
    1706017064                                B2FA3CB50AB75A6E000E5AC4 /* JSSVGGradientElement.h */,
     17065                                5A91469E8E9F8485C37A2876 /* JSSVGGraphicsElement.cpp */,
     17066                                950C4C02BED8936F818E2F99 /* JSSVGGraphicsElement.h */,
    1706117067                                848522771190162C006EDC7F /* JSSVGHKernElement.cpp */,
    1706217068                                848522781190162C006EDC7F /* JSSVGHKernElement.h */,
    … …  
    1812918135                                B222791D0D00BF210071B782 /* SVGStyledLocatableElement.cpp */,
    1813018136                                B222791E0D00BF210071B782 /* SVGStyledLocatableElement.h */,
    18131                                 B222791F0D00BF210071B782 /* SVGStyledTransformableElement.cpp */,
    18132                                 B22279200D00BF210071B782 /* SVGStyledTransformableElement.h */,
     18137                                B222791F0D00BF210071B782 /* SVGGraphicsElement.cpp */,
     18138                                B22279200D00BF210071B782 /* SVGGraphicsElement.h */,
    1813318139                                B22279210D00BF210071B782 /* SVGStyleElement.cpp */,
    1813418140                                B22279220D00BF210071B782 /* SVGStyleElement.h */,
    … …  
    2259922605                                24D9129A13CA971400D21915 /* JSSVGGlyphRefElement.h in Headers */,
    2260022606                                B2FA3D9D0AB75A6F000E5AC4 /* JSSVGGradientElement.h in Headers */,
     22607                                7BE7427381FA906FBB4F0F2C /* JSSVGGraphicsElement.h in Headers */,
    2260122608                                8485227C1190162C006EDC7F /* JSSVGHKernElement.h in Headers */,
    2260222609                                B2FA3D9F0AB75A6F000E5AC4 /* JSSVGImageElement.h in Headers */,
    … …  
    2367323680                                B2227AB80D00BF220071B783 /* SVGStyledElement.h in Headers */,
    2367423681                                B2227AB40D00BF220071B782 /* SVGStyledLocatableElement.h in Headers */,
    23675                                 B2227AB60D00BF220071B782 /* SVGStyledTransformableElement.h in Headers */,
     23682                                B2227AB60D00BF220071B782 /* SVGGraphicsElement.h in Headers */,
    2367623683                                B2227AB80D00BF220071B782 /* SVGStyleElement.h in Headers */,
    2367723684                                B2227ABB0D00BF220071B782 /* SVGSVGElement.h in Headers */,
    … …  
    2578825795                                24D9129813CA96DE00D21915 /* JSSVGGlyphRefElement.cpp in Sources */,
    2578925796                                B2FA3D9C0AB75A6F000E5AC4 /* JSSVGGradientElement.cpp in Sources */,
     25797                                85174EC2BCCAF17EAE3F46F8 /* JSSVGGraphicsElement.cpp in Sources */,
    2579025798                                8485227B1190162C006EDC7F /* JSSVGHKernElement.cpp in Sources */,
    2579125799                                B2FA3D9E0AB75A6F000E5AC4 /* JSSVGImageElement.cpp in Sources */,
    … …  
    2670126709                                B2227AB70D00BF220071B783 /* SVGStyledElement.cpp in Sources */,
    2670226710                                B2227AB30D00BF220071B782 /* SVGStyledLocatableElement.cpp in Sources */,
    26703                                 B2227AB50D00BF220071B782 /* SVGStyledTransformableElement.cpp in Sources */,
     26711                                B2227AB50D00BF220071B782 /* SVGGraphicsElement.cpp in Sources */,
    2670426712                                B2227AB70D00BF220071B782 /* SVGStyleElement.cpp in Sources */,
    2670526713                                B2227ABA0D00BF220071B782 /* SVGSVGElement.cpp in Sources */,

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

    r152100 r152167  
    14971497        || $typename eq "SVGSVGElement"
    14981498        || $typename eq "SVGStyledLocatableElement"
    1499         || $typename eq "SVGStyledTransformableElement"
     1499        || $typename eq "SVGGraphicsElement"
    15001500        || $typename eq "SVGSwitchElement"
    15011501        || $typename eq "SVGTextElement"

  • trunk/Source/WebCore/rendering/svg/RenderSVGEllipse.cpp

    r122424 r152167  
    3232#include "SVGCircleElement.h"
    3333#include "SVGEllipseElement.h"
     34#include "SVGGraphicsElement.h"
    3435#include "SVGNames.h"
    35 #include "SVGStyledTransformableElement.h"
    3636
    3737namespace WebCore {
    3838
    39 RenderSVGEllipse::RenderSVGEllipse(SVGStyledTransformableElement* node)
     39RenderSVGEllipse::RenderSVGEllipse(SVGGraphicsElement* node)
    4040    : RenderSVGShape(node)
    4141    , m_usePathFallback(false)

  • trunk/Source/WebCore/rendering/svg/RenderSVGEllipse.h

    r150312 r152167  
    3030#if ENABLE(SVG)
    3131#include "RenderSVGShape.h"
    32 #include "SVGStyledTransformableElement.h"
     32#include "SVGGraphicsElement.h"
    3333
    3434namespace WebCore {
    … …  
    3636class RenderSVGEllipse : public RenderSVGShape {
    3737public:
    38     explicit RenderSVGEllipse(SVGStyledTransformableElement*);
     38    explicit RenderSVGEllipse(SVGGraphicsElement*);
    3939    virtual ~RenderSVGEllipse();
    4040

  • trunk/Source/WebCore/rendering/svg/RenderSVGPath.cpp

    r131826 r152167  
    3131#include "RenderSVGPath.h"
    3232
     33#include "SVGGraphicsElement.h"
    3334#include "SVGPathElement.h"
    34 #include "SVGStyledTransformableElement.h"
    3535#include "SVGSubpathData.h"
    3636
    3737namespace WebCore {
    3838
    39 RenderSVGPath::RenderSVGPath(SVGStyledTransformableElement* node)
     39RenderSVGPath::RenderSVGPath(SVGGraphicsElement* node)
    4040    : RenderSVGShape(node)
    4141{

  • trunk/Source/WebCore/rendering/svg/RenderSVGPath.h

    r150312 r152167  
    3434class RenderSVGPath : public RenderSVGShape {
    3535public:
    36     explicit RenderSVGPath(SVGStyledTransformableElement*);
     36    explicit RenderSVGPath(SVGGraphicsElement*);
    3737    virtual ~RenderSVGPath();
    3838

  • trunk/Source/WebCore/rendering/svg/RenderSVGResourceClipper.cpp

    r149980 r152167  
    4040#include "SVGClipPathElement.h"
    4141#include "SVGElement.h"
     42#include "SVGGraphicsElement.h"
    4243#include "SVGNames.h"
    4344#include "SVGRenderSupport.h"
    … …  
    4647#include "SVGResourcesCache.h"
    4748#include "SVGStyledElement.h"
    48 #include "SVGStyledTransformableElement.h"
    4949#include "SVGUnitTypes.h"
    5050#include "SVGUseElement.h"
    … …  
    117117        if (renderer->isSVGText())
    118118            return false;
    119         if (!childNode->isSVGElement() || !toSVGElement(childNode)->isStyledTransformable())
    120             continue;
    121         SVGStyledTransformableElement* styled = toSVGStyledTransformableElement(childNode);
     119        if (!childNode->isSVGElement() || !toSVGElement(childNode)->isSVGGraphicsElement())
     120            continue;
     121        SVGGraphicsElement* styled = toSVGGraphicsElement(childNode);
    122122        RenderStyle* style = renderer->style();
    123123        if (!style || style->display() == NONE || style->visibility() != VISIBLE)

  • trunk/Source/WebCore/rendering/svg/RenderSVGResourceContainer.cpp

    r148536 r152167  
    2626#include "RenderSVGRoot.h"
    2727#include "RenderView.h"
     28#include "SVGGraphicsElement.h"
    2829#include "SVGRenderingContext.h"
    2930#include "SVGResourcesCache.h"
    30 #include "SVGStyledTransformableElement.h"
    3131#include <wtf/StackStats.h>
    3232
    … …  
    227227        return resourceTransform;
    228228
    229     SVGStyledTransformableElement* element = toSVGStyledTransformableElement(object->node());
     229    SVGGraphicsElement* element = toSVGGraphicsElement(object->node());
    230230    AffineTransform transform = element->getScreenCTM(SVGLocatable::DisallowStyleUpdate);
    231231    transform *= resourceTransform;

  • trunk/Source/WebCore/rendering/svg/RenderSVGResourceMarker.cpp

    r148536 r152167  
    2929#include "RenderSVGRoot.h"
    3030#include "SVGElement.h"
     31#include "SVGGraphicsElement.h"
    3132#include "SVGMarkerElement.h"
    3233#include "SVGRenderSupport.h"
    3334#include "SVGStyledElement.h"
    34 #include "SVGStyledTransformableElement.h"
    3535#include <wtf/StackStats.h>
    3636

  • trunk/Source/WebCore/rendering/svg/RenderSVGShape.cpp

    r148536 r152167  
    4040#include "RenderSVGResourceMarker.h"
    4141#include "RenderSVGResourceSolidColor.h"
     42#include "SVGGraphicsElement.h"
    4243#include "SVGPathData.h"
    4344#include "SVGRenderingContext.h"
    4445#include "SVGResources.h"
    4546#include "SVGResourcesCache.h"
    46 #include "SVGStyledTransformableElement.h"
    4747#include "SVGTransformList.h"
    4848#include "SVGURIReference.h"
    … …  
    5353namespace WebCore {
    5454
    55 RenderSVGShape::RenderSVGShape(SVGStyledTransformableElement* node)
     55RenderSVGShape::RenderSVGShape(SVGGraphicsElement* node)
    5656    : RenderSVGModelObject(node)
    5757    , m_needsBoundariesUpdate(false) // Default is false, the cached rects are empty from the beginning.
    58     , m_needsShapeUpdate(true) // Default is true, so we grab a Path object once from SVGStyledTransformableElement.
    59     , m_needsTransformUpdate(true) // Default is true, so we grab a AffineTransform object once from SVGStyledTransformableElement.
     58    , m_needsShapeUpdate(true) // Default is true, so we grab a Path object once from SVGGraphicsElement.
     59    , m_needsTransformUpdate(true) // Default is true, so we grab a AffineTransform object once from SVGGraphicsElement.
    6060{
    6161}
    … …  
    7171    ASSERT(RenderSVGShape::isEmpty());
    7272
    73     SVGStyledTransformableElement* element = toSVGStyledTransformableElement(node());
     73    SVGGraphicsElement* element = toSVGGraphicsElement(node());
    7474    updatePathFromGraphicsElement(element, path());
    7575    processMarkerPositions();
    … …  
    148148    StackStats::LayoutCheckPoint layoutCheckPoint;
    149149    LayoutRepainter repainter(*this, SVGRenderSupport::checkForSVGRepaintDuringLayout(this) && selfNeedsLayout());
    150     SVGStyledTransformableElement* element = toSVGStyledTransformableElement(node());
     150    SVGGraphicsElement* element = toSVGGraphicsElement(node());
    151151
    152152    bool updateCachedBoundariesInParents = false;
    … …  
    200200AffineTransform RenderSVGShape::nonScalingStrokeTransform() const
    201201{
    202     SVGStyledTransformableElement* element = toSVGStyledTransformableElement(node());
     202    SVGGraphicsElement* element = toSVGGraphicsElement(node());
    203203    return element->getScreenCTM(SVGLocatable::DisallowStyleUpdate);
    204204}
    … …  
    209209        return false;
    210210
    211     SVGStyledTransformableElement* element = toSVGStyledTransformableElement(node());
     211    SVGGraphicsElement* element = toSVGGraphicsElement(node());
    212212    if (!element->supportsMarkers())
    213213        return false;

  • trunk/Source/WebCore/rendering/svg/RenderSVGShape.h

    r152105 r152167  
    4343class RenderSVGPath;
    4444class RenderSVGResource;
    45 class SVGStyledTransformableElement;
     45class SVGGraphicsElement;
    4646
    4747class BoundingRectStrokeStyleApplier : public StrokeStyleApplier {
    … …  
    6767class RenderSVGShape : public RenderSVGModelObject {
    6868public:
    69     explicit RenderSVGShape(SVGStyledTransformableElement*);
    70     RenderSVGShape(SVGStyledTransformableElement*, Path*, bool);
     69    explicit RenderSVGShape(SVGGraphicsElement*);
     70    RenderSVGShape(SVGGraphicsElement*, Path*, bool);
    7171    virtual ~RenderSVGShape();
    7272

  • trunk/Source/WebCore/rendering/svg/RenderSVGTransformableContainer.cpp

    r145598 r152167  
    2525#include "RenderSVGTransformableContainer.h"
    2626
     27#include "SVGGraphicsElement.h"
    2728#include "SVGNames.h"
    2829#include "SVGRenderSupport.h"
    29 #include "SVGStyledTransformableElement.h"
    3030#include "SVGUseElement.h"
    3131
    3232namespace WebCore {
    3333   
    34 RenderSVGTransformableContainer::RenderSVGTransformableContainer(SVGStyledTransformableElement* node)
     34RenderSVGTransformableContainer::RenderSVGTransformableContainer(SVGGraphicsElement* node)
    3535    : RenderSVGContainer(node)
    3636    , m_needsTransformUpdate(true)
    … …  
    4141bool RenderSVGTransformableContainer::calculateLocalTransform()
    4242{
    43     SVGStyledTransformableElement* element = toSVGStyledTransformableElement(node());
     43    SVGGraphicsElement* element = toSVGGraphicsElement(node());
    4444
    4545    // If we're either the renderer for a <use> element, or for any <g> element inside the shadow

  • trunk/Source/WebCore/rendering/svg/RenderSVGTransformableContainer.h

    r150312 r152167  
    2727namespace WebCore {
    2828   
    29 class SVGStyledTransformableElement;
     29class SVGGraphicsElement;
    3030class RenderSVGTransformableContainer : public RenderSVGContainer {
    3131public:
    32     explicit RenderSVGTransformableContainer(SVGStyledTransformableElement*);
     32    explicit RenderSVGTransformableContainer(SVGGraphicsElement*);
    3333
    3434    virtual bool isSVGTransformableContainer() const { return true; }

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

    r151800 r152167  
    5959
    6060BEGIN_REGISTER_ANIMATED_PROPERTIES(SVGAElement)
    61      REGISTER_LOCAL_ANIMATED_PROPERTY(svgTarget)
    62      REGISTER_LOCAL_ANIMATED_PROPERTY(href)
    63      REGISTER_LOCAL_ANIMATED_PROPERTY(externalResourcesRequired)
    64      REGISTER_PARENT_ANIMATED_PROPERTIES(SVGStyledTransformableElement)
    65      REGISTER_PARENT_ANIMATED_PROPERTIES(SVGTests)
     61    REGISTER_LOCAL_ANIMATED_PROPERTY(svgTarget)
     62    REGISTER_LOCAL_ANIMATED_PROPERTY(href)
     63    REGISTER_LOCAL_ANIMATED_PROPERTY(externalResourcesRequired)
     64    REGISTER_PARENT_ANIMATED_PROPERTIES(SVGGraphicsElement)
    6665END_REGISTER_ANIMATED_PROPERTIES
    6766
    6867inline SVGAElement::SVGAElement(const QualifiedName& tagName, Document* document)
    69     : SVGStyledTransformableElement(tagName, document)
     68    : SVGGraphicsElement(tagName, document)
    7069{
    7170    ASSERT(hasTagName(SVGNames::aTag));
    … …  
    105104{
    106105    if (!isSupportedAttribute(name)) {
    107         SVGStyledTransformableElement::parseAttribute(name, value);
     106        SVGGraphicsElement::parseAttribute(name, value);
    108107        return;
    109108    }
    … …  
    129128{
    130129    if (!isSupportedAttribute(attrName)) {
    131         SVGStyledTransformableElement::svgAttributeChanged(attrName);
     130        SVGGraphicsElement::svgAttributeChanged(attrName);
    132131        return;
    133132    }
    … …  
    191190    }
    192191
    193     SVGStyledTransformableElement::defaultEventHandler(event);
     192    SVGGraphicsElement::defaultEventHandler(event);
    194193}
    195194
    … …  
    197196{
    198197    if (rendererIsEditable())
    199         return SVGStyledTransformableElement::supportsFocus();
     198        return SVGGraphicsElement::supportsFocus();
    200199    return true;
    201200}
    … …  
    211210bool SVGAElement::isURLAttribute(const Attribute& attribute) const
    212211{
    213     return attribute.name().localName() == hrefAttr || SVGStyledTransformableElement::isURLAttribute(attribute);
     212    return attribute.name().localName() == hrefAttr || SVGGraphicsElement::isURLAttribute(attribute);
    214213}
    215214

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

    r152156 r152167  
    2626#include "SVGAnimatedBoolean.h"
    2727#include "SVGExternalResourcesRequired.h"
    28 #include "SVGStyledTransformableElement.h"
    29 #include "SVGTests.h"
     28#include "SVGGraphicsElement.h"
    3029#include "SVGURIReference.h"
    3130
    3231namespace WebCore {
    3332
    34 class SVGAElement FINAL : public SVGStyledTransformableElement,
     33class SVGAElement FINAL : public SVGGraphicsElement,
    3534                          public SVGURIReference,
    36                           public SVGTests,
    3735                          public SVGExternalResourcesRequired {
    3836public:
    … …  
    7068        DECLARE_ANIMATED_BOOLEAN(ExternalResourcesRequired, externalResourcesRequired)
    7169    END_DECLARE_ANIMATED_PROPERTIES
    72 
    73     // SVGTests
    74     virtual void synchronizeRequiredFeatures() { SVGTests::synchronizeRequiredFeatures(this); }
    75     virtual void synchronizeRequiredExtensions() { SVGTests::synchronizeRequiredExtensions(this); }
    76     virtual void synchronizeSystemLanguage() { SVGTests::synchronizeSystemLanguage(this); }
    7770};
    7871

  • trunk/Source/WebCore/svg/SVGAElement.idl

    r152156 r152167  
    2626[
    2727    Conditional=SVG
    28 ] interface SVGAElement : SVGStyledElement,
    29                           SVGTransformable {
     28] interface SVGAElement : SVGGraphicsElement {
    3029    readonly attribute SVGAnimatedString target;
    3130};
    3231
    3332SVGAElement implements SVGExternalResourcesRequired;
    34 SVGAElement implements SVGTests;
    3533SVGAElement implements SVGURIReference;

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

    r140265 r152167  
    111111#include "SVGGlyphRefElement.cpp"
    112112#include "SVGGradientElement.cpp"
     113#include "SVGGraphicsElement.cpp"
    113114#include "SVGHKernElement.cpp"
    114115#include "SVGImageElement.cpp"
    … …  
    158159#include "SVGStyledElement.cpp"
    159160#include "SVGStyledLocatableElement.cpp"
    160 #include "SVGStyledTransformableElement.cpp"
    161161#include "SVGSwitchElement.cpp"
    162162#include "SVGSymbolElement.cpp"

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

    r151800 r152167  
    6363
    6464    // We don't have a special attribute name to verify the animation type. Check the element name instead.
    65     if (!targetElement->isStyledTransformable() && !targetElement->hasTagName(SVGNames::textTag))
     65    if (!targetElement->isSVGGraphicsElement() && !targetElement->hasTagName(SVGNames::textTag))
    6666        return false;
    6767    // Spec: SVG 1.1 section 19.2.15

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

    r151800 r152167  
    4848    REGISTER_LOCAL_ANIMATED_PROPERTY(r)
    4949    REGISTER_LOCAL_ANIMATED_PROPERTY(externalResourcesRequired)
    50     REGISTER_PARENT_ANIMATED_PROPERTIES(SVGStyledTransformableElement)
    51     REGISTER_PARENT_ANIMATED_PROPERTIES(SVGTests)
     50    REGISTER_PARENT_ANIMATED_PROPERTIES(SVGGraphicsElement)
    5251END_REGISTER_ANIMATED_PROPERTIES
    5352
    5453inline SVGCircleElement::SVGCircleElement(const QualifiedName& tagName, Document* document)
    55     : SVGStyledTransformableElement(tagName, document)
     54    : SVGGraphicsElement(tagName, document)
    5655    , m_cx(LengthModeWidth)
    5756    , m_cy(LengthModeHeight)
    … …  
    8685
    8786    if (!isSupportedAttribute(name))
    88         SVGStyledTransformableElement::parseAttribute(name, value);
     87        SVGGraphicsElement::parseAttribute(name, value);
    8988    else if (name == SVGNames::cxAttr)
    9089        setCxBaseValue(SVGLength::construct(LengthModeWidth, value, parseError));
    … …  
    105104{
    106105    if (!isSupportedAttribute(attrName)) {
    107         SVGStyledTransformableElement::svgAttributeChanged(attrName);
     106        SVGGraphicsElement::svgAttributeChanged(attrName);
    108107        return;
    109108    }

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

    r152156 r152167  
    2626#include "SVGAnimatedLength.h"
    2727#include "SVGExternalResourcesRequired.h"
    28 #include "SVGStyledTransformableElement.h"
    29 #include "SVGTests.h"
     28#include "SVGGraphicsElement.h"
    3029
    3130namespace WebCore {
    3231
    33 class SVGCircleElement FINAL : public SVGStyledTransformableElement,
    34                                public SVGTests,
     32class SVGCircleElement FINAL : public SVGGraphicsElement,
    3533                               public SVGExternalResourcesRequired {
    3634public:
    … …  
    5755        DECLARE_ANIMATED_BOOLEAN(ExternalResourcesRequired, externalResourcesRequired)
    5856    END_DECLARE_ANIMATED_PROPERTIES
    59 
    60     // SVGTests
    61     virtual void synchronizeRequiredFeatures() { SVGTests::synchronizeRequiredFeatures(this); }
    62     virtual void synchronizeRequiredExtensions() { SVGTests::synchronizeRequiredExtensions(this); }
    63     virtual void synchronizeSystemLanguage() { SVGTests::synchronizeSystemLanguage(this); }
    6457};
    6558

  • trunk/Source/WebCore/svg/SVGCircleElement.idl

    r152156 r152167  
    2727[
    2828    Conditional=SVG
    29 ] interface SVGCircleElement : SVGStyledElement,
    30                                SVGTransformable {
     29] interface SVGCircleElement : SVGGraphicsElement {
    3130    readonly attribute SVGAnimatedLength cx;
    3231    readonly attribute SVGAnimatedLength cy;
    … …  
    3534
    3635SVGCircleElement implements SVGExternalResourcesRequired;
    37 SVGCircleElement implements SVGTests;

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

    r151800 r152167  
    4242    REGISTER_LOCAL_ANIMATED_PROPERTY(clipPathUnits)
    4343    REGISTER_LOCAL_ANIMATED_PROPERTY(externalResourcesRequired)
    44     REGISTER_PARENT_ANIMATED_PROPERTIES(SVGStyledTransformableElement)
    45     REGISTER_PARENT_ANIMATED_PROPERTIES(SVGTests)
     44    REGISTER_PARENT_ANIMATED_PROPERTIES(SVGGraphicsElement)
    4645END_REGISTER_ANIMATED_PROPERTIES
    4746
    4847inline SVGClipPathElement::SVGClipPathElement(const QualifiedName& tagName, Document* document)
    49     : SVGStyledTransformableElement(tagName, document)
     48    : SVGGraphicsElement(tagName, document)
    5049    , m_clipPathUnits(SVGUnitTypes::SVG_UNIT_TYPE_USERSPACEONUSE)
    5150{
    … …  
    7473{
    7574    if (!isSupportedAttribute(name)) {
    76         SVGStyledTransformableElement::parseAttribute(name, value);
     75        SVGGraphicsElement::parseAttribute(name, value);
    7776        return;
    7877    }
    … …  
    9897{
    9998    if (!isSupportedAttribute(attrName)) {
    100         SVGStyledTransformableElement::svgAttributeChanged(attrName);
     99        SVGGraphicsElement::svgAttributeChanged(attrName);
    101100        return;
    102101    }
    … …  
    110109void SVGClipPathElement::childrenChanged(bool changedByParser, Node* beforeChange, Node* afterChange, int childCountDelta)
    111110{
    112     SVGStyledTransformableElement::childrenChanged(changedByParser, beforeChange, afterChange, childCountDelta);
     111    SVGGraphicsElement::childrenChanged(changedByParser, beforeChange, afterChange, childCountDelta);
    113112
    114113    if (changedByParser)

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

    r152156 r152167  
    2626#include "SVGAnimatedEnumeration.h"
    2727#include "SVGExternalResourcesRequired.h"
    28 #include "SVGStyledTransformableElement.h"
    29 #include "SVGTests.h"
     28#include "SVGGraphicsElement.h"
    3029#include "SVGUnitTypes.h"
    3130
    … …  
    3433class RenderObject;
    3534
    36 class SVGClipPathElement FINAL : public SVGStyledTransformableElement,
    37                                  public SVGTests,
     35class SVGClipPathElement FINAL : public SVGGraphicsElement,
    3836                                 public SVGExternalResourcesRequired {
    3937public:
    … …  
    5755        DECLARE_ANIMATED_BOOLEAN(ExternalResourcesRequired, externalResourcesRequired)
    5856    END_DECLARE_ANIMATED_PROPERTIES
    59 
    60     // SVGTests
    61     virtual void synchronizeRequiredFeatures() { SVGTests::synchronizeRequiredFeatures(this); }
    62     virtual void synchronizeRequiredExtensions() { SVGTests::synchronizeRequiredExtensions(this); }
    63     virtual void synchronizeSystemLanguage() { SVGTests::synchronizeSystemLanguage(this); }
    6457};
    6558

  • trunk/Source/WebCore/svg/SVGClipPathElement.idl

    r152156 r152167  
    2727[
    2828    Conditional=SVG
    29 ] interface SVGClipPathElement : SVGStyledElement,
    30                                  SVGTransformable {
     29] interface SVGClipPathElement : SVGGraphicsElement {
    3130    readonly attribute SVGAnimatedEnumeration clipPathUnits;
    3231};
    3332
    3433SVGClipPathElement implements SVGExternalResourcesRequired;
    35 SVGClipPathElement implements SVGTests;

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

    r90680 r152167  
    3434BEGIN_REGISTER_ANIMATED_PROPERTIES(SVGDefsElement)
    3535    REGISTER_LOCAL_ANIMATED_PROPERTY(externalResourcesRequired)
    36     REGISTER_PARENT_ANIMATED_PROPERTIES(SVGStyledTransformableElement)
    37     REGISTER_PARENT_ANIMATED_PROPERTIES(SVGTests)
     36    REGISTER_PARENT_ANIMATED_PROPERTIES(SVGGraphicsElement)
    3837END_REGISTER_ANIMATED_PROPERTIES
    3938
    4039inline SVGDefsElement::SVGDefsElement(const QualifiedName& tagName, Document* document)
    41     : SVGStyledTransformableElement(tagName, document)
     40    : SVGGraphicsElement(tagName, document)
    4241{
    4342    ASSERT(hasTagName(SVGNames::defsTag));

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

    r152156 r152167  
    2525#include "SVGAnimatedBoolean.h"
    2626#include "SVGExternalResourcesRequired.h"
    27 #include "SVGStyledTransformableElement.h"
    28 #include "SVGTests.h"
     27#include "SVGGraphicsElement.h"
    2928
    3029namespace WebCore {
    3130
    32 class SVGDefsElement FINAL : public SVGStyledTransformableElement,
    33                              public SVGTests,
     31class SVGDefsElement FINAL : public SVGGraphicsElement,
    3432                             public SVGExternalResourcesRequired {
    3533public:
    … …  
    4644        DECLARE_ANIMATED_BOOLEAN(ExternalResourcesRequired, externalResourcesRequired)
    4745    END_DECLARE_ANIMATED_PROPERTIES
    48 
    49     // SVGTests
    50     virtual void synchronizeRequiredFeatures() { SVGTests::synchronizeRequiredFeatures(this); }
    51     virtual void synchronizeRequiredExtensions() { SVGTests::synchronizeRequiredExtensions(this); }
    52     virtual void synchronizeSystemLanguage() { SVGTests::synchronizeSystemLanguage(this); }
    5346};
    5447

  • trunk/Source/WebCore/svg/SVGDefsElement.idl

    r152156 r152167  
    2626[
    2727    Conditional=SVG
    28 ] interface SVGDefsElement : SVGStyledElement,
    29                              SVGTransformable {
     28] interface SVGDefsElement : SVGGraphicsElement {
    3029};
    3130
    3231SVGDefsElement implements SVGExternalResourcesRequired;
    33 SVGDefsElement implements SVGTests;

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

    r152156 r152167  
    6060
    6161    virtual bool isSVGStyledElement() const { return false; }
    62     virtual bool isStyledTransformable() const { return false; }
     62    virtual bool isSVGGraphicsElement() const { return false; }
    6363    virtual bool isStyledLocatable() const { return false; }
    6464    virtual bool isSVGSVGElement() const { return false; }

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

    r151800 r152167  
    4848    REGISTER_LOCAL_ANIMATED_PROPERTY(ry)
    4949    REGISTER_LOCAL_ANIMATED_PROPERTY(externalResourcesRequired)
    50     REGISTER_PARENT_ANIMATED_PROPERTIES(SVGStyledTransformableElement)
    51     REGISTER_PARENT_ANIMATED_PROPERTIES(SVGTests)
     50    REGISTER_PARENT_ANIMATED_PROPERTIES(SVGGraphicsElement)
    5251END_REGISTER_ANIMATED_PROPERTIES
    5352
    5453inline SVGEllipseElement::SVGEllipseElement(const QualifiedName& tagName, Document* document)
    55     : SVGStyledTransformableElement(tagName, document)
     54    : SVGGraphicsElement(tagName, document)
    5655    , m_cx(LengthModeWidth)
    5756    , m_cy(LengthModeHeight)
    … …  
    8887
    8988    if (!isSupportedAttribute(name))
    90         SVGStyledTransformableElement::parseAttribute(name, value);
     89        SVGGraphicsElement::parseAttribute(name, value);
    9190    else if (name == SVGNames::cxAttr)
    9291        setCxBaseValue(SVGLength::construct(LengthModeWidth, value, parseError));
    … …  
    109108{
    110109    if (!isSupportedAttribute(attrName)) {
    111         SVGStyledTransformableElement::svgAttributeChanged(attrName);
     110        SVGGraphicsElement::svgAttributeChanged(attrName);
    112111        return;
    113112    }

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

    r152156 r152167  
    2626#include "SVGAnimatedLength.h"
    2727#include "SVGExternalResourcesRequired.h"
    28 #include "SVGStyledTransformableElement.h"
    29 #include "SVGTests.h"
     28#include "SVGGraphicsElement.h"
    3029
    3130namespace WebCore {
    3231
    33 class SVGEllipseElement FINAL : public SVGStyledTransformableElement,
    34                                 public SVGTests,
     32class SVGEllipseElement FINAL : public SVGGraphicsElement,
    3533                                public SVGExternalResourcesRequired {
    3634public:
    … …  
    5856        DECLARE_ANIMATED_BOOLEAN(ExternalResourcesRequired, externalResourcesRequired)
    5957    END_DECLARE_ANIMATED_PROPERTIES
    60 
    61     // SVGTests
    62     virtual void synchronizeRequiredFeatures() { SVGTests::synchronizeRequiredFeatures(this); }
    63     virtual void synchronizeRequiredExtensions() { SVGTests::synchronizeRequiredExtensions(this); }
    64     virtual void synchronizeSystemLanguage() { SVGTests::synchronizeSystemLanguage(this); }
    6558};
    6659

  • trunk/Source/WebCore/svg/SVGEllipseElement.idl

    r152156 r152167  
    2626[
    2727    Conditional=SVG
    28 ] interface SVGEllipseElement : SVGStyledElement,
    29                                 SVGTransformable {
     28] interface SVGEllipseElement : SVGGraphicsElement {
    3029    readonly attribute SVGAnimatedLength cx;
    3130    readonly attribute SVGAnimatedLength cy;
    … …  
    3534
    3635SVGEllipseElement implements SVGExternalResourcesRequired;
    37 SVGEllipseElement implements SVGTests;

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

    r151800 r152167  
    5151    REGISTER_LOCAL_ANIMATED_PROPERTY(href)
    5252    REGISTER_LOCAL_ANIMATED_PROPERTY(externalResourcesRequired)
    53     REGISTER_PARENT_ANIMATED_PROPERTIES(SVGStyledTransformableElement)
    54     REGISTER_PARENT_ANIMATED_PROPERTIES(SVGTests)
     53    REGISTER_PARENT_ANIMATED_PROPERTIES(SVGGraphicsElement)
    5554END_REGISTER_ANIMATED_PROPERTIES
    5655
    5756inline SVGForeignObjectElement::SVGForeignObjectElement(const QualifiedName& tagName, Document* document)
    58     : SVGStyledTransformableElement(tagName, document)
     57    : SVGGraphicsElement(tagName, document)
    5958    , m_x(LengthModeWidth)
    6059    , m_y(LengthModeHeight)
    … …  
    9190
    9291    if (!isSupportedAttribute(name))
    93         SVGStyledTransformableElement::parseAttribute(name, value);
     92        SVGGraphicsElement::parseAttribute(name, value);
    9493    else if (name == SVGNames::xAttr)
    9594        setXBaseValue(SVGLength::construct(LengthModeWidth, value, parseError));
    … …  
    112111{
    113112    if (!isSupportedAttribute(attrName)) {
    114         SVGStyledTransformableElement::svgAttributeChanged(attrName);
     113        SVGGraphicsElement::svgAttributeChanged(attrName);
    115114        return;
    116115    }
    … …  
    163162    }
    164163
    165     return SVGStyledTransformableElement::rendererIsNeeded(context);
     164    return SVGGraphicsElement::rendererIsNeeded(context);
    166165}
    167166

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

    r152156 r152167  
    2525#include "SVGAnimatedLength.h"
    2626#include "SVGExternalResourcesRequired.h"
    27 #include "SVGStyledTransformableElement.h"
    28 #include "SVGTests.h"
     27#include "SVGGraphicsElement.h"
    2928#include "SVGURIReference.h"
    3029
    3130namespace WebCore {
    3231
    33 class SVGForeignObjectElement FINAL : public SVGStyledTransformableElement,
    34                                       public SVGTests,
     32class SVGForeignObjectElement FINAL : public SVGGraphicsElement,
    3533                                      public SVGExternalResourcesRequired {
    3634public:
    … …  
    5957        DECLARE_ANIMATED_BOOLEAN(ExternalResourcesRequired, externalResourcesRequired)
    6058    END_DECLARE_ANIMATED_PROPERTIES
    61 
    62     // SVGTests
    63     virtual void synchronizeRequiredFeatures() { SVGTests::synchronizeRequiredFeatures(this); }
    64     virtual void synchronizeRequiredExtensions() { SVGTests::synchronizeRequiredExtensions(this); }
    65     virtual void synchronizeSystemLanguage() { SVGTests::synchronizeSystemLanguage(this); }
    6659};
    6760

  • trunk/Source/WebCore/svg/SVGForeignObjectElement.idl

    r152156 r152167  
    2626[
    2727    Conditional=SVG
    28 ] interface SVGForeignObjectElement : SVGStyledElement,
    29                                       SVGTransformable {
     28] interface SVGForeignObjectElement : SVGGraphicsElement {
    3029    readonly attribute SVGAnimatedLength x;
    3130    readonly attribute SVGAnimatedLength y;
    … …  
    3534
    3635SVGForeignObjectElement implements SVGExternalResourcesRequired;
    37 SVGForeignObjectElement implements SVGTests;

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

    r151800 r152167  
    3737BEGIN_REGISTER_ANIMATED_PROPERTIES(SVGGElement)
    3838    REGISTER_LOCAL_ANIMATED_PROPERTY(externalResourcesRequired)
    39     REGISTER_PARENT_ANIMATED_PROPERTIES(SVGStyledTransformableElement)
    40     REGISTER_PARENT_ANIMATED_PROPERTIES(SVGTests)
     39    REGISTER_PARENT_ANIMATED_PROPERTIES(SVGGraphicsElement)
    4140END_REGISTER_ANIMATED_PROPERTIES
    4241
    4342SVGGElement::SVGGElement(const QualifiedName& tagName, Document* document, ConstructionType constructionType)
    44     : SVGStyledTransformableElement(tagName, document, constructionType)
     43    : SVGGraphicsElement(tagName, document, constructionType)
    4544{
    4645    ASSERT(hasTagName(SVGNames::gTag));
    … …  
    6766{
    6867    if (!isSupportedAttribute(name)) {
    69         SVGStyledTransformableElement::parseAttribute(name, value);
     68        SVGGraphicsElement::parseAttribute(name, value);
    7069        return;
    7170    }
    … …  
    8483{
    8584    if (!isSupportedAttribute(attrName)) {
    86         SVGStyledTransformableElement::svgAttributeChanged(attrName);
     85        SVGGraphicsElement::svgAttributeChanged(attrName);
    8786        return;
    8887    }

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

    r152156 r152167  
    2525#include "SVGAnimatedBoolean.h"
    2626#include "SVGExternalResourcesRequired.h"
    27 #include "SVGStyledTransformableElement.h"
    28 #include "SVGTests.h"
     27#include "SVGGraphicsElement.h"
    2928
    3029namespace WebCore {
    3130
    32 class SVGGElement FINAL : public SVGStyledTransformableElement,
    33                           public SVGTests,
     31class SVGGElement FINAL : public SVGGraphicsElement,
    3432                          public SVGExternalResourcesRequired {
    3533public:
    … …  
    5452        DECLARE_ANIMATED_BOOLEAN(ExternalResourcesRequired, externalResourcesRequired)
    5553    END_DECLARE_ANIMATED_PROPERTIES
    56 
    57     // SVGTests
    58     virtual void synchronizeRequiredFeatures() { SVGTests::synchronizeRequiredFeatures(this); }
    59     virtual void synchronizeRequiredExtensions() { SVGTests::synchronizeRequiredExtensions(this); }
    60     virtual void synchronizeSystemLanguage() { SVGTests::synchronizeSystemLanguage(this); }
    6154};
    6255

  • trunk/Source/WebCore/svg/SVGGElement.idl

    r152156 r152167  
    2626[
    2727    Conditional=SVG
    28 ] interface SVGGElement : SVGStyledElement,
    29                           SVGTransformable {
     28] interface SVGGElement : SVGGraphicsElement {
    3029};
    3130
    3231SVGGElement implements SVGExternalResourcesRequired;
    33 SVGGElement implements SVGTests;

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

    r152166 r152167  
    2222
    2323#if ENABLE(SVG)
    24 #include "SVGStyledTransformableElement.h"
     24#include "SVGGraphicsElement.h"
    2525
    2626#include "AffineTransform.h"
    … …  
    3535
    3636// Animated property definitions
    37 DEFINE_ANIMATED_TRANSFORM_LIST(SVGStyledTransformableElement, SVGNames::transformAttr, Transform, transform)
     37DEFINE_ANIMATED_TRANSFORM_LIST(SVGGraphicsElement, SVGNames::transformAttr, Transform, transform)
    3838
    39 BEGIN_REGISTER_ANIMATED_PROPERTIES(SVGStyledTransformableElement)
     39BEGIN_REGISTER_ANIMATED_PROPERTIES(SVGGraphicsElement)
    4040    REGISTER_LOCAL_ANIMATED_PROPERTY(transform)
    4141    REGISTER_PARENT_ANIMATED_PROPERTIES(SVGStyledLocatableElement)
     42    REGISTER_PARENT_ANIMATED_PROPERTIES(SVGTests)
    4243END_REGISTER_ANIMATED_PROPERTIES
    4344
    44 SVGStyledTransformableElement::SVGStyledTransformableElement(const QualifiedName& tagName, Document* document, ConstructionType constructionType)
     45SVGGraphicsElement::SVGGraphicsElement(const QualifiedName& tagName, Document* document, ConstructionType constructionType)
    4546    : SVGStyledLocatableElement(tagName, document, constructionType)
    4647{
    47     registerAnimatedPropertiesForSVGStyledTransformableElement();
     48    registerAnimatedPropertiesForSVGGraphicsElement();
    4849}
    4950
    50 SVGStyledTransformableElement::~SVGStyledTransformableElement()
     51SVGGraphicsElement::~SVGGraphicsElement()
    5152{
    5253}
    5354
    54 AffineTransform SVGStyledTransformableElement::getCTM(StyleUpdateStrategy styleUpdateStrategy)
     55AffineTransform SVGGraphicsElement::getCTM(StyleUpdateStrategy styleUpdateStrategy)
    5556{
    5657    return SVGLocatable::computeCTM(this, SVGLocatable::NearestViewportScope, styleUpdateStrategy);
    5758}
    5859
    59 AffineTransform SVGStyledTransformableElement::getScreenCTM(StyleUpdateStrategy styleUpdateStrategy)
     60AffineTransform SVGGraphicsElement::getScreenCTM(StyleUpdateStrategy styleUpdateStrategy)
    6061{
    6162    return SVGLocatable::computeCTM(this, SVGLocatable::ScreenScope, styleUpdateStrategy);
    6263}
    6364
    64 AffineTransform SVGStyledTransformableElement::animatedLocalTransform() const
     65AffineTransform SVGGraphicsElement::animatedLocalTransform() const
    6566{
    6667    AffineTransform matrix;
    … …  
    8485}
    8586
    86 AffineTransform* SVGStyledTransformableElement::supplementalTransform()
     87AffineTransform* SVGGraphicsElement::supplementalTransform()
    8788{
    8889    if (!m_supplementalTransform)
    … …  
    9192}
    9293
    93 bool SVGStyledTransformableElement::isSupportedAttribute(const QualifiedName& attrName)
     94bool SVGGraphicsElement::isSupportedAttribute(const QualifiedName& attrName)
    9495{
    9596    DEFINE_STATIC_LOCAL(HashSet<QualifiedName>, supportedAttributes, ());
    … …  
    99100}
    100101
    101 void SVGStyledTransformableElement::parseAttribute(const QualifiedName& name, const AtomicString& value)
     102void SVGGraphicsElement::parseAttribute(const QualifiedName& name, const AtomicString& value)
    102103{
    103104    if (!isSupportedAttribute(name)) {
    … …  
    117118}
    118119
    119 void SVGStyledTransformableElement::svgAttributeChanged(const QualifiedName& attrName)
     120void SVGGraphicsElement::svgAttributeChanged(const QualifiedName& attrName)
    120121{
    121122    if (!isSupportedAttribute(attrName)) {
    … …  
    139140}
    140141
    141 SVGElement* SVGStyledTransformableElement::nearestViewportElement() const
     142SVGElement* SVGGraphicsElement::nearestViewportElement() const
    142143{
    143144    return SVGTransformable::nearestViewportElement(this);
    144145}
    145146
    146 SVGElement* SVGStyledTransformableElement::farthestViewportElement() const
     147SVGElement* SVGGraphicsElement::farthestViewportElement() const
    147148{
    148149    return SVGTransformable::farthestViewportElement(this);
    149150}
    150151
    151 FloatRect SVGStyledTransformableElement::getBBox(StyleUpdateStrategy styleUpdateStrategy)
     152FloatRect SVGGraphicsElement::getBBox(StyleUpdateStrategy styleUpdateStrategy)
    152153{
    153154    return SVGTransformable::getBBox(this, styleUpdateStrategy);
    154155}
    155156
    156 RenderObject* SVGStyledTransformableElement::createRenderer(RenderArena* arena, RenderStyle*)
     157RenderObject* SVGGraphicsElement::createRenderer(RenderArena* arena, RenderStyle*)
    157158{
    158159    // By default, any subclass is expected to do path-based drawing
    … …  
    160161}
    161162
    162 void SVGStyledTransformableElement::toClipPath(Path& path)
     163void SVGGraphicsElement::toClipPath(Path& path)
    163164{
    164165    updatePathFromGraphicsElement(this, path);

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

    r152166 r152167  
    1919 */
    2020
    21 #ifndef SVGStyledTransformableElement_h
    22 #define SVGStyledTransformableElement_h
     21#ifndef SVGGraphicsElement_h
     22#define SVGGraphicsElement_h
    2323
    2424#if ENABLE(SVG)
    2525#include "SVGAnimatedTransformList.h"
    2626#include "SVGStyledLocatableElement.h"
     27#include "SVGTests.h"
    2728#include "SVGTransformable.h"
    2829
    … …  
    3233class Path;
    3334
    34 class SVGStyledTransformableElement : public SVGStyledLocatableElement,
    35                                       public SVGTransformable {
     35class SVGGraphicsElement : public SVGStyledLocatableElement, public SVGTransformable, public SVGTests {
    3636public:
    37     virtual ~SVGStyledTransformableElement();
     37    virtual ~SVGGraphicsElement();
    3838
    3939    virtual AffineTransform getCTM(StyleUpdateStrategy = AllowStyleUpdate);
    … …  
    5353
    5454protected:
    55     SVGStyledTransformableElement(const QualifiedName&, Document*, ConstructionType = CreateSVGElement);
     55    SVGGraphicsElement(const QualifiedName&, Document*, ConstructionType = CreateSVGElement);
    5656
    5757    bool isSupportedAttribute(const QualifiedName&);
    … …  
    5959    virtual void svgAttributeChanged(const QualifiedName&);
    6060
    61     BEGIN_DECLARE_ANIMATED_PROPERTIES(SVGStyledTransformableElement)
     61    BEGIN_DECLARE_ANIMATED_PROPERTIES(SVGGraphicsElement)
    6262        DECLARE_ANIMATED_TRANSFORM_LIST(Transform, transform)
    6363    END_DECLARE_ANIMATED_PROPERTIES
    6464
    6565private:
    66     virtual bool isStyledTransformable() const OVERRIDE { return true; }
     66    virtual bool isSVGGraphicsElement() const OVERRIDE { return true; }
     67
     68    // SVGTests
     69    virtual void synchronizeRequiredFeatures() { SVGTests::synchronizeRequiredFeatures(this); }
     70    virtual void synchronizeRequiredExtensions() { SVGTests::synchronizeRequiredExtensions(this); }
     71    virtual void synchronizeSystemLanguage() { SVGTests::synchronizeSystemLanguage(this); }
    6772
    6873    // Used by <animateMotion>
    … …  
    7075};
    7176
    72 inline SVGStyledTransformableElement* toSVGStyledTransformableElement(Node* node)
     77inline SVGGraphicsElement* toSVGGraphicsElement(Node* node)
    7378{
    7479    ASSERT_WITH_SECURITY_IMPLICATION(!node || node->isSVGElement());
    75     ASSERT_WITH_SECURITY_IMPLICATION(!node || toSVGElement(node)->isStyledTransformable());
    76     return static_cast<SVGStyledTransformableElement*>(node);
     80    ASSERT_WITH_SECURITY_IMPLICATION(!node || toSVGElement(node)->isSVGGraphicsElement());
     81    return static_cast<SVGGraphicsElement*>(node);
    7782}
    7883
    … …  
    8085
    8186#endif // ENABLE(SVG)
    82 #endif // SVGStyledTransformableElement_h
     87#endif // SVGGraphicsElement_h

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

    r152166 r152167  
    11/*
    2  * Copyright (C) 2006 Apple Inc. All rights reserved.
     2 * Copyright (C) 2013 Samsung Electronics. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    2121 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
    2222 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
    23  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
     23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2424 */
    2525
    26 [
    27     Conditional=SVG
    28 ] interface SVGForeignObjectElement : SVGStyledElement,
    29                                       SVGTransformable {
    30     readonly attribute SVGAnimatedLength x;
    31     readonly attribute SVGAnimatedLength y;
    32     readonly attribute SVGAnimatedLength width;
    33     readonly attribute SVGAnimatedLength height;
     26interface SVGGraphicsElement : SVGStyledElement {
     27    readonly attribute SVGAnimatedTransformList transform;
     28
     29    readonly attribute SVGElement nearestViewportElement;
     30    readonly attribute SVGElement farthestViewportElement;
     31
     32    SVGRect   getBBox();
     33    SVGMatrix getCTM();
     34    SVGMatrix getScreenCTM();
     35    [RaisesException] SVGMatrix getTransformToElement([Default=Undefined] optional SVGElement element);
    3436};
    3537
    36 SVGForeignObjectElement implements SVGExternalResourcesRequired;
    37 SVGForeignObjectElement implements SVGTests;
     38SVGGraphicsElement implements SVGTests;

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

    r151800 r152167  
    5454    REGISTER_LOCAL_ANIMATED_PROPERTY(href)
    5555    REGISTER_LOCAL_ANIMATED_PROPERTY(externalResourcesRequired)
    56     REGISTER_PARENT_ANIMATED_PROPERTIES(SVGStyledTransformableElement)
    57     REGISTER_PARENT_ANIMATED_PROPERTIES(SVGTests)
     56    REGISTER_PARENT_ANIMATED_PROPERTIES(SVGGraphicsElement)
    5857END_REGISTER_ANIMATED_PROPERTIES
    5958
    6059inline SVGImageElement::SVGImageElement(const QualifiedName& tagName, Document* document)
    61     : SVGStyledTransformableElement(tagName, document)
     60    : SVGGraphicsElement(tagName, document)
    6261    , m_x(LengthModeWidth)
    6362    , m_y(LengthModeHeight)
    … …  
    9695    if (name == SVGNames::widthAttr || name == SVGNames::heightAttr)
    9796        return true;
    98     return SVGStyledTransformableElement::isPresentationAttribute(name);
     97    return SVGGraphicsElement::isPresentationAttribute(name);
    9998}
    10099
    … …  
    102101{
    103102    if (!isSupportedAttribute(name))
    104         SVGStyledTransformableElement::collectStyleForPresentationAttribute(name, value, style);
     103        SVGGraphicsElement::collectStyleForPresentationAttribute(name, value, style);
    105104    else if (name == SVGNames::widthAttr)
    106105        addPropertyToPresentationAttributeStyle(style, CSSPropertyWidth, value);
    … …  
    114113
    115114    if (!isSupportedAttribute(name))
    116         SVGStyledTransformableElement::parseAttribute(name, value);
     115        SVGGraphicsElement::parseAttribute(name, value);
    117116    else if (name == SVGNames::xAttr)
    118117        setXBaseValue(SVGLength::construct(LengthModeWidth, value, parseError));
    … …  
    140139{
    141140    if (!isSupportedAttribute(attrName)) {
    142         SVGStyledTransformableElement::svgAttributeChanged(attrName);
     141        SVGGraphicsElement::svgAttributeChanged(attrName);
    143142        return;
    144143    }
    … …  
    202201void SVGImageElement::attach(const AttachContext& context)
    203202{
    204     SVGStyledTransformableElement::attach(context);
     203    SVGGraphicsElement::attach(context);
    205204
    206205    if (RenderSVGImage* imageObj = toRenderSVGImage(renderer())) {
    … …  
    214213Node::InsertionNotificationRequest SVGImageElement::insertedInto(ContainerNode* rootParent)
    215214{
    216     SVGStyledTransformableElement::insertedInto(rootParent);
     215    SVGGraphicsElement::insertedInto(rootParent);
    217216    if (!rootParent->inDocument())
    218217        return InsertionDone;
    … …  
    230229void SVGImageElement::addSubresourceAttributeURLs(ListHashSet<KURL>& urls) const
    231230{
    232     SVGStyledTransformableElement::addSubresourceAttributeURLs(urls);
     231    SVGGraphicsElement::addSubresourceAttributeURLs(urls);
    233232
    234233    addSubresourceURL(urls, document()->completeURL(href()));
    … …  
    238237{
    239238    m_imageLoader.elementDidMoveToNewDocument();
    240     SVGStyledTransformableElement::didMoveToNewDocument(oldDocument);
     239    SVGGraphicsElement::didMoveToNewDocument(oldDocument);
    241240}
    242241

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

    r152156 r152167  
    2727#include "SVGAnimatedPreserveAspectRatio.h"
    2828#include "SVGExternalResourcesRequired.h"
     29#include "SVGGraphicsElement.h"
    2930#include "SVGImageLoader.h"
    30 #include "SVGStyledTransformableElement.h"
    31 #include "SVGTests.h"
    3231#include "SVGURIReference.h"
    3332
    3433namespace WebCore {
    3534
    36 class SVGImageElement FINAL : public SVGStyledTransformableElement,
    37                               public SVGTests,
     35class SVGImageElement FINAL : public SVGGraphicsElement,
    3836                              public SVGExternalResourcesRequired,
    3937                              public SVGURIReference {
    … …  
    7674    END_DECLARE_ANIMATED_PROPERTIES
    7775
    78     // SVGTests
    79     virtual void synchronizeRequiredFeatures() { SVGTests::synchronizeRequiredFeatures(this); }
    80     virtual void synchronizeRequiredExtensions() { SVGTests::synchronizeRequiredExtensions(this); }
    81     virtual void synchronizeSystemLanguage() { SVGTests::synchronizeSystemLanguage(this); }
    82 
    8376    SVGImageLoader m_imageLoader;
    8477};

  • trunk/Source/WebCore/svg/SVGImageElement.idl

    r152156 r152167  
    2626[
    2727    Conditional=SVG
    28 ] interface SVGImageElement : SVGStyledElement,
    29                               SVGTransformable {
     28] interface SVGImageElement : SVGGraphicsElement {
    3029    readonly attribute SVGAnimatedLength x;
    3130    readonly attribute SVGAnimatedLength y;
    … …  
    3635
    3736SVGImageElement implements SVGExternalResourcesRequired;
    38 SVGImageElement implements SVGTests;
    3937SVGImageElement implements SVGURIReference;

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

    r151800 r152167  
    4747    REGISTER_LOCAL_ANIMATED_PROPERTY(y2)
    4848    REGISTER_LOCAL_ANIMATED_PROPERTY(externalResourcesRequired)
    49     REGISTER_PARENT_ANIMATED_PROPERTIES(SVGStyledTransformableElement)
    50     REGISTER_PARENT_ANIMATED_PROPERTIES(SVGTests)
     49    REGISTER_PARENT_ANIMATED_PROPERTIES(SVGGraphicsElement)
    5150END_REGISTER_ANIMATED_PROPERTIES
    5251
    5352inline SVGLineElement::SVGLineElement(const QualifiedName& tagName, Document* document)
    54     : SVGStyledTransformableElement(tagName, document)
     53    : SVGGraphicsElement(tagName, document)
    5554    , m_x1(LengthModeWidth)
    5655    , m_y1(LengthModeHeight)
    … …  
    8786
    8887    if (!isSupportedAttribute(name))
    89         SVGStyledTransformableElement::parseAttribute(name, value);
     88        SVGGraphicsElement::parseAttribute(name, value);
    9089    else if (name == SVGNames::x1Attr)
    9190        setX1BaseValue(SVGLength::construct(LengthModeWidth, value, parseError));
    … …  
    108107{
    109108    if (!isSupportedAttribute(attrName)) {
    110         SVGStyledTransformableElement::svgAttributeChanged(attrName);
     109        SVGGraphicsElement::svgAttributeChanged(attrName);
    111110        return;
    112111    }

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

    r152156 r152167  
    2626#include "SVGAnimatedLength.h"
    2727#include "SVGExternalResourcesRequired.h"
    28 #include "SVGStyledTransformableElement.h"
    29 #include "SVGTests.h"
     28#include "SVGGraphicsElement.h"
    3029
    3130namespace WebCore {
    3231
    33 class SVGLineElement FINAL : public SVGStyledTransformableElement,
    34                              public SVGTests,
     32class SVGLineElement FINAL : public SVGGraphicsElement,
    3533                             public SVGExternalResourcesRequired {
    3634public:
    … …  
    5856        DECLARE_ANIMATED_BOOLEAN(ExternalResourcesRequired, externalResourcesRequired)
    5957    END_DECLARE_ANIMATED_PROPERTIES
    60 
    61     // SVGTests
    62     virtual void synchronizeRequiredFeatures() { SVGTests::synchronizeRequiredFeatures(this); }
    63     virtual void synchronizeRequiredExtensions() { SVGTests::synchronizeRequiredExtensions(this); }
    64     virtual void synchronizeSystemLanguage() { SVGTests::synchronizeSystemLanguage(this); }
    6558};
    6659

  • trunk/Source/WebCore/svg/SVGLineElement.idl

    r152156 r152167  
    2626[
    2727    Conditional=SVG
    28 ] interface SVGLineElement : SVGStyledElement,
    29                              SVGTransformable {
     28] interface SVGLineElement : SVGGraphicsElement {
    3029    readonly attribute SVGAnimatedLength x1;
    3130    readonly attribute SVGAnimatedLength y1;
    … …  
    3534
    3635SVGLineElement implements SVGExternalResourcesRequired;
    37 SVGLineElement implements SVGTests;

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

    r151800 r152167  
    7171    REGISTER_LOCAL_ANIMATED_PROPERTY(pathLength)
    7272    REGISTER_LOCAL_ANIMATED_PROPERTY(externalResourcesRequired)
    73     REGISTER_PARENT_ANIMATED_PROPERTIES(SVGStyledTransformableElement)
    74     REGISTER_PARENT_ANIMATED_PROPERTIES(SVGTests)
     73    REGISTER_PARENT_ANIMATED_PROPERTIES(SVGGraphicsElement)
    7574END_REGISTER_ANIMATED_PROPERTIES
    7675
    7776inline SVGPathElement::SVGPathElement(const QualifiedName& tagName, Document* document)
    78     : SVGStyledTransformableElement(tagName, document)
     77    : SVGGraphicsElement(tagName, document)
    7978    , m_pathByteStream(SVGPathByteStream::create())
    8079    , m_pathSegList(PathSegUnalteredRole)
    … …  
    222221{
    223222    if (!isSupportedAttribute(name)) {
    224         SVGStyledTransformableElement::parseAttribute(name, value);
     223        SVGGraphicsElement::parseAttribute(name, value);
    225224        return;
    226225    }
    … …  
    252251{
    253252    if (!isSupportedAttribute(attrName)) {
    254         SVGStyledTransformableElement::svgAttributeChanged(attrName);
     253        SVGGraphicsElement::svgAttributeChanged(attrName);
    255254        return;
    256255    }
    … …  
    296295Node::InsertionNotificationRequest SVGPathElement::insertedInto(ContainerNode* rootParent)
    297296{
    298     SVGStyledTransformableElement::insertedInto(rootParent);
     297    SVGGraphicsElement::insertedInto(rootParent);
    299298    invalidateMPathDependencies();
    300299    return InsertionDone;
    … …  
    303302void SVGPathElement::removedFrom(ContainerNode* rootParent)
    304303{
    305     SVGStyledTransformableElement::removedFrom(rootParent);
     304    SVGGraphicsElement::removedFrom(rootParent);
    306305    invalidateMPathDependencies();
    307306}

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

    r152156 r152167  
    2626#include "SVGAnimatedNumber.h"
    2727#include "SVGExternalResourcesRequired.h"
     28#include "SVGGraphicsElement.h"
    2829#include "SVGNames.h"
    2930#include "SVGPathByteStream.h"
    3031#include "SVGPathSegList.h"
    31 #include "SVGStyledTransformableElement.h"
    32 #include "SVGTests.h"
    3332
    3433namespace WebCore {
    … …  
    5554class SVGPathSegListPropertyTearOff;
    5655
    57 class SVGPathElement FINAL : public SVGStyledTransformableElement,
    58                              public SVGTests,
     56class SVGPathElement FINAL : public SVGGraphicsElement,
    5957                             public SVGExternalResourcesRequired {
    6058public:
    … …  
    121119    END_DECLARE_ANIMATED_PROPERTIES
    122120
    123     // SVGTests
    124     virtual void synchronizeRequiredFeatures() { SVGTests::synchronizeRequiredFeatures(this); }
    125     virtual void synchronizeRequiredExtensions() { SVGTests::synchronizeRequiredExtensions(this); }
    126     virtual void synchronizeSystemLanguage() { SVGTests::synchronizeSystemLanguage(this); }
    127 
    128121    virtual RenderObject* createRenderer(RenderArena*, RenderStyle*) OVERRIDE;
    129122

  • trunk/Source/WebCore/svg/SVGPathElement.idl

    r152156 r152167  
    2727[
    2828    Conditional=SVG
    29 ] interface SVGPathElement : SVGStyledElement,
    30                              SVGTransformable {
     29] interface SVGPathElement : SVGGraphicsElement {
    3130    readonly attribute SVGAnimatedNumber pathLength;
    3231
    … …  
    111110
    112111SVGPathElement implements SVGExternalResourcesRequired;
    113 SVGPathElement implements SVGTests;

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

    r151800 r152167  
    3636#include "SVGElementInstance.h"
    3737#include "SVGFitToViewBox.h"
     38#include "SVGGraphicsElement.h"
    3839#include "SVGNames.h"
    3940#include "SVGRenderSupport.h"
    4041#include "SVGSVGElement.h"
    41 #include "SVGStyledTransformableElement.h"
    4242#include "SVGTransformable.h"
    4343

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

    r151800 r152167  
    5757    REGISTER_LOCAL_ANIMATED_PROPERTY(points)
    5858    REGISTER_LOCAL_ANIMATED_PROPERTY(externalResourcesRequired)
    59     REGISTER_PARENT_ANIMATED_PROPERTIES(SVGStyledTransformableElement)
    60     REGISTER_PARENT_ANIMATED_PROPERTIES(SVGTests)
     59    REGISTER_PARENT_ANIMATED_PROPERTIES(SVGGraphicsElement)
    6160END_REGISTER_ANIMATED_PROPERTIES
    6261
    6362SVGPolyElement::SVGPolyElement(const QualifiedName& tagName, Document* document)
    64     : SVGStyledTransformableElement(tagName, document)
     63    : SVGGraphicsElement(tagName, document)
    6564{
    6665    registerAnimatedPropertiesForSVGPolyElement();   
    … …  
    8281{
    8382    if (!isSupportedAttribute(name)) {
    84         SVGStyledTransformableElement::parseAttribute(name, value);
     83        SVGGraphicsElement::parseAttribute(name, value);
    8584        return;
    8685    }
    … …  
    111110{
    112111    if (!isSupportedAttribute(attrName)) {
    113         SVGStyledTransformableElement::svgAttributeChanged(attrName);
     112        SVGGraphicsElement::svgAttributeChanged(attrName);
    114113        return;
    115114    }

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

    r152156 r152167  
    2525#include "SVGAnimatedBoolean.h"
    2626#include "SVGExternalResourcesRequired.h"
     27#include "SVGGraphicsElement.h"
    2728#include "SVGNames.h"
    2829#include "SVGPointList.h"
    29 #include "SVGStyledTransformableElement.h"
    30 #include "SVGTests.h"
    3130
    3231namespace WebCore {
    3332
    34 class SVGPolyElement : public SVGStyledTransformableElement
    35                      , public SVGTests
     33class SVGPolyElement : public SVGGraphicsElement
    3634                     , public SVGExternalResourcesRequired {
    3735public:
    … …  
    6462    END_DECLARE_ANIMATED_PROPERTIES
    6563
    66     // SVGTests
    67     virtual void synchronizeRequiredFeatures() { SVGTests::synchronizeRequiredFeatures(this); }
    68     virtual void synchronizeRequiredExtensions() { SVGTests::synchronizeRequiredExtensions(this); }
    69     virtual void synchronizeSystemLanguage() { SVGTests::synchronizeSystemLanguage(this); }
    70 
    7164protected:
    7265    mutable SVGSynchronizableAnimatedProperty<SVGPointList> m_points;

  • trunk/Source/WebCore/svg/SVGPolygonElement.idl

    r152156 r152167  
    2626[
    2727    Conditional=SVG
    28 ] interface SVGPolygonElement : SVGStyledElement,
    29                                 SVGTransformable {
     28] interface SVGPolygonElement : SVGGraphicsElement {
    3029    readonly attribute SVGPointList points;
    3130    readonly attribute SVGPointList animatedPoints;
    … …  
    3332
    3433SVGPolygonElement implements SVGExternalResourcesRequired;
    35 SVGPolygonElement implements SVGTests;

  • trunk/Source/WebCore/svg/SVGPolylineElement.idl

    r152156 r152167  
    2626[
    2727    Conditional=SVG
    28 ] interface SVGPolylineElement : SVGStyledElement,
    29                                  SVGTransformable {
     28] interface SVGPolylineElement : SVGGraphicsElement {
    3029    readonly attribute SVGPointList points;
    3130    readonly attribute SVGPointList animatedPoints;
    … …  
    3332
    3433SVGPolylineElement implements SVGExternalResourcesRequired;
    35 SVGPolylineElement implements SVGTests;

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

    r151800 r152167  
    5151    REGISTER_LOCAL_ANIMATED_PROPERTY(ry)
    5252    REGISTER_LOCAL_ANIMATED_PROPERTY(externalResourcesRequired)
    53     REGISTER_PARENT_ANIMATED_PROPERTIES(SVGStyledTransformableElement)
    54     REGISTER_PARENT_ANIMATED_PROPERTIES(SVGTests)
     53    REGISTER_PARENT_ANIMATED_PROPERTIES(SVGGraphicsElement)
    5554END_REGISTER_ANIMATED_PROPERTIES
    5655
    5756inline SVGRectElement::SVGRectElement(const QualifiedName& tagName, Document* document)
    58     : SVGStyledTransformableElement(tagName, document)
     57    : SVGGraphicsElement(tagName, document)
    5958    , m_x(LengthModeWidth)
    6059    , m_y(LengthModeHeight)
    … …  
    9594
    9695    if (!isSupportedAttribute(name))
    97         SVGStyledTransformableElement::parseAttribute(name, value);
     96        SVGGraphicsElement::parseAttribute(name, value);
    9897    else if (name == SVGNames::xAttr)
    9998        setXBaseValue(SVGLength::construct(LengthModeWidth, value, parseError));
    … …  
    120119{
    121120    if (!isSupportedAttribute(attrName)) {
    122         SVGStyledTransformableElement::svgAttributeChanged(attrName);
     121        SVGGraphicsElement::svgAttributeChanged(attrName);
    123122        return;
    124123    }

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

    r152156 r152167  
    2626#include "SVGAnimatedLength.h"
    2727#include "SVGExternalResourcesRequired.h"
    28 #include "SVGStyledTransformableElement.h"
    29 #include "SVGTests.h"
     28#include "SVGGraphicsElement.h"
    3029
    3130namespace WebCore {
    3231
    33 class SVGRectElement FINAL : public SVGStyledTransformableElement,
    34                              public SVGTests,
     32class SVGRectElement FINAL : public SVGGraphicsElement,
    3533                             public SVGExternalResourcesRequired {
    3634public:
    … …  
    6058        DECLARE_ANIMATED_BOOLEAN(ExternalResourcesRequired, externalResourcesRequired)
    6159    END_DECLARE_ANIMATED_PROPERTIES
    62 
    63     // SVGTests
    64     virtual void synchronizeRequiredFeatures() { SVGTests::synchronizeRequiredFeatures(this); }
    65     virtual void synchronizeRequiredExtensions() { SVGTests::synchronizeRequiredExtensions(this); }
    66     virtual void synchronizeSystemLanguage() { SVGTests::synchronizeSystemLanguage(this); }
    6760};
    6861

  • trunk/Source/WebCore/svg/SVGRectElement.idl

    r152156 r152167  
    2727[
    2828    Conditional=SVG
    29 ] interface SVGRectElement : SVGStyledElement,
    30                              SVGTransformable {
     29] interface SVGRectElement : SVGGraphicsElement {
    3130    readonly attribute SVGAnimatedLength x;
    3231    readonly attribute SVGAnimatedLength y;
    … …  
    3837
    3938SVGRectElement implements SVGExternalResourcesRequired;
    40 SVGRectElement implements SVGTests;

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

    r149102 r152167  
    7979    REGISTER_LOCAL_ANIMATED_PROPERTY(viewBox)
    8080    REGISTER_LOCAL_ANIMATED_PROPERTY(preserveAspectRatio)
    81     REGISTER_PARENT_ANIMATED_PROPERTIES(SVGStyledTransformableElement)
    82     REGISTER_PARENT_ANIMATED_PROPERTIES(SVGTests)
     81    REGISTER_PARENT_ANIMATED_PROPERTIES(SVGGraphicsElement)
    8382END_REGISTER_ANIMATED_PROPERTIES
    8483
    8584inline SVGSVGElement::SVGSVGElement(const QualifiedName& tagName, Document* doc)
    86     : SVGStyledTransformableElement(tagName, doc)
     85    : SVGGraphicsElement(tagName, doc)
    8786    , m_x(LengthModeWidth)
    8887    , m_y(LengthModeHeight)
    … …  
    118117        oldDocument->unregisterForPageCacheSuspensionCallbacks(this);
    119118    document()->registerForPageCacheSuspensionCallbacks(this);
    120     SVGStyledTransformableElement::didMoveToNewDocument(oldDocument);
     119    SVGGraphicsElement::didMoveToNewDocument(oldDocument);
    121120}
    122121
    … …  
    276275               || SVGZoomAndPan::parseAttribute(this, name, value)) {
    277276    } else
    278         SVGStyledTransformableElement::parseAttribute(name, value);
     277        SVGGraphicsElement::parseAttribute(name, value);
    279278
    280279    reportAttributeParsingError(parseError, name, value);
    … …  
    512511            timeContainer()->begin();
    513512    }
    514     return SVGStyledTransformableElement::insertedInto(rootParent);
     513    return SVGGraphicsElement::insertedInto(rootParent);
    515514}
    516515
    … …  
    519518    if (rootParent->inDocument())
    520519        document()->accessSVGExtensions()->removeTimeContainer(this);
    521     SVGStyledTransformableElement::removedFrom(rootParent);
     520    SVGGraphicsElement::removedFrom(rootParent);
    522521}
    523522

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

    r152156 r152167  
    2929#include "SVGExternalResourcesRequired.h"
    3030#include "SVGFitToViewBox.h"
    31 #include "SVGStyledTransformableElement.h"
    32 #include "SVGTests.h"
     31#include "SVGGraphicsElement.h"
    3332#include "SVGZoomAndPan.h"
    3433
    … …  
    4241class SMILTimeContainer;
    4342
    44 class SVGSVGElement FINAL : public SVGStyledTransformableElement,
    45                             public SVGTests,
     43class SVGSVGElement FINAL : public SVGGraphicsElement,
    4644                            public SVGExternalResourcesRequired,
    4745                            public SVGFitToViewBox,
    … …  
    5048    static PassRefPtr<SVGSVGElement> create(const QualifiedName&, Document*);
    5149
    52     using SVGStyledTransformableElement::ref;
    53     using SVGStyledTransformableElement::deref;
     50    using SVGGraphicsElement::ref;
     51    using SVGGraphicsElement::deref;
    5452
    5553    virtual bool isValid() const { return SVGTests::isValid(); }
    … …  
    176174    END_DECLARE_ANIMATED_PROPERTIES
    177175
    178     // SVGTests
    179     virtual void synchronizeRequiredFeatures() { SVGTests::synchronizeRequiredFeatures(this); }
    180     virtual void synchronizeRequiredExtensions() { SVGTests::synchronizeRequiredExtensions(this); }
    181     virtual void synchronizeSystemLanguage() { SVGTests::synchronizeSystemLanguage(this); }
    182 
    183176    virtual void documentWillSuspendForPageCache();
    184177    virtual void documentDidResumeFromPageCache();

  • trunk/Source/WebCore/svg/SVGSVGElement.idl

    r152156 r152167  
    2626[
    2727    Conditional=SVG
    28 ] interface SVGSVGElement : SVGStyledElement,
    29                             SVGTransformable {
     28] interface SVGSVGElement : SVGGraphicsElement {
    3029    readonly attribute SVGAnimatedLength x;
    3130    readonly attribute SVGAnimatedLength y;
    … …  
    7675SVGSVGElement implements SVGExternalResourcesRequired;
    7776SVGSVGElement implements SVGFitToViewBox;
    78 SVGSVGElement implements SVGTests;
    7977SVGSVGElement implements SVGZoomAndPan;

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

    r148395 r152167  
    427427AffineTransform SVGStyledElement::localCoordinateSpaceTransform(SVGLocatable::CTMScope) const
    428428{
    429     // To be overriden by SVGStyledLocatableElement/SVGStyledTransformableElement (or as special case SVGTextElement and SVGPatternElement)
     429    // To be overriden by SVGStyledLocatableElement/SVGGraphicsElement (or as special case SVGTextElement and SVGPatternElement)
    430430    return AffineTransform();
    431431}

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

    r145377 r152167  
    3535BEGIN_REGISTER_ANIMATED_PROPERTIES(SVGSwitchElement)
    3636    REGISTER_LOCAL_ANIMATED_PROPERTY(externalResourcesRequired)
    37     REGISTER_PARENT_ANIMATED_PROPERTIES(SVGStyledTransformableElement)
    38     REGISTER_PARENT_ANIMATED_PROPERTIES(SVGTests)
     37    REGISTER_PARENT_ANIMATED_PROPERTIES(SVGGraphicsElement)
    3938END_REGISTER_ANIMATED_PROPERTIES
    4039
    4140inline SVGSwitchElement::SVGSwitchElement(const QualifiedName& tagName, Document* document)
    42     : SVGStyledTransformableElement(tagName, document)
     41    : SVGGraphicsElement(tagName, document)
    4342{
    4443    ASSERT(hasTagName(SVGNames::switchTag));

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

    r152156 r152167  
    2525#include "SVGAnimatedBoolean.h"
    2626#include "SVGExternalResourcesRequired.h"
    27 #include "SVGStyledTransformableElement.h"
    28 #include "SVGTests.h"
     27#include "SVGGraphicsElement.h"
    2928
    3029namespace WebCore {
    3130
    32 class SVGSwitchElement FINAL : public SVGStyledTransformableElement,
    33                                public SVGTests,
     31class SVGSwitchElement FINAL : public SVGGraphicsElement,
    3432                               public SVGExternalResourcesRequired {
    3533public:
    … …  
    4947        DECLARE_ANIMATED_BOOLEAN(ExternalResourcesRequired, externalResourcesRequired)
    5048    END_DECLARE_ANIMATED_PROPERTIES
    51 
    52     // SVGTests
    53     virtual void synchronizeRequiredFeatures() { SVGTests::synchronizeRequiredFeatures(this); }
    54     virtual void synchronizeRequiredExtensions() { SVGTests::synchronizeRequiredExtensions(this); }
    55     virtual void synchronizeSystemLanguage() { SVGTests::synchronizeSystemLanguage(this); }
    5649};
    5750

  • trunk/Source/WebCore/svg/SVGSwitchElement.idl

    r152156 r152167  
    2626[
    2727    Conditional=SVG
    28 ] interface SVGSwitchElement : SVGStyledElement,
    29                                SVGTransformable {
     28] interface SVGSwitchElement : SVGGraphicsElement {
    3029};
    3130
    3231SVGSwitchElement implements SVGExternalResourcesRequired;
    33 SVGSwitchElement implements SVGTests;

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

    r151800 r152167  
    8080    REGISTER_LOCAL_ANIMATED_PROPERTY(href)
    8181    REGISTER_LOCAL_ANIMATED_PROPERTY(externalResourcesRequired)
    82     REGISTER_PARENT_ANIMATED_PROPERTIES(SVGStyledTransformableElement)
    83     REGISTER_PARENT_ANIMATED_PROPERTIES(SVGTests)
     82    REGISTER_PARENT_ANIMATED_PROPERTIES(SVGGraphicsElement)
    8483END_REGISTER_ANIMATED_PROPERTIES
    8584
    8685inline SVGUseElement::SVGUseElement(const QualifiedName& tagName, Document* document, bool wasInsertedByParser)
    87     : SVGStyledTransformableElement(tagName, document)
     86    : SVGGraphicsElement(tagName, document)
    8887    , m_x(LengthModeWidth)
    8988    , m_y(LengthModeHeight)
    … …  
    154153
    155154    if (!isSupportedAttribute(name))
    156         SVGStyledTransformableElement::parseAttribute(name, value);
     155        SVGGraphicsElement::parseAttribute(name, value);
    157156    else if (name == SVGNames::xAttr)
    158157        setXBaseValue(SVGLength::construct(LengthModeWidth, value, parseError));
    … …  
    183182{
    184183    // This functions exists to assure assumptions made in the code regarding SVGElementInstance creation/destruction are satisfied.
    185     SVGStyledTransformableElement::insertedInto(rootParent);
     184    SVGGraphicsElement::insertedInto(rootParent);
    186185    if (!rootParent->inDocument())
    187186        return InsertionDone;
    … …  
    196195void SVGUseElement::removedFrom(ContainerNode* rootParent)
    197196{
    198     SVGStyledTransformableElement::removedFrom(rootParent);
     197    SVGGraphicsElement::removedFrom(rootParent);
    199198    if (rootParent->inDocument())
    200199        clearResourceReferences();
    … …  
    223222{
    224223    if (!isSupportedAttribute(attrName)) {
    225         SVGStyledTransformableElement::svgAttributeChanged(attrName);
     224        SVGGraphicsElement::svgAttributeChanged(attrName);
    226225        return;
    227226    }
    … …  
    563562        return;
    564563
    565     if (n->isSVGElement() && toSVGElement(n)->isStyledTransformable()) {
     564    if (n->isSVGElement() && toSVGElement(n)->isSVGGraphicsElement()) {
    566565        if (!isDirectReference(n))
    567566            // Spec: Indirect references are an error (14.3.5)
    568567            document()->accessSVGExtensions()->reportError("Not allowed to use indirect reference in <clip-path>");
    569568        else {
    570             toSVGStyledTransformableElement(n)->toClipPath(path);
     569            toSVGGraphicsElement(n)->toClipPath(path);
    571570            // FIXME: Avoid manual resolution of x/y here. Its potentially harmful.
    572571            SVGLengthContext lengthContext(this);
    … …  
    988987void SVGUseElement::finishParsingChildren()
    989988{
    990     SVGStyledTransformableElement::finishParsingChildren();
     989    SVGGraphicsElement::finishParsingChildren();
    991990    SVGExternalResourcesRequired::finishParsingChildren();
    992991    if (m_wasInsertedByParser) {

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

    r152156 r152167  
    2828#include "SVGAnimatedLength.h"
    2929#include "SVGExternalResourcesRequired.h"
    30 #include "SVGStyledTransformableElement.h"
    31 #include "SVGTests.h"
     30#include "SVGGraphicsElement.h"
    3231#include "SVGURIReference.h"
    3332
    … …  
    3736class SVGElementInstance;
    3837
    39 class SVGUseElement FINAL : public SVGStyledTransformableElement,
    40                             public SVGTests,
     38class SVGUseElement FINAL : public SVGGraphicsElement,
    4139                            public SVGExternalResourcesRequired,
    4240                            public SVGURIReference,
    … …  
    115113    void setCachedDocument(CachedResourceHandle<CachedSVGDocument>);
    116114
    117     // SVGTests
    118     virtual void synchronizeRequiredFeatures() { SVGTests::synchronizeRequiredFeatures(this); }
    119     virtual void synchronizeRequiredExtensions() { SVGTests::synchronizeRequiredExtensions(this); }
    120     virtual void synchronizeSystemLanguage() { SVGTests::synchronizeSystemLanguage(this); }
    121 
    122115    // SVGExternalResourcesRequired
    123116    virtual void setHaveFiredLoadEvent(bool haveFiredLoadEvent) { m_haveFiredLoadEvent = haveFiredLoadEvent; }

  • trunk/Source/WebCore/svg/SVGUseElement.idl

    r152156 r152167  
    2626[
    2727    Conditional=SVG
    28 ] interface SVGUseElement : SVGStyledElement,
    29                             SVGTransformable {
     28] interface SVGUseElement : SVGGraphicsElement {
    3029    readonly attribute SVGAnimatedLength   x;
    3130    readonly attribute SVGAnimatedLength   y;
    … …  
    3837
    3938SVGUseElement implements SVGExternalResourcesRequired;
    40 SVGUseElement implements SVGTests;
    4139SVGUseElement implements SVGURIReference;
Note: See TracChangeset for help on using the changeset viewer.