Skip to content
Permalink
Browse files
Merge SVGLangSpace into SVGElement
https://bugs.webkit.org/show_bug.cgi?id=118170

Reviewed by Kentaro Hara.

Remove SVGLangSpace IDL interface and move its attributes to SVGElement
to match the latest specification and simplify inheritance in SVG:
- https://svgwg.org/svg2-draft/types.html#InterfaceSVGElement

No new tests, no behavior change.

* DerivedSources.make:
* WebCore.xcodeproj/project.pbxproj:
* svg/SVGAElement.h:
* svg/SVGAElement.idl:
* svg/SVGCircleElement.h:
* svg/SVGCircleElement.idl:
* svg/SVGClipPathElement.h:
* svg/SVGClipPathElement.idl:
* svg/SVGDefsElement.h:
* svg/SVGDefsElement.idl:
* svg/SVGDescElement.h:
* svg/SVGDescElement.idl:
* svg/SVGElement.cpp:
(WebCore::SVGElement::parseAttribute):
* svg/SVGElement.h:
* svg/SVGElement.idl:
* svg/SVGEllipseElement.h:
* svg/SVGEllipseElement.idl:
* svg/SVGFEImageElement.h:
* svg/SVGFEImageElement.idl:
* svg/SVGFilterElement.h:
* svg/SVGFilterElement.idl:
* svg/SVGForeignObjectElement.h:
* svg/SVGForeignObjectElement.idl:
* svg/SVGGElement.h:
* svg/SVGGElement.idl:
* svg/SVGImageElement.h:
* svg/SVGImageElement.idl:
* svg/SVGLangSpace.idl: Removed.
* svg/SVGLineElement.h:
* svg/SVGLineElement.idl:
* svg/SVGMarkerElement.h:
* svg/SVGMarkerElement.idl:
* svg/SVGMaskElement.h:
* svg/SVGMaskElement.idl:
* svg/SVGPathElement.h:
* svg/SVGPathElement.idl:
* svg/SVGPatternElement.h:
* svg/SVGPatternElement.idl:
* svg/SVGPolyElement.h:
* svg/SVGPolygonElement.idl:
* svg/SVGPolylineElement.idl:
* svg/SVGRectElement.h:
* svg/SVGRectElement.idl:
* svg/SVGSVGElement.h:
* svg/SVGSVGElement.idl:
* svg/SVGStyleElement.h:
* svg/SVGStyleElement.idl:
* svg/SVGSwitchElement.h:
* svg/SVGSwitchElement.idl:
* svg/SVGSymbolElement.h:
* svg/SVGSymbolElement.idl:
* svg/SVGTextContentElement.h:
* svg/SVGTextContentElement.idl:
* svg/SVGTitleElement.h:
* svg/SVGTitleElement.idl:
* svg/SVGUseElement.h:
* svg/SVGUseElement.idl:


Canonical link: https://commits.webkit.org/136211@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@152156 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
cdumez committed Jun 28, 2013
1 parent 5e00ed4 commit 22612c0de4a3145e7eb3e9c70143c54a93d6b0e3
Showing 58 changed files with 90 additions and 126 deletions.
@@ -1,3 +1,75 @@
2013-06-28 Christophe Dumez <ch.dumez@sisa.samsung.com>

Merge SVGLangSpace into SVGElement
https://bugs.webkit.org/show_bug.cgi?id=118170

Reviewed by Kentaro Hara.

Remove SVGLangSpace IDL interface and move its attributes to SVGElement
to match the latest specification and simplify inheritance in SVG:
- https://svgwg.org/svg2-draft/types.html#InterfaceSVGElement

No new tests, no behavior change.

* DerivedSources.make:
* WebCore.xcodeproj/project.pbxproj:
* svg/SVGAElement.h:
* svg/SVGAElement.idl:
* svg/SVGCircleElement.h:
* svg/SVGCircleElement.idl:
* svg/SVGClipPathElement.h:
* svg/SVGClipPathElement.idl:
* svg/SVGDefsElement.h:
* svg/SVGDefsElement.idl:
* svg/SVGDescElement.h:
* svg/SVGDescElement.idl:
* svg/SVGElement.cpp:
(WebCore::SVGElement::parseAttribute):
* svg/SVGElement.h:
* svg/SVGElement.idl:
* svg/SVGEllipseElement.h:
* svg/SVGEllipseElement.idl:
* svg/SVGFEImageElement.h:
* svg/SVGFEImageElement.idl:
* svg/SVGFilterElement.h:
* svg/SVGFilterElement.idl:
* svg/SVGForeignObjectElement.h:
* svg/SVGForeignObjectElement.idl:
* svg/SVGGElement.h:
* svg/SVGGElement.idl:
* svg/SVGImageElement.h:
* svg/SVGImageElement.idl:
* svg/SVGLangSpace.idl: Removed.
* svg/SVGLineElement.h:
* svg/SVGLineElement.idl:
* svg/SVGMarkerElement.h:
* svg/SVGMarkerElement.idl:
* svg/SVGMaskElement.h:
* svg/SVGMaskElement.idl:
* svg/SVGPathElement.h:
* svg/SVGPathElement.idl:
* svg/SVGPatternElement.h:
* svg/SVGPatternElement.idl:
* svg/SVGPolyElement.h:
* svg/SVGPolygonElement.idl:
* svg/SVGPolylineElement.idl:
* svg/SVGRectElement.h:
* svg/SVGRectElement.idl:
* svg/SVGSVGElement.h:
* svg/SVGSVGElement.idl:
* svg/SVGStyleElement.h:
* svg/SVGStyleElement.idl:
* svg/SVGSwitchElement.h:
* svg/SVGSwitchElement.idl:
* svg/SVGSymbolElement.h:
* svg/SVGSymbolElement.idl:
* svg/SVGTextContentElement.h:
* svg/SVGTextContentElement.idl:
* svg/SVGTitleElement.h:
* svg/SVGTitleElement.idl:
* svg/SVGUseElement.h:
* svg/SVGUseElement.idl:

2013-06-28 Christophe Dumez <ch.dumez@sisa.samsung.com>

Use & instead of | in the value of [CallWith]
@@ -550,7 +550,6 @@ BINDING_IDLS = \
$(WebCore)/svg/SVGGradientElement.idl \
$(WebCore)/svg/SVGHKernElement.idl \
$(WebCore)/svg/SVGImageElement.idl \
$(WebCore)/svg/SVGLangSpace.idl \
$(WebCore)/svg/SVGLength.idl \
$(WebCore)/svg/SVGLengthList.idl \
$(WebCore)/svg/SVGLineElement.idl \
@@ -10612,7 +10612,6 @@
B22278980D00BF200071B782 /* SVGImageElement.idl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = SVGImageElement.idl; sourceTree = "<group>"; };
B22278990D00BF200071B782 /* SVGLangSpace.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SVGLangSpace.cpp; sourceTree = "<group>"; };
B222789A0D00BF200071B782 /* SVGLangSpace.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SVGLangSpace.h; sourceTree = "<group>"; };
B222789B0D00BF200071B782 /* SVGLangSpace.idl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = SVGLangSpace.idl; sourceTree = "<group>"; };
B222789C0D00BF200071B782 /* SVGLength.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SVGLength.cpp; sourceTree = "<group>"; };
B222789D0D00BF200071B782 /* SVGLength.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SVGLength.h; sourceTree = "<group>"; };
B222789E0D00BF200071B782 /* SVGLength.idl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = SVGLength.idl; sourceTree = "<group>"; };
@@ -17977,7 +17976,6 @@
B28C6A210D00C44800334AA4 /* SVGImageLoader.h */,
B22278990D00BF200071B782 /* SVGLangSpace.cpp */,
B222789A0D00BF200071B782 /* SVGLangSpace.h */,
B222789B0D00BF200071B782 /* SVGLangSpace.idl */,
B222789C0D00BF200071B782 /* SVGLength.cpp */,
B222789D0D00BF200071B782 /* SVGLength.h */,
B222789E0D00BF200071B782 /* SVGLength.idl */,
@@ -25,7 +25,6 @@
#if ENABLE(SVG)
#include "SVGAnimatedBoolean.h"
#include "SVGExternalResourcesRequired.h"
#include "SVGLangSpace.h"
#include "SVGStyledTransformableElement.h"
#include "SVGTests.h"
#include "SVGURIReference.h"
@@ -35,7 +34,6 @@ namespace WebCore {
class SVGAElement FINAL : public SVGStyledTransformableElement,
public SVGURIReference,
public SVGTests,
public SVGLangSpace,
public SVGExternalResourcesRequired {
public:
static PassRefPtr<SVGAElement> create(const QualifiedName&, Document*);
@@ -26,7 +26,6 @@
[
Conditional=SVG
] interface SVGAElement : SVGStyledElement,
SVGLangSpace,
SVGTransformable {
readonly attribute SVGAnimatedString target;
};
@@ -25,15 +25,13 @@
#include "SVGAnimatedBoolean.h"
#include "SVGAnimatedLength.h"
#include "SVGExternalResourcesRequired.h"
#include "SVGLangSpace.h"
#include "SVGStyledTransformableElement.h"
#include "SVGTests.h"

namespace WebCore {

class SVGCircleElement FINAL : public SVGStyledTransformableElement,
public SVGTests,
public SVGLangSpace,
public SVGExternalResourcesRequired {
public:
static PassRefPtr<SVGCircleElement> create(const QualifiedName&, Document*);
@@ -27,7 +27,6 @@
[
Conditional=SVG
] interface SVGCircleElement : SVGStyledElement,
SVGLangSpace,
SVGTransformable {
readonly attribute SVGAnimatedLength cx;
readonly attribute SVGAnimatedLength cy;
@@ -25,7 +25,6 @@
#include "SVGAnimatedBoolean.h"
#include "SVGAnimatedEnumeration.h"
#include "SVGExternalResourcesRequired.h"
#include "SVGLangSpace.h"
#include "SVGStyledTransformableElement.h"
#include "SVGTests.h"
#include "SVGUnitTypes.h"
@@ -36,7 +35,6 @@ class RenderObject;

class SVGClipPathElement FINAL : public SVGStyledTransformableElement,
public SVGTests,
public SVGLangSpace,
public SVGExternalResourcesRequired {
public:
static PassRefPtr<SVGClipPathElement> create(const QualifiedName&, Document*);
@@ -27,7 +27,6 @@
[
Conditional=SVG
] interface SVGClipPathElement : SVGStyledElement,
SVGLangSpace,
SVGTransformable {
readonly attribute SVGAnimatedEnumeration clipPathUnits;
};
@@ -24,15 +24,13 @@
#if ENABLE(SVG)
#include "SVGAnimatedBoolean.h"
#include "SVGExternalResourcesRequired.h"
#include "SVGLangSpace.h"
#include "SVGStyledTransformableElement.h"
#include "SVGTests.h"

namespace WebCore {

class SVGDefsElement FINAL : public SVGStyledTransformableElement,
public SVGTests,
public SVGLangSpace,
public SVGExternalResourcesRequired {
public:
static PassRefPtr<SVGDefsElement> create(const QualifiedName&, Document*);
@@ -26,7 +26,6 @@
[
Conditional=SVG
] interface SVGDefsElement : SVGStyledElement,
SVGLangSpace,
SVGTransformable {
};

@@ -22,13 +22,11 @@
#define SVGDescElement_h

#if ENABLE(SVG)
#include "SVGLangSpace.h"
#include "SVGStyledElement.h"

namespace WebCore {

class SVGDescElement FINAL : public SVGStyledElement,
public SVGLangSpace {
class SVGDescElement FINAL : public SVGStyledElement {
public:
static PassRefPtr<SVGDescElement> create(const QualifiedName&, Document*);

@@ -25,7 +25,6 @@

[
Conditional=SVG
] interface SVGDescElement : SVGStyledElement,
SVGLangSpace {
] interface SVGDescElement : SVGStyledElement {
};

@@ -338,7 +338,8 @@ void SVGElement::parseAttribute(const QualifiedName& name, const AtomicString& v
setAttributeEventListener(eventNames().focusoutEvent, createAttributeEventListener(this, name, value));
else if (name == SVGNames::onactivateAttr)
setAttributeEventListener(eventNames().DOMActivateEvent, createAttributeEventListener(this, name, value));
else
else if (SVGLangSpace::parseAttribute(name, value)) {
} else
StyledElement::parseAttribute(name, value);
}

@@ -23,6 +23,7 @@
#define SVGElement_h

#if ENABLE(SVG)
#include "SVGLangSpace.h"
#include "SVGLocatable.h"
#include "SVGParsingError.h"
#include "SVGPropertyInfo.h"
@@ -42,7 +43,7 @@ class SVGElementInstance;
class SVGElementRareData;
class SVGSVGElement;

class SVGElement : public StyledElement {
class SVGElement : public StyledElement, public SVGLangSpace {
public:
static PassRefPtr<SVGElement> create(const QualifiedName&, Document*);
virtual ~SVGElement();
@@ -28,5 +28,8 @@
[TreatNullAs=NullString, SetterRaisesException] attribute DOMString xmlbase;
readonly attribute SVGSVGElement ownerSVGElement;
readonly attribute SVGElement viewportElement;

attribute DOMString xmllang;
attribute DOMString xmlspace;
};

@@ -25,15 +25,13 @@
#include "SVGAnimatedBoolean.h"
#include "SVGAnimatedLength.h"
#include "SVGExternalResourcesRequired.h"
#include "SVGLangSpace.h"
#include "SVGStyledTransformableElement.h"
#include "SVGTests.h"

namespace WebCore {

class SVGEllipseElement FINAL : public SVGStyledTransformableElement,
public SVGTests,
public SVGLangSpace,
public SVGExternalResourcesRequired {
public:
static PassRefPtr<SVGEllipseElement> create(const QualifiedName&, Document*);
@@ -26,7 +26,6 @@
[
Conditional=SVG
] interface SVGEllipseElement : SVGStyledElement,
SVGLangSpace,
SVGTransformable {
readonly attribute SVGAnimatedLength cx;
readonly attribute SVGAnimatedLength cy;
@@ -30,14 +30,12 @@
#include "SVGExternalResourcesRequired.h"
#include "SVGFEImage.h"
#include "SVGFilterPrimitiveStandardAttributes.h"
#include "SVGLangSpace.h"
#include "SVGURIReference.h"

namespace WebCore {

class SVGFEImageElement FINAL : public SVGFilterPrimitiveStandardAttributes,
public SVGURIReference,
public SVGLangSpace,
public SVGExternalResourcesRequired,
public CachedImageClient {
public:
@@ -26,7 +26,6 @@
[
Conditional=SVG&FILTERS
] interface SVGFEImageElement : SVGStyledElement,
SVGLangSpace,
SVGFilterPrimitiveStandardAttributes {
readonly attribute SVGAnimatedPreserveAspectRatio preserveAspectRatio;
};
@@ -29,7 +29,6 @@
#include "SVGAnimatedInteger.h"
#include "SVGAnimatedLength.h"
#include "SVGExternalResourcesRequired.h"
#include "SVGLangSpace.h"
#include "SVGStyledElement.h"
#include "SVGURIReference.h"
#include "SVGUnitTypes.h"
@@ -38,7 +37,6 @@ namespace WebCore {

class SVGFilterElement FINAL : public SVGStyledElement,
public SVGURIReference,
public SVGLangSpace,
public SVGExternalResourcesRequired {
public:
static PassRefPtr<SVGFilterElement> create(const QualifiedName&, Document*);
@@ -26,8 +26,7 @@

[
Conditional=SVG&FILTERS
] interface SVGFilterElement : SVGStyledElement,
SVGLangSpace {
] interface SVGFilterElement : SVGStyledElement {
readonly attribute SVGAnimatedEnumeration filterUnits;
readonly attribute SVGAnimatedEnumeration primitiveUnits;
readonly attribute SVGAnimatedLength x;
@@ -24,7 +24,6 @@
#include "SVGAnimatedBoolean.h"
#include "SVGAnimatedLength.h"
#include "SVGExternalResourcesRequired.h"
#include "SVGLangSpace.h"
#include "SVGStyledTransformableElement.h"
#include "SVGTests.h"
#include "SVGURIReference.h"
@@ -33,7 +32,6 @@ namespace WebCore {

class SVGForeignObjectElement FINAL : public SVGStyledTransformableElement,
public SVGTests,
public SVGLangSpace,
public SVGExternalResourcesRequired {
public:
static PassRefPtr<SVGForeignObjectElement> create(const QualifiedName&, Document*);
@@ -26,7 +26,6 @@
[
Conditional=SVG
] interface SVGForeignObjectElement : SVGStyledElement,
SVGLangSpace,
SVGTransformable {
readonly attribute SVGAnimatedLength x;
readonly attribute SVGAnimatedLength y;
@@ -24,15 +24,13 @@
#if ENABLE(SVG)
#include "SVGAnimatedBoolean.h"
#include "SVGExternalResourcesRequired.h"
#include "SVGLangSpace.h"
#include "SVGStyledTransformableElement.h"
#include "SVGTests.h"

namespace WebCore {

class SVGGElement FINAL : public SVGStyledTransformableElement,
public SVGTests,
public SVGLangSpace,
public SVGExternalResourcesRequired {
public:
static PassRefPtr<SVGGElement> create(const QualifiedName&, Document*);
@@ -26,7 +26,6 @@
[
Conditional=SVG
] interface SVGGElement : SVGStyledElement,
SVGLangSpace,
SVGTransformable {
};

@@ -27,7 +27,6 @@
#include "SVGAnimatedPreserveAspectRatio.h"
#include "SVGExternalResourcesRequired.h"
#include "SVGImageLoader.h"
#include "SVGLangSpace.h"
#include "SVGStyledTransformableElement.h"
#include "SVGTests.h"
#include "SVGURIReference.h"
@@ -36,7 +35,6 @@ namespace WebCore {

class SVGImageElement FINAL : public SVGStyledTransformableElement,
public SVGTests,
public SVGLangSpace,
public SVGExternalResourcesRequired,
public SVGURIReference {
public:

0 comments on commit 22612c0

Please sign in to comment.