Merge SVGStylable into SVGStyledElement
authorpdr@google.com <pdr@google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 20 Jan 2013 03:12:17 +0000 (03:12 +0000)
committerpdr@google.com <pdr@google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 20 Jan 2013 03:12:17 +0000 (03:12 +0000)
https://bugs.webkit.org/show_bug.cgi?id=106877

.:

Reviewed by Dirk Schulze.

SVG2 changes element inheritance so all SVGElements are stylable. As a first-step towards a
cleaner class hierarchy, this patch moves SVGStylable into SVGStyledElement.

* wscript:

Source/WebCore:

Reviewed by Dirk Schulze.

SVG2 changes element inheritance so all SVGElements are stylable. As a first-step towards a
cleaner class hierarchy, this patch moves SVGStylable into SVGStyledElement.

No new tests as this is just a refactoring.

* CMakeLists.txt:
* DerivedSources.make:
* GNUmakefile.list.am:
* Target.pri:
* WebCore.exp.in:
* WebCore.gyp/WebCore.gyp:
* WebCore.gypi:
* WebCore.vcproj/WebCore.vcproj:
* WebCore.xcodeproj/project.pbxproj:
* bindings/objc/DOMSVG.h:
* bindings/scripts/CodeGeneratorObjC.pm:
* page/DOMWindow.idl:
* svg/SVGAElement.idl:
* svg/SVGAllInOne.cpp:
* svg/SVGCircleElement.idl:
* svg/SVGClipPathElement.idl:
* svg/SVGDefsElement.idl:
* svg/SVGDescElement.idl:
* svg/SVGEllipseElement.idl:
* svg/SVGFEBlendElement.idl:
* svg/SVGFEColorMatrixElement.idl:
* svg/SVGFEComponentTransferElement.idl:
* svg/SVGFECompositeElement.idl:
* svg/SVGFEConvolveMatrixElement.idl:
* svg/SVGFEDiffuseLightingElement.idl:
* svg/SVGFEDisplacementMapElement.idl:
* svg/SVGFEDropShadowElement.idl:
* svg/SVGFEFloodElement.idl:
* svg/SVGFEGaussianBlurElement.idl:
* svg/SVGFEImageElement.idl:
* svg/SVGFEMergeElement.idl:
* svg/SVGFEMorphologyElement.idl:
* svg/SVGFEOffsetElement.idl:
* svg/SVGFESpecularLightingElement.idl:
* svg/SVGFETileElement.idl:
* svg/SVGFETurbulenceElement.idl:
* svg/SVGFilterElement.idl:
* svg/SVGFilterPrimitiveStandardAttributes.idl:
* svg/SVGForeignObjectElement.idl:
* svg/SVGGElement.idl:
* svg/SVGGlyphRefElement.idl:
* svg/SVGGradientElement.idl:
* svg/SVGImageElement.idl:
* svg/SVGLineElement.idl:
* svg/SVGMarkerElement.idl:
* svg/SVGMaskElement.idl:
* svg/SVGMissingGlyphElement.idl:
* svg/SVGPathElement.idl:
* svg/SVGPatternElement.idl:
* svg/SVGPolygonElement.idl:
* svg/SVGPolylineElement.idl:
* svg/SVGRectElement.idl:
* svg/SVGSVGElement.idl:
* svg/SVGStopElement.idl:
* svg/SVGStylable.cpp: Removed.
* svg/SVGStylable.h: Removed.
* svg/SVGStylable.idl: Removed.
* svg/SVGStyledElement.h:
(WebCore):
* svg/SVGStyledElement.idl: Added.
* svg/SVGSwitchElement.idl:
* svg/SVGSymbolElement.idl:
* svg/SVGTextContentElement.idl:
* svg/SVGTitleElement.idl:
* svg/SVGUseElement.idl:

Source/WebKit/mac:

SVG2 changes element inheritance so all SVGElements are stylable. As a first-step towards a
cleaner class hierarchy, this patch moves SVGStylable into SVGStyledElement.

Reviewed by Dirk Schulze.

* MigrateHeaders.make:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@140265 268f45cc-cd09-0410-ab3c-d52691b4dbfc

70 files changed:
ChangeLog
Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/DerivedSources.cpp
Source/WebCore/DerivedSources.make
Source/WebCore/DerivedSources.pri
Source/WebCore/GNUmakefile.list.am
Source/WebCore/Target.pri
Source/WebCore/WebCore.exp.in
Source/WebCore/WebCore.gyp/WebCore.gyp
Source/WebCore/WebCore.gypi
Source/WebCore/WebCore.vcproj/WebCore.vcproj
Source/WebCore/WebCore.xcodeproj/project.pbxproj
Source/WebCore/bindings/objc/DOMSVG.h
Source/WebCore/bindings/scripts/CodeGeneratorObjC.pm
Source/WebCore/page/DOMWindow.idl
Source/WebCore/svg/SVGAElement.idl
Source/WebCore/svg/SVGAllInOne.cpp
Source/WebCore/svg/SVGCircleElement.idl
Source/WebCore/svg/SVGClipPathElement.idl
Source/WebCore/svg/SVGDefsElement.idl
Source/WebCore/svg/SVGDescElement.idl
Source/WebCore/svg/SVGEllipseElement.idl
Source/WebCore/svg/SVGFEBlendElement.idl
Source/WebCore/svg/SVGFEColorMatrixElement.idl
Source/WebCore/svg/SVGFEComponentTransferElement.idl
Source/WebCore/svg/SVGFECompositeElement.idl
Source/WebCore/svg/SVGFEConvolveMatrixElement.idl
Source/WebCore/svg/SVGFEDiffuseLightingElement.idl
Source/WebCore/svg/SVGFEDisplacementMapElement.idl
Source/WebCore/svg/SVGFEDropShadowElement.idl
Source/WebCore/svg/SVGFEFloodElement.idl
Source/WebCore/svg/SVGFEGaussianBlurElement.idl
Source/WebCore/svg/SVGFEImageElement.idl
Source/WebCore/svg/SVGFEMergeElement.idl
Source/WebCore/svg/SVGFEMorphologyElement.idl
Source/WebCore/svg/SVGFEOffsetElement.idl
Source/WebCore/svg/SVGFESpecularLightingElement.idl
Source/WebCore/svg/SVGFETileElement.idl
Source/WebCore/svg/SVGFETurbulenceElement.idl
Source/WebCore/svg/SVGFilterElement.idl
Source/WebCore/svg/SVGFilterPrimitiveStandardAttributes.idl
Source/WebCore/svg/SVGForeignObjectElement.idl
Source/WebCore/svg/SVGGElement.idl
Source/WebCore/svg/SVGGlyphRefElement.idl
Source/WebCore/svg/SVGGradientElement.idl
Source/WebCore/svg/SVGImageElement.idl
Source/WebCore/svg/SVGLineElement.idl
Source/WebCore/svg/SVGMarkerElement.idl
Source/WebCore/svg/SVGMaskElement.idl
Source/WebCore/svg/SVGMissingGlyphElement.idl
Source/WebCore/svg/SVGPathElement.idl
Source/WebCore/svg/SVGPatternElement.idl
Source/WebCore/svg/SVGPolygonElement.idl
Source/WebCore/svg/SVGPolylineElement.idl
Source/WebCore/svg/SVGRectElement.idl
Source/WebCore/svg/SVGSVGElement.idl
Source/WebCore/svg/SVGStopElement.idl
Source/WebCore/svg/SVGStylable.cpp [deleted file]
Source/WebCore/svg/SVGStylable.h [deleted file]
Source/WebCore/svg/SVGStyledElement.h
Source/WebCore/svg/SVGStyledElement.idl [moved from Source/WebCore/svg/SVGStylable.idl with 93% similarity]
Source/WebCore/svg/SVGSwitchElement.idl
Source/WebCore/svg/SVGSymbolElement.idl
Source/WebCore/svg/SVGTextContentElement.idl
Source/WebCore/svg/SVGTitleElement.idl
Source/WebCore/svg/SVGUseElement.idl
Source/WebKit/mac/ChangeLog
Source/WebKit/mac/MigrateHeaders.make
wscript

index bd07a18..aee606e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2013-01-19  Philip Rogers  <pdr@google.com>
+
+        Merge SVGStylable into SVGStyledElement
+        https://bugs.webkit.org/show_bug.cgi?id=106877
+
+        Reviewed by Dirk Schulze.
+
+        SVG2 changes element inheritance so all SVGElements are stylable. As a first-step towards a
+        cleaner class hierarchy, this patch moves SVGStylable into SVGStyledElement.
+
+        * wscript:
+
 2013-01-18  Sudarsana Nagineni  <sudarsana.nagineni@intel.com>
 
         [CMake] Fix CMake warnings
index 9b44cda..2c7a5d6 100644 (file)
@@ -751,6 +751,7 @@ set(WebCore_SVG_IDL_FILES
     svg/SVGStopElement.idl
     svg/SVGStringList.idl
     svg/SVGStyleElement.idl
+    svg/SVGStyledElement.idl
     svg/SVGSwitchElement.idl
     svg/SVGSymbolElement.idl
     svg/SVGTRefElement.idl
@@ -2441,7 +2442,6 @@ set(WebCore_SOURCES
     svg/SVGSetElement.cpp
     svg/SVGStopElement.cpp
     svg/SVGStringList.cpp
-    svg/SVGStylable.cpp
     svg/SVGStyleElement.cpp
     svg/SVGStyledElement.cpp
     svg/SVGStyledLocatableElement.cpp
index f0fb264..a59fc6f 100644 (file)
@@ -1,3 +1,81 @@
+2013-01-19  Philip Rogers  <pdr@google.com>
+
+        Merge SVGStylable into SVGStyledElement
+        https://bugs.webkit.org/show_bug.cgi?id=106877
+
+        Reviewed by Dirk Schulze.
+
+        SVG2 changes element inheritance so all SVGElements are stylable. As a first-step towards a
+        cleaner class hierarchy, this patch moves SVGStylable into SVGStyledElement.
+
+        No new tests as this is just a refactoring.
+
+        * CMakeLists.txt:
+        * DerivedSources.make:
+        * GNUmakefile.list.am:
+        * Target.pri:
+        * WebCore.exp.in:
+        * WebCore.gyp/WebCore.gyp:
+        * WebCore.gypi:
+        * WebCore.vcproj/WebCore.vcproj:
+        * WebCore.xcodeproj/project.pbxproj:
+        * bindings/objc/DOMSVG.h:
+        * bindings/scripts/CodeGeneratorObjC.pm:
+        * page/DOMWindow.idl:
+        * svg/SVGAElement.idl:
+        * svg/SVGAllInOne.cpp:
+        * svg/SVGCircleElement.idl:
+        * svg/SVGClipPathElement.idl:
+        * svg/SVGDefsElement.idl:
+        * svg/SVGDescElement.idl:
+        * svg/SVGEllipseElement.idl:
+        * svg/SVGFEBlendElement.idl:
+        * svg/SVGFEColorMatrixElement.idl:
+        * svg/SVGFEComponentTransferElement.idl:
+        * svg/SVGFECompositeElement.idl:
+        * svg/SVGFEConvolveMatrixElement.idl:
+        * svg/SVGFEDiffuseLightingElement.idl:
+        * svg/SVGFEDisplacementMapElement.idl:
+        * svg/SVGFEDropShadowElement.idl:
+        * svg/SVGFEFloodElement.idl:
+        * svg/SVGFEGaussianBlurElement.idl:
+        * svg/SVGFEImageElement.idl:
+        * svg/SVGFEMergeElement.idl:
+        * svg/SVGFEMorphologyElement.idl:
+        * svg/SVGFEOffsetElement.idl:
+        * svg/SVGFESpecularLightingElement.idl:
+        * svg/SVGFETileElement.idl:
+        * svg/SVGFETurbulenceElement.idl:
+        * svg/SVGFilterElement.idl:
+        * svg/SVGFilterPrimitiveStandardAttributes.idl:
+        * svg/SVGForeignObjectElement.idl:
+        * svg/SVGGElement.idl:
+        * svg/SVGGlyphRefElement.idl:
+        * svg/SVGGradientElement.idl:
+        * svg/SVGImageElement.idl:
+        * svg/SVGLineElement.idl:
+        * svg/SVGMarkerElement.idl:
+        * svg/SVGMaskElement.idl:
+        * svg/SVGMissingGlyphElement.idl:
+        * svg/SVGPathElement.idl:
+        * svg/SVGPatternElement.idl:
+        * svg/SVGPolygonElement.idl:
+        * svg/SVGPolylineElement.idl:
+        * svg/SVGRectElement.idl:
+        * svg/SVGSVGElement.idl:
+        * svg/SVGStopElement.idl:
+        * svg/SVGStylable.cpp: Removed.
+        * svg/SVGStylable.h: Removed.
+        * svg/SVGStylable.idl: Removed.
+        * svg/SVGStyledElement.h:
+        (WebCore):
+        * svg/SVGStyledElement.idl: Added.
+        * svg/SVGSwitchElement.idl:
+        * svg/SVGSymbolElement.idl:
+        * svg/SVGTextContentElement.idl:
+        * svg/SVGTitleElement.idl:
+        * svg/SVGUseElement.idl:
+
 2013-01-19  Tim Horton  <timothy_horton@apple.com>
 
         CanvasRenderingContext2D::drawTextInternal should create a mask buffer compatible with that of the canvas
index 3b117fa..3797274 100644 (file)
 #include "JSSVGRect.cpp"
 #include "JSSVGRectElement.cpp"
 #include "JSSVGRenderingIntent.cpp"
+#include "JSSVGSVGElement.cpp"
 #include "JSSVGScriptElement.cpp"
 #include "JSSVGSetElement.cpp"
 #include "JSSVGStopElement.cpp"
 #include "JSSVGStringList.cpp"
 #include "JSSVGStyleElement.cpp"
-#include "JSSVGSVGElement.cpp"
+#include "JSSVGStyledElement.cpp"
 #include "JSSVGSwitchElement.cpp"
 #include "JSSVGSymbolElement.cpp"
 #include "JSSVGTextContentElement.cpp"
index 37f0b69..4663d93 100644 (file)
@@ -582,8 +582,8 @@ BINDING_IDLS = \
     $(WebCore)/svg/SVGSetElement.idl \
     $(WebCore)/svg/SVGStopElement.idl \
     $(WebCore)/svg/SVGStringList.idl \
-    $(WebCore)/svg/SVGStylable.idl \
     $(WebCore)/svg/SVGStyleElement.idl \
+    $(WebCore)/svg/SVGStyledElement.idl \
     $(WebCore)/svg/SVGSwitchElement.idl \
     $(WebCore)/svg/SVGSymbolElement.idl \
     $(WebCore)/svg/SVGTRefElement.idl \
index e721d7f..d3c0a80 100644 (file)
@@ -609,6 +609,7 @@ enable?(SVG) {
     $$PWD/svg/SVGStopElement.idl \
     $$PWD/svg/SVGStringList.idl \
     $$PWD/svg/SVGStyleElement.idl \
+    $$PWD/svg/SVGStyledElement.idl \
     $$PWD/svg/SVGSVGElement.idl \
     $$PWD/svg/SVGSwitchElement.idl \
     $$PWD/svg/SVGSymbolElement.idl \
index 75657eb..078f57f 100644 (file)
@@ -1140,9 +1140,10 @@ webcore_svg_built_sources += \
        DerivedSources/WebCore/JSSVGStopElement.h \
        DerivedSources/WebCore/JSSVGStringList.cpp \
        DerivedSources/WebCore/JSSVGStringList.h \
-       DerivedSources/WebCore/JSSVGStylable.h \
        DerivedSources/WebCore/JSSVGStyleElement.cpp \
        DerivedSources/WebCore/JSSVGStyleElement.h \
+       DerivedSources/WebCore/JSSVGStyledElement.cpp \
+       DerivedSources/WebCore/JSSVGStyledElement.h \
        DerivedSources/WebCore/JSSVGSVGElement.cpp \
        DerivedSources/WebCore/JSSVGSVGElement.h \
        DerivedSources/WebCore/JSSVGSwitchElement.cpp \
@@ -1726,6 +1727,7 @@ dom_binding_idls += \
        $(WebCore)/svg/SVGStopElement.idl \
        $(WebCore)/svg/SVGStringList.idl \
        $(WebCore)/svg/SVGStyleElement.idl \
+       $(WebCore)/svg/SVGStyledElement.idl \
        $(WebCore)/svg/SVGSwitchElement.idl \
        $(WebCore)/svg/SVGSymbolElement.idl \
        $(WebCore)/svg/SVGTRefElement.idl \
@@ -5186,16 +5188,14 @@ webcore_svg_sources += \
        Source/WebCore/svg/SVGStopElement.h \
        Source/WebCore/svg/SVGStringList.cpp \
        Source/WebCore/svg/SVGStringList.h \
-       Source/WebCore/svg/SVGStylable.cpp \
-       Source/WebCore/svg/SVGStylable.h \
+       Source/WebCore/svg/SVGStyleElement.cpp \
+       Source/WebCore/svg/SVGStyleElement.h \
        Source/WebCore/svg/SVGStyledElement.cpp \
        Source/WebCore/svg/SVGStyledElement.h \
        Source/WebCore/svg/SVGStyledLocatableElement.cpp \
        Source/WebCore/svg/SVGStyledLocatableElement.h \
        Source/WebCore/svg/SVGStyledTransformableElement.cpp \
        Source/WebCore/svg/SVGStyledTransformableElement.h \
-       Source/WebCore/svg/SVGStyleElement.cpp \
-       Source/WebCore/svg/SVGStyleElement.h \
        Source/WebCore/svg/SVGSVGElement.cpp \
        Source/WebCore/svg/SVGSVGElement.h \
        Source/WebCore/svg/SVGSwitchElement.cpp \
index a0d6061..09cca80 100644 (file)
@@ -2766,11 +2766,10 @@ HEADERS += \
     svg/SVGSetElement.h \
     svg/SVGStopElement.h \
     svg/SVGStringList.h \
-    svg/SVGStylable.h \
+    svg/SVGStyleElement.h \
     svg/SVGStyledElement.h \
     svg/SVGStyledLocatableElement.h \
     svg/SVGStyledTransformableElement.h \
-    svg/SVGStyleElement.h \
     svg/SVGSVGElement.h \
     svg/SVGSwitchElement.h \
     svg/SVGSymbolElement.h \
@@ -3860,7 +3859,6 @@ enable?(SVG) {
         svg/SVGSetElement.cpp \
         svg/SVGStopElement.cpp \
         svg/SVGStringList.cpp \
-        svg/SVGStylable.cpp \
         svg/SVGStyleElement.cpp \
         svg/SVGStyledElement.cpp \
         svg/SVGStyledLocatableElement.cpp \
index 865dcc9..8052f09 100644 (file)
@@ -2631,6 +2631,7 @@ __ZN7WebCore8Document19accessSVGExtensionsEv
 .objc_class_name_DOMSVGStopElement
 .objc_class_name_DOMSVGStringList
 .objc_class_name_DOMSVGStyleElement
+.objc_class_name_DOMSVGStyledElement
 .objc_class_name_DOMSVGSwitchElement
 .objc_class_name_DOMSVGSymbolElement
 .objc_class_name_DOMSVGTRefElement
index 00af429..a06517e 100644 (file)
       '../svg/SVGExternalResourcesRequired.idl',
       '../svg/SVGFilterPrimitiveStandardAttributes.idl',
       '../svg/SVGFitToViewBox.idl',
-
       '../svg/SVGLangSpace.idl',
       '../svg/SVGLocatable.idl',
-      '../svg/SVGStylable.idl',
       '../svg/SVGTests.idl',
       '../svg/SVGTransformable.idl',
 
index e2689ca..a0c792b 100644 (file)
             'svg/SVGSetElement.idl',
             'svg/SVGStopElement.idl',
             'svg/SVGStringList.idl',
-            'svg/SVGStylable.idl',
             'svg/SVGStyleElement.idl',
+            'svg/SVGStyledElement.idl',
             'svg/SVGSwitchElement.idl',
             'svg/SVGSymbolElement.idl',
             'svg/SVGTRefElement.idl',
             'svg/SVGStopElement.h',
             'svg/SVGStringList.cpp',
             'svg/SVGStringList.h',
-            'svg/SVGStylable.cpp',
-            'svg/SVGStylable.h',
             'svg/SVGStyleElement.cpp',
             'svg/SVGStyleElement.h',
             'svg/SVGStyledElement.cpp',
             '<(PRODUCT_DIR)/DerivedSources/WebCore/DOMSVGStringList.mm',
             '<(PRODUCT_DIR)/DerivedSources/WebCore/DOMSVGStyleElement.dep',
             '<(PRODUCT_DIR)/DerivedSources/WebCore/DOMSVGStyleElement.mm',
+            '<(PRODUCT_DIR)/DerivedSources/WebCore/DOMSVGStyledElement.dep',
+            '<(PRODUCT_DIR)/DerivedSources/WebCore/DOMSVGStyledElement.mm',
+            '<(PRODUCT_DIR)/DerivedSources/WebCore/DOMSVGStyledElementInternal.h',
             '<(PRODUCT_DIR)/DerivedSources/WebCore/DOMSVGSwitchElement.dep',
             '<(PRODUCT_DIR)/DerivedSources/WebCore/DOMSVGSwitchElement.mm',
             '<(PRODUCT_DIR)/DerivedSources/WebCore/DOMSVGSymbolElement.dep',
             '<(PRODUCT_DIR)/DerivedSources/WebCore/JSSVGStopElement.h',
             '<(PRODUCT_DIR)/DerivedSources/WebCore/JSSVGStringList.cpp',
             '<(PRODUCT_DIR)/DerivedSources/WebCore/JSSVGStringList.h',
-            '<(PRODUCT_DIR)/DerivedSources/WebCore/JSSVGStylable.cpp',
-            '<(PRODUCT_DIR)/DerivedSources/WebCore/JSSVGStylable.h',
             '<(PRODUCT_DIR)/DerivedSources/WebCore/JSSVGStyleElement.cpp',
             '<(PRODUCT_DIR)/DerivedSources/WebCore/JSSVGStyleElement.dep',
             '<(PRODUCT_DIR)/DerivedSources/WebCore/JSSVGStyleElement.h',
+            '<(PRODUCT_DIR)/DerivedSources/WebCore/JSSVGStyledElement.cpp',
+            '<(PRODUCT_DIR)/DerivedSources/WebCore/JSSVGStyledElement.dep',
+            '<(PRODUCT_DIR)/DerivedSources/WebCore/JSSVGStyledElement.h',
             '<(PRODUCT_DIR)/DerivedSources/WebCore/JSSVGSwitchElement.cpp',
             '<(PRODUCT_DIR)/DerivedSources/WebCore/JSSVGSwitchElement.dep',
             '<(PRODUCT_DIR)/DerivedSources/WebCore/JSSVGSwitchElement.h',
index edbc438..2ce856b 100755 (executable)
                                >
                        </File>
                        <File
+                               RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSSVGStyledElement.cpp"
+                               >
+                               <FileConfiguration
+                                       Name="Debug|Win32"
+                                       ExcludedFromBuild="true"
+                                       >
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration
+                                       Name="Release|Win32"
+                                       ExcludedFromBuild="true"
+                                       >
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration
+                                       Name="Debug_Cairo_CFLite|Win32"
+                                       ExcludedFromBuild="true"
+                                       >
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration
+                                       Name="Release_Cairo_CFLite|Win32"
+                                       ExcludedFromBuild="true"
+                                       >
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration
+                                       Name="Debug_All|Win32"
+                                       ExcludedFromBuild="true"
+                                       >
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration
+                                       Name="Production|Win32"
+                                       ExcludedFromBuild="true"
+                                       >
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                       />
+                               </FileConfiguration>
+                       </File>
+                       <File
+                               RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSSVGStyledElement.h"
+                               >
+                       </File>
+                       <File
                                RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSSVGSVGElement.cpp"
                                >
                                <FileConfiguration
                                >
                        </File>
                        <File
-                               RelativePath="..\svg\SVGStylable.h"
-                               >
-                       </File>
-                       <File
                                RelativePath="..\svg\SVGStyledElement.cpp"
                                >
                                <FileConfiguration
index 62f0e67..8845e5f 100644 (file)
                8559F1170AC9BE9900A3439C /* DOMSVGMetadataElement.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8559F1110AC9BE9900A3439C /* DOMSVGMetadataElement.mm */; };
                8559F1180AC9BE9900A3439C /* DOMSVGStyleElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 8559F1120AC9BE9900A3439C /* DOMSVGStyleElement.h */; };
                8559F1190AC9BE9900A3439C /* DOMSVGStyleElement.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8559F1130AC9BE9900A3439C /* DOMSVGStyleElement.mm */; };
+               8559F1220AC9BF4200A3439C /* DOMSVGStyleElementInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 8559F11F0AC9BF4200A3439C /* DOMSVGStyleElementInternal.h */; };
+               8559F1180AC9BE9900A3439D /* DOMSVGStyledElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 8559F1120AC9BE9900A3439D /* DOMSVGStyledElement.h */; };
+               8559F1190AC9BE9900A3439D /* DOMSVGStyledElement.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8559F1130AC9BE9900A3439D /* DOMSVGStyledElement.mm */; };
+               8559F1220AC9BF4200A3439D /* DOMSVGStyledElementInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 8559F11F0AC9BF4200A3439D /* DOMSVGStyledElementInternal.h */; };
                8559F1200AC9BF4200A3439C /* DOMSVGAnimatedNumberInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 8559F11D0AC9BF4100A3439C /* DOMSVGAnimatedNumberInternal.h */; };
                8559F1210AC9BF4200A3439C /* DOMSVGMetadataElementInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 8559F11E0AC9BF4100A3439C /* DOMSVGMetadataElementInternal.h */; };
-               8559F1220AC9BF4200A3439C /* DOMSVGStyleElementInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 8559F11F0AC9BF4200A3439C /* DOMSVGStyleElementInternal.h */; };
                855D358A0AD707310019AAC7 /* DOMRGBColor.h in Headers */ = {isa = PBXBuildFile; fileRef = 855D35890AD707310019AAC7 /* DOMRGBColor.h */; };
                855D358D0AD707CC0019AAC7 /* DOMRGBColor.h in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = 855D35890AD707310019AAC7 /* DOMRGBColor.h */; };
                856C8AE40A912649005C687B /* DOMObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 856C8AE20A912649005C687B /* DOMObject.h */; settings = {ATTRIBUTES = (Private, ); }; };
                85D79AD90ACA17EB00F02FC5 /* DOMSVGLocatable.h in Headers */ = {isa = PBXBuildFile; fileRef = 85D79AD10ACA17EB00F02FC5 /* DOMSVGLocatable.h */; };
                85D79ADA0ACA17EB00F02FC5 /* DOMSVGStringList.h in Headers */ = {isa = PBXBuildFile; fileRef = 85D79AD20ACA17EB00F02FC5 /* DOMSVGStringList.h */; };
                85D79ADB0ACA17EB00F02FC5 /* DOMSVGStringList.mm in Sources */ = {isa = PBXBuildFile; fileRef = 85D79AD30ACA17EB00F02FC5 /* DOMSVGStringList.mm */; };
-               85D79ADC0ACA17EB00F02FC5 /* DOMSVGStylable.h in Headers */ = {isa = PBXBuildFile; fileRef = 85D79AD40ACA17EB00F02FC5 /* DOMSVGStylable.h */; };
                85D79ADD0ACA17EB00F02FC5 /* DOMSVGTests.h in Headers */ = {isa = PBXBuildFile; fileRef = 85D79AD50ACA17EB00F02FC5 /* DOMSVGTests.h */; };
                85D79ADE0ACA17EB00F02FC5 /* DOMSVGTransformable.h in Headers */ = {isa = PBXBuildFile; fileRef = 85D79AD60ACA17EB00F02FC5 /* DOMSVGTransformable.h */; };
                85D79AE00ACA188400F02FC5 /* DOMSVGStringListInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85D79ADF0ACA188400F02FC5 /* DOMSVGStringListInternal.h */; };
                A80F3BA40CCDCE24002DD990 /* DOMSVGPathSegClosePathInternal.h in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = A8E5442B0CA9D1C10097D09B /* DOMSVGPathSegClosePathInternal.h */; };
                A80F3BA50CCDCE24002DD990 /* DOMSVGImageElementInternal.h in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = A8E544470CA9D1C10097D09B /* DOMSVGImageElementInternal.h */; };
                A80F3BA60CCDCE24002DD990 /* DOMSVGStyleElementInternal.h in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = A8E543E30CA9D1C10097D09B /* DOMSVGStyleElementInternal.h */; };
+               A80F3BA60CCDCE24002DD991 /* DOMSVGStyledElementInternal.h in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = A8E543E30CA9D1C10097D09C /* DOMSVGStyledElementInternal.h */; };
                A80F3BA70CCDCE24002DD990 /* DOMSVGTitleElementInternal.h in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = A8E543D80CA9D1C10097D09B /* DOMSVGTitleElementInternal.h */; };
                A80F3BA80CCDCE24002DD990 /* DOMSVGMatrixInternal.h in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = A8E544380CA9D1C10097D09B /* DOMSVGMatrixInternal.h */; };
                A80F3BA90CCDCE24002DD990 /* DOMSVGTSpanElementInternal.h in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = A8E543D00CA9D1C10097D09B /* DOMSVGTSpanElementInternal.h */; };
                A8F46AC90CB20A9D003A9670 /* DOMSVGPathSegCurvetoQuadraticRel.h in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = 85CE1A270ADAC473003BBDEA /* DOMSVGPathSegCurvetoQuadraticRel.h */; };
                A8F46AD90CB20A9D003A9670 /* DOMSVGSwitchElement.h in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = 859D62830AD888EE00012995 /* DOMSVGSwitchElement.h */; };
                A8F46AE00CB20A9D003A9670 /* DOMSVGStyleElement.h in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = 8559F1120AC9BE9900A3439C /* DOMSVGStyleElement.h */; };
+               A8F46AE00CB20A9D003A9671 /* DOMSVGStyledElement.h in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = 8559F1120AC9BE9900A3439D /* DOMSVGStyledElement.h */; };
                A8F46AE20CB20A9D003A9670 /* DOMSVGPathSegArcRel.h in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = 8501204F0ADABC9200267125 /* DOMSVGPathSegArcRel.h */; };
                A8F46AE40CB20A9D003A9670 /* DOMSVGAElement.h in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = 85ACEF740ACDCFCE001214FF /* DOMSVGAElement.h */; };
                A8F46AE70CB20A9D003A9670 /* DOMSVGFEFloodElement.h in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = 8502AB220AD438C000378540 /* DOMSVGFEFloodElement.h */; };
                A8F46B150CB20A9D003A9670 /* DOMSVGFilterElement.h in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = 85C9A2E50AD7E90300FBFF1E /* DOMSVGFilterElement.h */; };
                A8F46B170CB20A9D003A9670 /* DOMSVGTextElement.h in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = 859D62890AD888EE00012995 /* DOMSVGTextElement.h */; };
                A8F46B180CB20A9D003A9670 /* DOMSVGTransformList.h in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = 8541635B0AC7180B0001E01B /* DOMSVGTransformList.h */; };
-               A8F46B190CB20A9D003A9670 /* DOMSVGStylable.h in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = 85D79AD40ACA17EB00F02FC5 /* DOMSVGStylable.h */; };
                A8F46B1B0CB20A9D003A9670 /* DOMSVGAnimatedRect.h in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = 8502AB6E0AD438E600378540 /* DOMSVGAnimatedRect.h */; };
                A8F46B1C0CB20A9D003A9670 /* DOMSVGFEOffsetElement.h in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = 8502AB340AD438C000378540 /* DOMSVGFEOffsetElement.h */; };
                A8F46B1E0CB20A9D003A9670 /* DOMSVGPathSegCurvetoCubicSmoothRel.h in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = 85CE1A230ADAC473003BBDEA /* DOMSVGPathSegCurvetoCubicSmoothRel.h */; };
                B2227AA90D00BF220071B782 /* SVGStopElement.h in Headers */ = {isa = PBXBuildFile; fileRef = B22279130D00BF210071B782 /* SVGStopElement.h */; };
                B2227AAB0D00BF220071B782 /* SVGStringList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B22279150D00BF210071B782 /* SVGStringList.cpp */; };
                B2227AAC0D00BF220071B782 /* SVGStringList.h in Headers */ = {isa = PBXBuildFile; fileRef = B22279160D00BF210071B782 /* SVGStringList.h */; };
-               B2227AAE0D00BF220071B782 /* SVGStylable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B22279180D00BF210071B782 /* SVGStylable.cpp */; };
-               B2227AAF0D00BF220071B782 /* SVGStylable.h in Headers */ = {isa = PBXBuildFile; fileRef = B22279190D00BF210071B782 /* SVGStylable.h */; };
-               B2227AB10D00BF220071B782 /* SVGStyledElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B222791B0D00BF210071B782 /* SVGStyledElement.cpp */; };
-               B2227AB20D00BF220071B782 /* SVGStyledElement.h in Headers */ = {isa = PBXBuildFile; fileRef = B222791C0D00BF210071B782 /* SVGStyledElement.h */; };
+               B2227AB70D00BF220071B782 /* SVGStyleElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B22279210D00BF210071B782 /* SVGStyleElement.cpp */; };
+               B2227AB80D00BF220071B782 /* SVGStyleElement.h in Headers */ = {isa = PBXBuildFile; fileRef = B22279220D00BF210071B782 /* SVGStyleElement.h */; };
+               B2227AB70D00BF220071B783 /* SVGStyledElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B22279210D00BF210071B783 /* SVGStyledElement.cpp */; };
+               B2227AB80D00BF220071B783 /* SVGStyledElement.h in Headers */ = {isa = PBXBuildFile; fileRef = B22279220D00BF210071B783 /* SVGStyledElement.h */; };
                B2227AB30D00BF220071B782 /* SVGStyledLocatableElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B222791D0D00BF210071B782 /* SVGStyledLocatableElement.cpp */; };
                B2227AB40D00BF220071B782 /* SVGStyledLocatableElement.h in Headers */ = {isa = PBXBuildFile; fileRef = B222791E0D00BF210071B782 /* SVGStyledLocatableElement.h */; };
                B2227AB50D00BF220071B782 /* SVGStyledTransformableElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B222791F0D00BF210071B782 /* SVGStyledTransformableElement.cpp */; };
                B2227AB60D00BF220071B782 /* SVGStyledTransformableElement.h in Headers */ = {isa = PBXBuildFile; fileRef = B22279200D00BF210071B782 /* SVGStyledTransformableElement.h */; };
-               B2227AB70D00BF220071B782 /* SVGStyleElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B22279210D00BF210071B782 /* SVGStyleElement.cpp */; };
-               B2227AB80D00BF220071B782 /* SVGStyleElement.h in Headers */ = {isa = PBXBuildFile; fileRef = B22279220D00BF210071B782 /* SVGStyleElement.h */; };
                B2227ABA0D00BF220071B782 /* SVGSVGElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B22279240D00BF210071B782 /* SVGSVGElement.cpp */; };
                B2227ABB0D00BF220071B782 /* SVGSVGElement.h in Headers */ = {isa = PBXBuildFile; fileRef = B22279250D00BF210071B782 /* SVGSVGElement.h */; };
                B2227ABD0D00BF220071B782 /* SVGSwitchElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B22279270D00BF210071B782 /* SVGSwitchElement.cpp */; };
                B2FA3DF90AB75A6F000E5AC4 /* JSSVGStringList.h in Headers */ = {isa = PBXBuildFile; fileRef = B2FA3D110AB75A6E000E5AC4 /* JSSVGStringList.h */; };
                B2FA3DFA0AB75A6F000E5AC4 /* JSSVGStyleElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2FA3D120AB75A6E000E5AC4 /* JSSVGStyleElement.cpp */; };
                B2FA3DFB0AB75A6F000E5AC4 /* JSSVGStyleElement.h in Headers */ = {isa = PBXBuildFile; fileRef = B2FA3D130AB75A6E000E5AC4 /* JSSVGStyleElement.h */; };
+               B2FA3DFA0AB75A6F000E5AC5 /* JSSVGStyledElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2FA3D120AB75A6E000E5AC5 /* JSSVGStyledElement.cpp */; };
+               B2FA3DFB0AB75A6F000E5AC5 /* JSSVGStyledElement.h in Headers */ = {isa = PBXBuildFile; fileRef = B2FA3D130AB75A6E000E5AC5 /* JSSVGStyledElement.h */; };
                B2FA3DFC0AB75A6F000E5AC4 /* JSSVGSVGElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2FA3D140AB75A6F000E5AC4 /* JSSVGSVGElement.cpp */; };
                B2FA3DFD0AB75A6F000E5AC4 /* JSSVGSVGElement.h in Headers */ = {isa = PBXBuildFile; fileRef = B2FA3D150AB75A6F000E5AC4 /* JSSVGSVGElement.h */; };
                B2FA3DFE0AB75A6F000E5AC4 /* JSSVGSwitchElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2FA3D160AB75A6F000E5AC4 /* JSSVGSwitchElement.cpp */; };
                                A80F3B5C0CCDCE24002DD990 /* DOMSVGStopElementInternal.h in Copy Generated Headers */,
                                A8F46B810CB20A9D003A9670 /* DOMSVGStringList.h in Copy Generated Headers */,
                                A80F3B830CCDCE24002DD990 /* DOMSVGStringListInternal.h in Copy Generated Headers */,
-                               A8F46B190CB20A9D003A9670 /* DOMSVGStylable.h in Copy Generated Headers */,
                                A8F46AE00CB20A9D003A9670 /* DOMSVGStyleElement.h in Copy Generated Headers */,
                                A80F3BA60CCDCE24002DD990 /* DOMSVGStyleElementInternal.h in Copy Generated Headers */,
+                               A8F46AE00CB20A9D003A9671 /* DOMSVGStyledElement.h in Copy Generated Headers */,
+                               A80F3BA60CCDCE24002DD991 /* DOMSVGStyledElementInternal.h in Copy Generated Headers */,
                                A8F46A980CB20A9D003A9670 /* DOMSVGSVGElement.h in Copy Generated Headers */,
                                A80F3B7C0CCDCE24002DD990 /* DOMSVGSVGElementInternal.h in Copy Generated Headers */,
                                A8F46AD90CB20A9D003A9670 /* DOMSVGSwitchElement.h in Copy Generated Headers */,
                8559F1110AC9BE9900A3439C /* DOMSVGMetadataElement.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMSVGMetadataElement.mm; sourceTree = "<group>"; };
                8559F1120AC9BE9900A3439C /* DOMSVGStyleElement.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMSVGStyleElement.h; sourceTree = "<group>"; };
                8559F1130AC9BE9900A3439C /* DOMSVGStyleElement.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMSVGStyleElement.mm; sourceTree = "<group>"; };
+               8559F11F0AC9BF4200A3439C /* DOMSVGStyleElementInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMSVGStyleElementInternal.h; sourceTree = "<group>"; };
+               8559F1120AC9BE9900A3439D /* DOMSVGStyledElement.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMSVGStyledElement.h; sourceTree = "<group>"; };
+               8559F1130AC9BE9900A3439D /* DOMSVGStyledElement.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMSVGStyledElement.mm; sourceTree = "<group>"; };
+               8559F11F0AC9BF4200A3439D /* DOMSVGStyledElementInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMSVGStyledElementInternal.h; sourceTree = "<group>"; };
                8559F11D0AC9BF4100A3439C /* DOMSVGAnimatedNumberInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMSVGAnimatedNumberInternal.h; sourceTree = "<group>"; };
                8559F11E0AC9BF4100A3439C /* DOMSVGMetadataElementInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMSVGMetadataElementInternal.h; sourceTree = "<group>"; };
-               8559F11F0AC9BF4200A3439C /* DOMSVGStyleElementInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMSVGStyleElementInternal.h; sourceTree = "<group>"; };
                855D35890AD707310019AAC7 /* DOMRGBColor.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMRGBColor.h; sourceTree = "<group>"; };
                856C8AE20A912649005C687B /* DOMObject.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMObject.h; sourceTree = "<group>"; };
                856C8AE30A912649005C687B /* DOMObject.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMObject.mm; sourceTree = "<group>"; };
                85D79AD10ACA17EB00F02FC5 /* DOMSVGLocatable.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMSVGLocatable.h; sourceTree = "<group>"; };
                85D79AD20ACA17EB00F02FC5 /* DOMSVGStringList.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMSVGStringList.h; sourceTree = "<group>"; };
                85D79AD30ACA17EB00F02FC5 /* DOMSVGStringList.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMSVGStringList.mm; sourceTree = "<group>"; };
-               85D79AD40ACA17EB00F02FC5 /* DOMSVGStylable.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMSVGStylable.h; sourceTree = "<group>"; };
                85D79AD50ACA17EB00F02FC5 /* DOMSVGTests.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMSVGTests.h; sourceTree = "<group>"; };
                85D79AD60ACA17EB00F02FC5 /* DOMSVGTransformable.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMSVGTransformable.h; sourceTree = "<group>"; };
                85D79ADF0ACA188400F02FC5 /* DOMSVGStringListInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMSVGStringListInternal.h; sourceTree = "<group>"; };
                A8E543DF0CA9D1C10097D09B /* DOMSVGTextContentElementInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMSVGTextContentElementInternal.h; sourceTree = "<group>"; };
                A8E543E10CA9D1C10097D09B /* DOMSVGSVGElementInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMSVGSVGElementInternal.h; sourceTree = "<group>"; };
                A8E543E30CA9D1C10097D09B /* DOMSVGStyleElementInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMSVGStyleElementInternal.h; sourceTree = "<group>"; };
+               A8E543E30CA9D1C10097D09C /* DOMSVGStyledElementInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMSVGStyledElementInternal.h; sourceTree = "<group>"; };
                A8E543E60CA9D1C10097D09B /* DOMSVGStringListInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMSVGStringListInternal.h; sourceTree = "<group>"; };
                A8E543E80CA9D1C10097D09B /* DOMSVGTRefElementInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMSVGTRefElementInternal.h; sourceTree = "<group>"; };
                A8E543E90CA9D1C10097D09B /* DOMSVGStopElementInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMSVGStopElementInternal.h; sourceTree = "<group>"; };
                B22279150D00BF210071B782 /* SVGStringList.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SVGStringList.cpp; sourceTree = "<group>"; };
                B22279160D00BF210071B782 /* SVGStringList.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SVGStringList.h; sourceTree = "<group>"; };
                B22279170D00BF210071B782 /* SVGStringList.idl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = SVGStringList.idl; sourceTree = "<group>"; };
-               B22279180D00BF210071B782 /* SVGStylable.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SVGStylable.cpp; sourceTree = "<group>"; };
-               B22279190D00BF210071B782 /* SVGStylable.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SVGStylable.h; sourceTree = "<group>"; };
-               B222791A0D00BF210071B782 /* SVGStylable.idl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = SVGStylable.idl; sourceTree = "<group>"; };
-               B222791B0D00BF210071B782 /* SVGStyledElement.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SVGStyledElement.cpp; sourceTree = "<group>"; };
-               B222791C0D00BF210071B782 /* SVGStyledElement.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SVGStyledElement.h; sourceTree = "<group>"; };
+               B22279210D00BF210071B782 /* SVGStyleElement.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SVGStyleElement.cpp; sourceTree = "<group>"; };
+               B22279220D00BF210071B782 /* SVGStyleElement.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SVGStyleElement.h; sourceTree = "<group>"; };
+               B22279230D00BF210071B782 /* SVGStyleElement.idl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = SVGStyleElement.idl; sourceTree = "<group>"; };
+               B22279210D00BF210071B783 /* SVGStyledElement.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SVGStyledElement.cpp; sourceTree = "<group>"; };
+               B22279220D00BF210071B783 /* SVGStyledElement.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SVGStyledElement.h; sourceTree = "<group>"; };
+               B22279230D00BF210071B783 /* SVGStyledElement.idl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = SVGStyledElement.idl; sourceTree = "<group>"; };
                B222791D0D00BF210071B782 /* SVGStyledLocatableElement.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SVGStyledLocatableElement.cpp; sourceTree = "<group>"; };
                B222791E0D00BF210071B782 /* SVGStyledLocatableElement.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SVGStyledLocatableElement.h; sourceTree = "<group>"; };
                B222791F0D00BF210071B782 /* SVGStyledTransformableElement.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SVGStyledTransformableElement.cpp; sourceTree = "<group>"; };
                B22279200D00BF210071B782 /* SVGStyledTransformableElement.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SVGStyledTransformableElement.h; sourceTree = "<group>"; };
-               B22279210D00BF210071B782 /* SVGStyleElement.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SVGStyleElement.cpp; sourceTree = "<group>"; };
-               B22279220D00BF210071B782 /* SVGStyleElement.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SVGStyleElement.h; sourceTree = "<group>"; };
-               B22279230D00BF210071B782 /* SVGStyleElement.idl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = SVGStyleElement.idl; sourceTree = "<group>"; };
                B22279240D00BF210071B782 /* SVGSVGElement.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SVGSVGElement.cpp; sourceTree = "<group>"; };
                B22279250D00BF210071B782 /* SVGSVGElement.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SVGSVGElement.h; sourceTree = "<group>"; };
                B22279260D00BF210071B782 /* SVGSVGElement.idl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = SVGSVGElement.idl; sourceTree = "<group>"; };
                B2FA3D110AB75A6E000E5AC4 /* JSSVGStringList.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSSVGStringList.h; sourceTree = "<group>"; };
                B2FA3D120AB75A6E000E5AC4 /* JSSVGStyleElement.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSSVGStyleElement.cpp; sourceTree = "<group>"; };
                B2FA3D130AB75A6E000E5AC4 /* JSSVGStyleElement.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSSVGStyleElement.h; sourceTree = "<group>"; };
+               B2FA3D120AB75A6E000E5AC5 /* JSSVGStyledElement.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSSVGStyledElement.cpp; sourceTree = "<group>"; };
+               B2FA3D130AB75A6E000E5AC5 /* JSSVGStyledElement.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSSVGStyledElement.h; sourceTree = "<group>"; };
                B2FA3D140AB75A6F000E5AC4 /* JSSVGSVGElement.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSSVGSVGElement.cpp; sourceTree = "<group>"; };
                B2FA3D150AB75A6F000E5AC4 /* JSSVGSVGElement.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSSVGSVGElement.h; sourceTree = "<group>"; };
                B2FA3D160AB75A6F000E5AC4 /* JSSVGSwitchElement.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSSVGSwitchElement.cpp; sourceTree = "<group>"; };
                                85D79AD20ACA17EB00F02FC5 /* DOMSVGStringList.h */,
                                85D79AD30ACA17EB00F02FC5 /* DOMSVGStringList.mm */,
                                A8E543E60CA9D1C10097D09B /* DOMSVGStringListInternal.h */,
-                               85D79AD40ACA17EB00F02FC5 /* DOMSVGStylable.h */,
                                8559F1120AC9BE9900A3439C /* DOMSVGStyleElement.h */,
                                8559F1130AC9BE9900A3439C /* DOMSVGStyleElement.mm */,
                                A8E543E30CA9D1C10097D09B /* DOMSVGStyleElementInternal.h */,
+                               8559F1120AC9BE9900A3439D /* DOMSVGStyledElement.h */,
+                               8559F1130AC9BE9900A3439D /* DOMSVGStyledElement.mm */,
+                               A8E543E30CA9D1C10097D09C /* DOMSVGStyledElementInternal.h */,
                                85CE1A9A0ADAC708003BBDEA /* DOMSVGSVGElement.h */,
                                85CE1A9B0ADAC708003BBDEA /* DOMSVGSVGElement.mm */,
                                A8E543E10CA9D1C10097D09B /* DOMSVGSVGElementInternal.h */,
                                859D62CF0AD8892700012995 /* DOMSVGStopElementInternal.h */,
                                85D79ADF0ACA188400F02FC5 /* DOMSVGStringListInternal.h */,
                                8559F11F0AC9BF4200A3439C /* DOMSVGStyleElementInternal.h */,
+                               8559F11F0AC9BF4200A3439D /* DOMSVGStyledElementInternal.h */,
                                85CE1AA00ADAC752003BBDEA /* DOMSVGSVGElementInternal.h */,
                                859D62D00AD8892700012995 /* DOMSVGSwitchElementInternal.h */,
                                859D62D10AD8892700012995 /* DOMSVGSymbolElementInternal.h */,
                                B2FA3D110AB75A6E000E5AC4 /* JSSVGStringList.h */,
                                B2FA3D120AB75A6E000E5AC4 /* JSSVGStyleElement.cpp */,
                                B2FA3D130AB75A6E000E5AC4 /* JSSVGStyleElement.h */,
+                               B2FA3D120AB75A6E000E5AC5 /* JSSVGStyledElement.cpp */,
+                               B2FA3D130AB75A6E000E5AC5 /* JSSVGStyledElement.h */,
                                B2FA3D140AB75A6F000E5AC4 /* JSSVGSVGElement.cpp */,
                                B2FA3D150AB75A6F000E5AC4 /* JSSVGSVGElement.h */,
                                B2FA3D160AB75A6F000E5AC4 /* JSSVGSwitchElement.cpp */,
                                B22279150D00BF210071B782 /* SVGStringList.cpp */,
                                B22279160D00BF210071B782 /* SVGStringList.h */,
                                B22279170D00BF210071B782 /* SVGStringList.idl */,
-                               B22279180D00BF210071B782 /* SVGStylable.cpp */,
-                               B22279190D00BF210071B782 /* SVGStylable.h */,
-                               B222791A0D00BF210071B782 /* SVGStylable.idl */,
-                               B222791B0D00BF210071B782 /* SVGStyledElement.cpp */,
-                               B222791C0D00BF210071B782 /* SVGStyledElement.h */,
+                               B22279210D00BF210071B782 /* SVGStyleElement.cpp */,
+                               B22279220D00BF210071B782 /* SVGStyleElement.h */,
+                               B22279230D00BF210071B782 /* SVGStyleElement.idl */,
+                               B22279210D00BF210071B783 /* SVGStyledElement.cpp */,
+                               B22279220D00BF210071B783 /* SVGStyledElement.h */,
+                               B22279230D00BF210071B783 /* SVGStyledElement.idl */,
                                B222791D0D00BF210071B782 /* SVGStyledLocatableElement.cpp */,
                                B222791E0D00BF210071B782 /* SVGStyledLocatableElement.h */,
                                B222791F0D00BF210071B782 /* SVGStyledTransformableElement.cpp */,
                                B22279200D00BF210071B782 /* SVGStyledTransformableElement.h */,
-                               B22279210D00BF210071B782 /* SVGStyleElement.cpp */,
-                               B22279220D00BF210071B782 /* SVGStyleElement.h */,
-                               B22279230D00BF210071B782 /* SVGStyleElement.idl */,
                                B22279240D00BF210071B782 /* SVGSVGElement.cpp */,
                                B22279250D00BF210071B782 /* SVGSVGElement.h */,
                                B22279260D00BF210071B782 /* SVGSVGElement.idl */,
                                859D62E40AD8892700012995 /* DOMSVGStopElementInternal.h in Headers */,
                                85D79ADA0ACA17EB00F02FC5 /* DOMSVGStringList.h in Headers */,
                                85D79AE00ACA188400F02FC5 /* DOMSVGStringListInternal.h in Headers */,
-                               85D79ADC0ACA17EB00F02FC5 /* DOMSVGStylable.h in Headers */,
                                8559F1180AC9BE9900A3439C /* DOMSVGStyleElement.h in Headers */,
                                8559F1220AC9BF4200A3439C /* DOMSVGStyleElementInternal.h in Headers */,
+                               8559F1180AC9BE9900A3439D /* DOMSVGStyledElement.h in Headers */,
+                               8559F1220AC9BF4200A3439D /* DOMSVGStyledElementInternal.h in Headers */,
                                85CE1A9C0ADAC708003BBDEA /* DOMSVGSVGElement.h in Headers */,
                                85CE1AA10ADAC752003BBDEA /* DOMSVGSVGElementInternal.h in Headers */,
                                859D62AE0AD888EF00012995 /* DOMSVGSwitchElement.h in Headers */,
                                B2FA3DF70AB75A6F000E5AC4 /* JSSVGStopElement.h in Headers */,
                                B2FA3DF90AB75A6F000E5AC4 /* JSSVGStringList.h in Headers */,
                                B2FA3DFB0AB75A6F000E5AC4 /* JSSVGStyleElement.h in Headers */,
+                               B2FA3DFB0AB75A6F000E5AC5 /* JSSVGStyledElement.h in Headers */,
                                B2FA3DFD0AB75A6F000E5AC4 /* JSSVGSVGElement.h in Headers */,
                                B2FA3DFF0AB75A6F000E5AC4 /* JSSVGSwitchElement.h in Headers */,
                                B2FA3E010AB75A6F000E5AC4 /* JSSVGSymbolElement.h in Headers */,
                                08CA3D4412894A3800FFF260 /* SVGStaticPropertyWithParentTearOff.h in Headers */,
                                B2227AA90D00BF220071B782 /* SVGStopElement.h in Headers */,
                                B2227AAC0D00BF220071B782 /* SVGStringList.h in Headers */,
-                               B2227AAF0D00BF220071B782 /* SVGStylable.h in Headers */,
-                               B2227AB20D00BF220071B782 /* SVGStyledElement.h in Headers */,
+                               B2227AB80D00BF220071B782 /* SVGStyleElement.h in Headers */,
+                               B2227AB80D00BF220071B783 /* SVGStyledElement.h in Headers */,
                                B2227AB40D00BF220071B782 /* SVGStyledLocatableElement.h in Headers */,
                                B2227AB60D00BF220071B782 /* SVGStyledTransformableElement.h in Headers */,
-                               B2227AB80D00BF220071B782 /* SVGStyleElement.h in Headers */,
                                B2227ABB0D00BF220071B782 /* SVGSVGElement.h in Headers */,
                                B2227ABE0D00BF220071B782 /* SVGSwitchElement.h in Headers */,
                                B2227AC10D00BF220071B782 /* SVGSymbolElement.h in Headers */,
                                859D62AD0AD888EF00012995 /* DOMSVGStopElement.mm in Sources */,
                                85D79ADB0ACA17EB00F02FC5 /* DOMSVGStringList.mm in Sources */,
                                8559F1190AC9BE9900A3439C /* DOMSVGStyleElement.mm in Sources */,
+                               8559F1190AC9BE9900A3439D /* DOMSVGStyledElement.mm in Sources */,
                                85CE1A9D0ADAC708003BBDEA /* DOMSVGSVGElement.mm in Sources */,
                                859D62AF0AD888EF00012995 /* DOMSVGSwitchElement.mm in Sources */,
                                859D62B10AD888EF00012995 /* DOMSVGSymbolElement.mm in Sources */,
                                B2FA3DF60AB75A6F000E5AC4 /* JSSVGStopElement.cpp in Sources */,
                                B2FA3DF80AB75A6F000E5AC4 /* JSSVGStringList.cpp in Sources */,
                                B2FA3DFA0AB75A6F000E5AC4 /* JSSVGStyleElement.cpp in Sources */,
+                               B2FA3DFA0AB75A6F000E5AC5 /* JSSVGStyledElement.cpp in Sources */,
                                B2FA3DFC0AB75A6F000E5AC4 /* JSSVGSVGElement.cpp in Sources */,
                                B2FA3DFE0AB75A6F000E5AC4 /* JSSVGSwitchElement.cpp in Sources */,
                                B2FA3E000AB75A6F000E5AC4 /* JSSVGSymbolElement.cpp in Sources */,
                                E4AFD00F0DAF335500F5F55C /* SVGSMILElement.cpp in Sources */,
                                B2227AA80D00BF220071B782 /* SVGStopElement.cpp in Sources */,
                                B2227AAB0D00BF220071B782 /* SVGStringList.cpp in Sources */,
-                               B2227AAE0D00BF220071B782 /* SVGStylable.cpp in Sources */,
-                               B2227AB10D00BF220071B782 /* SVGStyledElement.cpp in Sources */,
+                               B2227AB70D00BF220071B782 /* SVGStyleElement.cpp in Sources */,
+                               B2227AB70D00BF220071B783 /* SVGStyledElement.cpp in Sources */,
                                B2227AB30D00BF220071B782 /* SVGStyledLocatableElement.cpp in Sources */,
                                B2227AB50D00BF220071B782 /* SVGStyledTransformableElement.cpp in Sources */,
-                               B2227AB70D00BF220071B782 /* SVGStyleElement.cpp in Sources */,
                                B2227ABA0D00BF220071B782 /* SVGSVGElement.cpp in Sources */,
                                B2227ABD0D00BF220071B782 /* SVGSwitchElement.cpp in Sources */,
                                B2227AC00D00BF220071B782 /* SVGSymbolElement.cpp in Sources */,
index 4611ef7..f9e07bc 100644 (file)
 #import <WebCore/DOMSVGSetElement.h>
 #import <WebCore/DOMSVGStopElement.h>
 #import <WebCore/DOMSVGStringList.h>
-#import <WebCore/DOMSVGStylable.h>
 #import <WebCore/DOMSVGStyleElement.h>
+#import <WebCore/DOMSVGStyledElement.h>
 #import <WebCore/DOMSVGSwitchElement.h>
 #import <WebCore/DOMSVGSymbolElement.h>
 #import <WebCore/DOMSVGTRefElement.h>
index cf0c2c5..4fe8e03 100644 (file)
@@ -55,7 +55,7 @@ my @depsContent = ();
 
 # Hashes
 my %protocolTypeHash = ("XPathNSResolver" => 1, "EventListener" => 1, "EventTarget" => 1, "NodeFilter" => 1,
-                        "SVGLocatable" => 1, "SVGTransformable" => 1, "SVGStylable" => 1, "SVGFilterPrimitiveStandardAttributes" => 1, 
+                        "SVGLocatable" => 1, "SVGTransformable" => 1, "SVGFilterPrimitiveStandardAttributes" => 1, 
                         "SVGTests" => 1, "SVGLangSpace" => 1, "SVGExternalResourcesRequired" => 1, "SVGURIReference" => 1,
                         "SVGZoomAndPan" => 1, "SVGFitToViewBox" => 1, "SVGAnimatedPathData" => 1, "ElementTimeControl" => 1);
 my %nativeObjCTypeHash = ("URL" => 1, "Color" => 1);
index 5a94b64..0508c8c 100644 (file)
     // Expose all implemented SVG 1.1 interfaces, excluding the SVG MI interfaces:
     // SVGAnimatedPathData, SVGAnimatedPoints, SVGExternalResourcesRequired,
     // SVGFilterPrimitiveStandardAttributes, SVGFitToViewBox, SVGLangSpace, SVGLocatable
-    // SVGStylable, SVGTests, SVGTransformable, SVGURIReference, SVGZoomAndPan
+    // SVGTests, SVGTransformable, SVGURIReference, SVGZoomAndPan
     attribute SVGAElementConstructor SVGAElement;
     attribute SVGAngleConstructor SVGAngle;
     attribute SVGAnimatedAngleConstructor SVGAnimatedAngle;
index 3809390..a273f16 100644 (file)
 
 [
     Conditional=SVG
-] interface SVGAElement : SVGElement,
+] interface SVGAElement : SVGStyledElement,
                                           SVGURIReference,
                                           SVGTests,
                                           SVGLangSpace,
                                           SVGExternalResourcesRequired,
-                                          SVGStylable,
                                           SVGTransformable {
     readonly attribute SVGAnimatedString target;
 };
index 7eef6fa..db14544 100644 (file)
 #include "SVGSetElement.cpp"
 #include "SVGStopElement.cpp"
 #include "SVGStringList.cpp"
-#include "SVGStylable.cpp"
 #include "SVGStyleElement.cpp"
 #include "SVGStyledElement.cpp"
 #include "SVGStyledLocatableElement.cpp"
index 148a107..fa97208 100644 (file)
 
 [
     Conditional=SVG
-] interface SVGCircleElement : SVGElement,
+] interface SVGCircleElement : SVGStyledElement,
                                                SVGTests,
                                                SVGLangSpace,
                                                SVGExternalResourcesRequired,
-                                               SVGStylable,
                                                SVGTransformable {
     readonly attribute SVGAnimatedLength cx;
     readonly attribute SVGAnimatedLength cy;
index 75e3ce8..d1e1a74 100644 (file)
 
 [
     Conditional=SVG
-] interface SVGClipPathElement : SVGElement,
+] interface SVGClipPathElement : SVGStyledElement,
                                                  SVGTests,
                                                  SVGLangSpace,
                                                  SVGExternalResourcesRequired,
-                                                 SVGStylable,
                                                  SVGTransformable
                                               /* SVGUnitTypes */ { 
     readonly attribute SVGAnimatedEnumeration clipPathUnits;
index 85a69b8..3e99315 100644 (file)
 
 [
     Conditional=SVG
-] interface SVGDefsElement : SVGElement,
+] interface SVGDefsElement : SVGStyledElement,
                                              SVGTests,
                                              SVGLangSpace,
                                              SVGExternalResourcesRequired,
-                                             SVGStylable,
                                              SVGTransformable {
 };
 
index 2c60fb7..75043a2 100644 (file)
@@ -25,8 +25,7 @@
 
 [
     Conditional=SVG
-] interface SVGDescElement : SVGElement,
-                                             SVGLangSpace,
-                                             SVGStylable {
+] interface SVGDescElement : SVGStyledElement,
+                                             SVGLangSpace {
 };
 
index 1170baa..bf50dec 100644 (file)
 
 [
     Conditional=SVG
-] interface SVGEllipseElement : SVGElement,
+] interface SVGEllipseElement : SVGStyledElement,
                                                 SVGTests,
                                                 SVGLangSpace,
                                                 SVGExternalResourcesRequired,
-                                                SVGStylable,
                                                 SVGTransformable {
     readonly attribute SVGAnimatedLength cx;
     readonly attribute SVGAnimatedLength cy;
index f5c017d..8aea427 100644 (file)
@@ -26,8 +26,8 @@
 [
     Conditional=SVG&FILTERS,
     DoNotCheckConstants
-] interface SVGFEBlendElement : SVGElement,
-                      SVGFilterPrimitiveStandardAttributes {
+] interface SVGFEBlendElement : SVGStyledElement,
+                           SVGFilterPrimitiveStandardAttributes {
     // Blend Mode Types
     const unsigned short SVG_FEBLEND_MODE_UNKNOWN  = 0;
     const unsigned short SVG_FEBLEND_MODE_NORMAL   = 1;
index 9915433..328be81 100644 (file)
@@ -26,8 +26,8 @@
 [
     Conditional=SVG&FILTERS,
     DoNotCheckConstants
-] interface SVGFEColorMatrixElement : SVGElement,
-                            SVGFilterPrimitiveStandardAttributes {
+] interface SVGFEColorMatrixElement : SVGStyledElement,
+                           SVGFilterPrimitiveStandardAttributes {
     // Color Matrix Types
     const unsigned short SVG_FECOLORMATRIX_TYPE_UNKNOWN          = 0;
     const unsigned short SVG_FECOLORMATRIX_TYPE_MATRIX           = 1;
index e7f63c6..f3d9578 100644 (file)
@@ -25,8 +25,8 @@
 
 [
     Conditional=SVG&FILTERS
-] interface SVGFEComponentTransferElement : SVGElement,
-                                                            SVGFilterPrimitiveStandardAttributes {
+] interface SVGFEComponentTransferElement : SVGStyledElement,
+                           SVGFilterPrimitiveStandardAttributes {
     readonly attribute SVGAnimatedString in1;
 };
 
index 695d510..f0be969 100644 (file)
@@ -26,8 +26,8 @@
 [
     Conditional=SVG&FILTERS,
     DoNotCheckConstants
-] interface SVGFECompositeElement : SVGElement,
-                          SVGFilterPrimitiveStandardAttributes {
+] interface SVGFECompositeElement : SVGStyledElement,
+                           SVGFilterPrimitiveStandardAttributes {
     // Composite Operators
     const unsigned short SVG_FECOMPOSITE_OPERATOR_UNKNOWN    = 0;
     const unsigned short SVG_FECOMPOSITE_OPERATOR_OVER       = 1;
index 2d54511..5822dbe 100644 (file)
@@ -26,8 +26,8 @@
 [
     Conditional=SVG&FILTERS,
     DoNotCheckConstants
-] interface SVGFEConvolveMatrixElement : SVGElement,
-                               SVGFilterPrimitiveStandardAttributes {
+] interface SVGFEConvolveMatrixElement : SVGStyledElement,
+                           SVGFilterPrimitiveStandardAttributes {
     // Edge Mode Values
     const unsigned short SVG_EDGEMODE_UNKNOWN   = 0;
     const unsigned short SVG_EDGEMODE_DUPLICATE = 1;
index e3d5871..7a4aa98 100644 (file)
@@ -25,8 +25,8 @@
 
 [
     Conditional=SVG&FILTERS
-] interface SVGFEDiffuseLightingElement : SVGElement,
-                                                          SVGFilterPrimitiveStandardAttributes {
+] interface SVGFEDiffuseLightingElement : SVGStyledElement,
+                           SVGFilterPrimitiveStandardAttributes {
     readonly attribute SVGAnimatedString in1;
     readonly attribute SVGAnimatedNumber surfaceScale;
     readonly attribute SVGAnimatedNumber diffuseConstant;
index 42584fa..73f68a4 100644 (file)
@@ -26,8 +26,8 @@
 [
     Conditional=SVG&FILTERS,
     DoNotCheckConstants
-] interface SVGFEDisplacementMapElement : SVGElement,
-                                SVGFilterPrimitiveStandardAttributes {
+] interface SVGFEDisplacementMapElement : SVGStyledElement,
+                           SVGFilterPrimitiveStandardAttributes {
     // Channel Selectors
     const unsigned short SVG_CHANNEL_UNKNOWN = 0;
     const unsigned short SVG_CHANNEL_R       = 1;
index 1717224..244ae3a 100644 (file)
@@ -19,8 +19,8 @@
 
 [
     Conditional=SVG&FILTERS
-] interface SVGFEDropShadowElement : SVGElement,
-                                                       SVGFilterPrimitiveStandardAttributes { 
+] interface SVGFEDropShadowElement : SVGStyledElement,
+                           SVGFilterPrimitiveStandardAttributes {
     readonly attribute SVGAnimatedString in1;
     readonly attribute SVGAnimatedNumber dx;
     readonly attribute SVGAnimatedNumber dy;
index 345601a..a38b4a3 100644 (file)
@@ -25,6 +25,6 @@
 
 [
     Conditional=SVG&FILTERS
-] interface SVGFEFloodElement : SVGElement,
-                                                SVGFilterPrimitiveStandardAttributes {
+] interface SVGFEFloodElement : SVGStyledElement,
+                           SVGFilterPrimitiveStandardAttributes {
 };
index 295d5be..2c0f6b7 100644 (file)
@@ -25,8 +25,8 @@
 
 [
     Conditional=SVG&FILTERS
-] interface SVGFEGaussianBlurElement : SVGElement,
-                                                       SVGFilterPrimitiveStandardAttributes { 
+] interface SVGFEGaussianBlurElement : SVGStyledElement,
+                           SVGFilterPrimitiveStandardAttributes {
     readonly attribute SVGAnimatedString in1;
     readonly attribute SVGAnimatedNumber stdDeviationX;
     readonly attribute SVGAnimatedNumber stdDeviationY;
index 9fd5e93..ce8c40e 100644 (file)
@@ -25,7 +25,7 @@
 
 [
     Conditional=SVG&FILTERS
-] interface SVGFEImageElement : SVGElement,
+] interface SVGFEImageElement : SVGStyledElement,
                                                         SVGURIReference,
                                                         SVGLangSpace,
                                                         SVGExternalResourcesRequired,
index e7f444f..63d53a1 100644 (file)
@@ -25,7 +25,7 @@
 
 [
     Conditional=SVG&FILTERS
-] interface SVGFEMergeElement : SVGElement,
-                                                SVGFilterPrimitiveStandardAttributes {
+] interface SVGFEMergeElement : SVGStyledElement,
+                           SVGFilterPrimitiveStandardAttributes {
 };
 
index 996bfb8..55b4a86 100644 (file)
@@ -26,7 +26,7 @@
 [
     Conditional=SVG&FILTERS,
     DoNotCheckConstants
-] interface SVGFEMorphologyElement : SVGElement,
+] interface SVGFEMorphologyElement : SVGStyledElement,
                            SVGFilterPrimitiveStandardAttributes {
     // Morphology Operators
     const unsigned short SVG_MORPHOLOGY_OPERATOR_UNKNOWN  = 0;
index c4625fa..d6cd695 100644 (file)
@@ -25,8 +25,8 @@
 
 [
     Conditional=SVG&FILTERS
-] interface SVGFEOffsetElement : SVGElement,
-                                                 SVGFilterPrimitiveStandardAttributes {
+] interface SVGFEOffsetElement : SVGStyledElement,
+                           SVGFilterPrimitiveStandardAttributes {
     readonly attribute SVGAnimatedString in1;
     readonly attribute SVGAnimatedNumber dx;
     readonly attribute SVGAnimatedNumber dy;
index 70e8827..ad1ca20 100644 (file)
@@ -25,8 +25,8 @@
 
 [
     Conditional=SVG&FILTERS
-] interface SVGFESpecularLightingElement : SVGElement,
-                                                           SVGFilterPrimitiveStandardAttributes {
+] interface SVGFESpecularLightingElement : SVGStyledElement,
+                           SVGFilterPrimitiveStandardAttributes {
     readonly attribute SVGAnimatedString in1;
     readonly attribute SVGAnimatedNumber surfaceScale;
     readonly attribute SVGAnimatedNumber specularConstant;
index fca80c3..a5a67c3 100644 (file)
@@ -25,8 +25,8 @@
 
 [
     Conditional=SVG&FILTERS
-] interface SVGFETileElement : SVGElement,
-                                               SVGFilterPrimitiveStandardAttributes {
+] interface SVGFETileElement : SVGStyledElement,
+                           SVGFilterPrimitiveStandardAttributes {
     readonly attribute SVGAnimatedString in1;
 };
 
index ab474cc..e3034ba 100644 (file)
@@ -26,7 +26,7 @@
 [
     Conditional=SVG&FILTERS,
     DoNotCheckConstants
-] interface SVGFETurbulenceElement : SVGElement,
+] interface SVGFETurbulenceElement : SVGStyledElement,
                            SVGFilterPrimitiveStandardAttributes {
     // Turbulence Types
     const unsigned short SVG_TURBULENCE_TYPE_UNKNOWN      = 0;
index 2bdfd38..96d5126 100644 (file)
 
 [
     Conditional=SVG&FILTERS
-] interface SVGFilterElement : SVGElement,
+] interface SVGFilterElement : SVGStyledElement,
                                                SVGURIReference,
                                                SVGLangSpace,
-                                               SVGExternalResourcesRequired,
-                                               SVGStylable
+                                               SVGExternalResourcesRequired
                                             /* SVGUnitTypes */ {  
     readonly attribute SVGAnimatedEnumeration filterUnits;
     readonly attribute SVGAnimatedEnumeration primitiveUnits;
index 7ef9ffd..82c8563 100644 (file)
@@ -27,7 +27,7 @@
 [
     Conditional=SVG,
     ObjCProtocol
-] interface SVGFilterPrimitiveStandardAttributes : SVGStylable {
+] interface SVGFilterPrimitiveStandardAttributes {
     readonly attribute SVGAnimatedLength x;
     readonly attribute SVGAnimatedLength y;
     readonly attribute SVGAnimatedLength width;
index 3167acb..eaa6db1 100644 (file)
 
 [
     Conditional=SVG
-] interface SVGForeignObjectElement : SVGElement,
+] interface SVGForeignObjectElement : SVGStyledElement,
                                                       SVGTests,
                                                       SVGLangSpace,
                                                       SVGExternalResourcesRequired,
-                                                      SVGStylable,
                                                       SVGTransformable {
     readonly attribute SVGAnimatedLength x;
     readonly attribute SVGAnimatedLength y;
index 7305d41..62e588c 100644 (file)
 
 [
     Conditional=SVG
-] interface SVGGElement : SVGElement,
+] interface SVGGElement : SVGStyledElement,
                                           SVGTests,
                                           SVGLangSpace,
                                           SVGExternalResourcesRequired,
-                                          SVGStylable,
                                           SVGTransformable {
 };
 
index 9dd3782..678ccbd 100644 (file)
@@ -17,9 +17,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-[Conditional=SVG&SVG_FONTS] interface SVGGlyphRefElement : SVGElement,
-                                                           SVGURIReference,
-                                                           SVGStylable {
+[Conditional=SVG&SVG_FONTS] interface SVGGlyphRefElement : SVGStyledElement,
+                                                           SVGURIReference {
     // FIXME: Use [Reflect] after https://bugs.webkit.org/show_bug.cgi?id=64843 is fixed.
     attribute DOMString glyphRef
         setter raises(DOMException);
index a76f907..02d3693 100644 (file)
 [
     Conditional=SVG,
     DoNotCheckConstants
-] interface SVGGradientElement : SVGElement,
+] interface SVGGradientElement : SVGStyledElement,
                        SVGURIReference,
-                       SVGExternalResourcesRequired,
-                       SVGStylable
+                       SVGExternalResourcesRequired
                        /* SVGUnitTypes */ {
     // Spread Method Types
     const unsigned short SVG_SPREADMETHOD_UNKNOWN = 0;
index 473bace..76add45 100644 (file)
 
 [
     Conditional=SVG
-] interface SVGImageElement : SVGElement,
+] interface SVGImageElement : SVGStyledElement,
                                               SVGURIReference,
                                               SVGTests,
                                               SVGLangSpace,
                                               SVGExternalResourcesRequired,
-                                              SVGStylable,
                                               SVGTransformable {
     readonly attribute SVGAnimatedLength x;
     readonly attribute SVGAnimatedLength y;
index c740d10..a835271 100644 (file)
 
 [
     Conditional=SVG
-] interface SVGLineElement : SVGElement,
+] interface SVGLineElement : SVGStyledElement,
                                              SVGTests,
                                              SVGLangSpace,
                                              SVGExternalResourcesRequired,
-                                             SVGStylable,
                                              SVGTransformable {
     readonly attribute SVGAnimatedLength x1;
     readonly attribute SVGAnimatedLength y1;
index 745d63e..67c684e 100644 (file)
 
 [
     Conditional=SVG
-] interface SVGMarkerElement : SVGElement,
+] interface SVGMarkerElement : SVGStyledElement,
                                                SVGLangSpace,
                                                SVGExternalResourcesRequired,
-                                               SVGStylable,
                                                SVGFitToViewBox { 
     // Marker Unit Types
     const unsigned short SVG_MARKERUNITS_UNKNOWN        = 0;
index 830cbf7..1a40de9 100644 (file)
 
 [
     Conditional=SVG
-] interface SVGMaskElement : SVGElement,
+] interface SVGMaskElement : SVGStyledElement,
                                              SVGTests,
                                              SVGLangSpace,
-                                             SVGExternalResourcesRequired,
-                                             SVGStylable {
+                                             SVGExternalResourcesRequired {
     readonly attribute SVGAnimatedEnumeration maskUnits;
     readonly attribute SVGAnimatedEnumeration maskContentUnits;
 
index 9a0e3e6..647741a 100644 (file)
@@ -25,6 +25,6 @@
 
 [
     Conditional=SVG&SVG_FONTS
-] interface SVGMissingGlyphElement : SVGElement {
+] interface SVGMissingGlyphElement : SVGStyledElement {
 };
 
index 5bb289c..4c0ac91 100644 (file)
 
 [
     Conditional=SVG
-] interface SVGPathElement : SVGElement,
+] interface SVGPathElement : SVGStyledElement,
                                              SVGTests,
                                              SVGLangSpace,
                                              SVGExternalResourcesRequired,
-                                             SVGStylable,
                                              SVGTransformable {
     readonly attribute SVGAnimatedNumber pathLength;
 
index 9a80004..2226eb7 100644 (file)
 
 [
     Conditional=SVG
-] interface SVGPatternElement : SVGElement,
+] interface SVGPatternElement : SVGStyledElement,
                                                 SVGURIReference,
                                                 SVGTests,
                                                 SVGLangSpace,
                                                 SVGExternalResourcesRequired,
-                                                SVGStylable,
                                                 SVGFitToViewBox
                                              /* SVGUnitTypes */ {
     readonly attribute SVGAnimatedEnumeration   patternUnits;
index 290e755..4076028 100644 (file)
 
 [
     Conditional=SVG
-] interface SVGPolygonElement : SVGElement,
+] interface SVGPolygonElement : SVGStyledElement,
                                                 SVGTests,
                                                 SVGLangSpace,
                                                 SVGExternalResourcesRequired,
-                                                SVGStylable,
                                                 SVGTransformable {
     readonly attribute SVGPointList points;
     readonly attribute SVGPointList animatedPoints;
index 6a3129e..43b4d80 100644 (file)
 
 [
     Conditional=SVG
-] interface SVGPolylineElement : SVGElement,
+] interface SVGPolylineElement : SVGStyledElement,
                                                  SVGTests,
                                                  SVGLangSpace,
                                                  SVGExternalResourcesRequired,
-                                                 SVGStylable,
                                                  SVGTransformable {
     readonly attribute SVGPointList points;
     readonly attribute SVGPointList animatedPoints;
index 998c49d..1fe8954 100644 (file)
 
 [
     Conditional=SVG
-] interface SVGRectElement : SVGElement,
+] interface SVGRectElement : SVGStyledElement,
                                              SVGTests,
                                              SVGLangSpace,
                                              SVGExternalResourcesRequired,
-                                             SVGStylable,
                                              SVGTransformable {
     readonly attribute SVGAnimatedLength x;
     readonly attribute SVGAnimatedLength y;
index c539e68..ded6511 100644 (file)
 // TODO: no events::DocumentEvent available!
 [
     Conditional=SVG
-] interface SVGSVGElement : SVGElement,
+] interface SVGSVGElement : SVGStyledElement,
                                             SVGTests,
                                             SVGLangSpace,
                                             SVGExternalResourcesRequired,
-                                            SVGStylable,
                                             SVGLocatable,
                                             SVGFitToViewBox,
                                             SVGZoomAndPan {
index cd97842..86413f7 100644 (file)
@@ -25,8 +25,7 @@
 
 [
     Conditional=SVG
-] interface SVGStopElement : SVGElement,
-                                             SVGStylable {
+] interface SVGStopElement : SVGStyledElement {
     readonly attribute SVGAnimatedNumber offset;
 };
 
diff --git a/Source/WebCore/svg/SVGStylable.cpp b/Source/WebCore/svg/SVGStylable.cpp
deleted file mode 100644 (file)
index 6f54888..0000000
+++ /dev/null
@@ -1 +0,0 @@
-// This file is now intentionally empty. Delete it after removing it from all the build systems and project files.
diff --git a/Source/WebCore/svg/SVGStylable.h b/Source/WebCore/svg/SVGStylable.h
deleted file mode 100644 (file)
index f63018e..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2004, 2005, 2008 Nikolas Zimmermann <zimmermann@kde.org>
- * Copyright (C) 2004, 2005, 2006, 2007 Rob Buis <buis@kde.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef SVGStylable_h
-#define SVGStylable_h
-
-#if ENABLE(SVG)
-#include <wtf/Forward.h>
-#include <wtf/PassRefPtr.h>
-
-namespace WebCore {
-
-class CSSValue;
-class CSSStyleDeclaration;
-
-class SVGStylable {
-public:
-    virtual ~SVGStylable() { }
-
-    virtual CSSStyleDeclaration* style() { return 0; };
-    virtual PassRefPtr<CSSValue> getPresentationAttribute(const String&) { return 0; };
-};
-
-} // namespace WebCore
-
-#endif // ENABLE(SVG)
-#endif // SVGStylable_h
index f1e9183..dc0f30b 100644 (file)
 #include "CSSPropertyNames.h"
 #include "SVGAnimatedString.h"
 #include "SVGLocatable.h"
-#include "SVGStylable.h"
 #include <wtf/HashSet.h>
+#include <wtf/PassRefPtr.h>
 
 namespace WebCore {
 
 void mapAttributeToCSSProperty(HashMap<AtomicStringImpl*, CSSPropertyID>* propertyNameToIdMap, const QualifiedName& attrName);
 
-class SVGStyledElement : public SVGElement,
-                         public SVGStylable {
+class CSSValue;
+class CSSStyleDeclaration;
+
+// FIXME(webkit.org/b/107386): SVGStyledElement should be merged into SVGElement as specified by SVG2.
+class SVGStyledElement : public SVGElement {
 public:
     virtual String title() const;
 
similarity index 93%
rename from Source/WebCore/svg/SVGStylable.idl
rename to Source/WebCore/svg/SVGStyledElement.idl
index 82d4142..976051d 100644 (file)
  */
 
 [
-    Conditional=SVG,
-    ObjCProtocol,
-    SuppressToJSObject,
-    OmitConstructor
-] interface SVGStylable {
+    Conditional=SVG
+] interface SVGStyledElement : SVGElement {
     readonly attribute SVGAnimatedString className;
     readonly attribute CSSStyleDeclaration style;
 
index 21a76be..1430e2d 100644 (file)
 
 [
     Conditional=SVG
-] interface SVGSwitchElement : SVGElement,
+] interface SVGSwitchElement : SVGStyledElement,
                                                SVGTests,
                                                SVGLangSpace,
                                                SVGExternalResourcesRequired,
-                                               SVGStylable,
                                                SVGTransformable {
 };
 
index 9b9f1d1..e1386ce 100644 (file)
 
 [
     Conditional=SVG
-] interface SVGSymbolElement : SVGElement,
+] interface SVGSymbolElement : SVGStyledElement,
                                                SVGLangSpace,
                                                SVGExternalResourcesRequired,
-                                               SVGStylable,
                                                SVGFitToViewBox {
 };
 
index 9b91f9c..14ed0f5 100644 (file)
 
 [
     Conditional=SVG
-] interface SVGTextContentElement : SVGElement,
+] interface SVGTextContentElement : SVGStyledElement,
                                                     SVGTests,
                                                     SVGLangSpace,
-                                                    SVGExternalResourcesRequired,
-                                                    SVGStylable {
+                                                    SVGExternalResourcesRequired {
     // lengthAdjust Types
     const unsigned short LENGTHADJUST_UNKNOWN          = 0;
     const unsigned short LENGTHADJUST_SPACING          = 1;
index ef44418..49af690 100644 (file)
@@ -25,8 +25,7 @@
 
 [
     Conditional=SVG
-] interface SVGTitleElement : SVGElement,
-                                              SVGLangSpace,
-                                              SVGStylable {
+] interface SVGTitleElement : SVGStyledElement,
+                                              SVGLangSpace {
 };
 
index 4916279..3733feb 100644 (file)
 
 [
     Conditional=SVG
-] interface SVGUseElement : SVGElement,
+] interface SVGUseElement : SVGStyledElement,
                                             SVGURIReference,
                                             SVGTests,
                                             SVGLangSpace,
                                             SVGExternalResourcesRequired,
-                                            SVGStylable,
                                             SVGTransformable {
     readonly attribute SVGAnimatedLength   x;
     readonly attribute SVGAnimatedLength   y;
index b098a2a..384b5fc 100644 (file)
@@ -1,3 +1,15 @@
+2013-01-19  Philip Rogers  <pdr@google.com>
+
+        Merge SVGStylable into SVGStyledElement
+        https://bugs.webkit.org/show_bug.cgi?id=106877
+
+        SVG2 changes element inheritance so all SVGElements are stylable. As a first-step towards a
+        cleaner class hierarchy, this patch moves SVGStylable into SVGStyledElement.
+
+        Reviewed by Dirk Schulze.
+
+        * MigrateHeaders.make:
+
 2013-01-18  Seokju Kwon  <seokju.kwon@gmail.com>
 
         Add explicit keyword to constructors in platform-specific InspectorClient
index 163d3fa..2889475 100644 (file)
@@ -430,9 +430,10 @@ all : \
     $(INTERNAL_HEADERS_DIR)/DOMSVGStopElementInternal.h \
     $(PRIVATE_HEADERS_DIR)/DOMSVGStringList.h \
     $(INTERNAL_HEADERS_DIR)/DOMSVGStringListInternal.h \
-    $(PRIVATE_HEADERS_DIR)/DOMSVGStylable.h \
     $(PRIVATE_HEADERS_DIR)/DOMSVGStyleElement.h \
     $(INTERNAL_HEADERS_DIR)/DOMSVGStyleElementInternal.h \
+    $(PRIVATE_HEADERS_DIR)/DOMSVGStyledElement.h \
+    $(INTERNAL_HEADERS_DIR)/DOMSVGStyledElementInternal.h \
     $(PRIVATE_HEADERS_DIR)/DOMSVGSwitchElement.h \
     $(INTERNAL_HEADERS_DIR)/DOMSVGSwitchElementInternal.h \
     $(PRIVATE_HEADERS_DIR)/DOMSVGSymbolElement.h \
diff --git a/wscript b/wscript
index 83fe505..45e02c5 100644 (file)
--- a/wscript
+++ b/wscript
@@ -351,7 +351,6 @@ def build(bld):
         excludes.append('JSSVGLocatable.cpp')
         excludes.append('JSSVGStyleTable.cpp')
         excludes.append('JSSVGTests.cpp')
-        excludes.append('JSSVGStylable.cpp')
         
         # These are files that expect methods not in the base C++ class, usually XYZAnimated methods.
         excludes.append('JSSVGFitToViewBox.cpp')