Changeset 179810 in webkit
- Timestamp:
- Feb 8, 2015 5:13:35 PM (9 years ago)
- Location:
- trunk
- Files:
-
- 4 deleted
- 88 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r179807 r179810 1 2015-02-08 Darin Adler <darin@apple.com> 2 3 Remove the SVG instance tree 4 https://bugs.webkit.org/show_bug.cgi?id=140602 5 6 Reviewed by Dean Jackson. 7 8 Last step: Remove SVGElementInstance class itself. 9 10 * js/dom/global-constructors-attributes-expected.txt: Removed SVGElementInstance. 11 * platform/efl/js/dom/global-constructors-attributes-expected.txt: Ditto. 12 * platform/gtk/js/dom/global-constructors-attributes-expected.txt: Ditto. 13 * platform/ios-sim-deprecated/fast/dom/Window/window-property-descriptors-expected.txt: Ditto. 14 * platform/ios-sim-deprecated/fast/js/global-constructors-expected.txt: Ditto. 15 * platform/ios-sim-deprecated/js/dom/global-constructors-attributes-expected.txt: Ditto. 16 * platform/mac-mavericks/js/dom/global-constructors-attributes-expected.txt: Ditto. 17 * platform/mac-mountainlion/js/dom/global-constructors-attributes-expected.txt: Ditto. 18 * platform/mac/js/dom/global-constructors-attributes-expected.txt: Ditto. 19 * platform/win/js/dom/global-constructors-attributes-expected.txt: Ditto. 20 * svg/custom/global-constructors-expected.txt: Ditto. 21 * svg/custom/script-tests/global-constructors.js: Ditto. 22 * svg/dom/svg2-inheritance-expected.txt: Ditto. 23 * svg/dom/svg2-inheritance.html: Ditto. 24 1 25 2015-02-08 Darin Adler <darin@apple.com> 2 26 -
trunk/LayoutTests/js/dom/global-constructors-attributes-expected.txt
r179687 r179810 1164 1164 PASS Object.getOwnPropertyDescriptor(global, 'SVGElement').enumerable is false 1165 1165 PASS Object.getOwnPropertyDescriptor(global, 'SVGElement').configurable is true 1166 PASS Object.getOwnPropertyDescriptor(global, 'SVGElementInstance').value is SVGElementInstance1167 PASS Object.getOwnPropertyDescriptor(global, 'SVGElementInstance').hasOwnProperty('get') is false1168 PASS Object.getOwnPropertyDescriptor(global, 'SVGElementInstance').hasOwnProperty('set') is false1169 PASS Object.getOwnPropertyDescriptor(global, 'SVGElementInstance').enumerable is false1170 PASS Object.getOwnPropertyDescriptor(global, 'SVGElementInstance').configurable is true1171 1166 PASS Object.getOwnPropertyDescriptor(global, 'SVGEllipseElement').value is SVGEllipseElement 1172 1167 PASS Object.getOwnPropertyDescriptor(global, 'SVGEllipseElement').hasOwnProperty('get') is false -
trunk/LayoutTests/platform/efl/js/dom/global-constructors-attributes-expected.txt
r179687 r179810 1164 1164 PASS Object.getOwnPropertyDescriptor(global, 'SVGElement').enumerable is false 1165 1165 PASS Object.getOwnPropertyDescriptor(global, 'SVGElement').configurable is true 1166 PASS Object.getOwnPropertyDescriptor(global, 'SVGElementInstance').value is SVGElementInstance1167 PASS Object.getOwnPropertyDescriptor(global, 'SVGElementInstance').hasOwnProperty('get') is false1168 PASS Object.getOwnPropertyDescriptor(global, 'SVGElementInstance').hasOwnProperty('set') is false1169 PASS Object.getOwnPropertyDescriptor(global, 'SVGElementInstance').enumerable is false1170 PASS Object.getOwnPropertyDescriptor(global, 'SVGElementInstance').configurable is true1171 1166 PASS Object.getOwnPropertyDescriptor(global, 'SVGEllipseElement').value is SVGEllipseElement 1172 1167 PASS Object.getOwnPropertyDescriptor(global, 'SVGEllipseElement').hasOwnProperty('get') is false -
trunk/LayoutTests/platform/gtk/js/dom/global-constructors-attributes-expected.txt
r179687 r179810 1239 1239 PASS Object.getOwnPropertyDescriptor(global, 'SVGElement').enumerable is false 1240 1240 PASS Object.getOwnPropertyDescriptor(global, 'SVGElement').configurable is true 1241 PASS Object.getOwnPropertyDescriptor(global, 'SVGElementInstance').value is SVGElementInstance1242 PASS Object.getOwnPropertyDescriptor(global, 'SVGElementInstance').hasOwnProperty('get') is false1243 PASS Object.getOwnPropertyDescriptor(global, 'SVGElementInstance').hasOwnProperty('set') is false1244 PASS Object.getOwnPropertyDescriptor(global, 'SVGElementInstance').enumerable is false1245 PASS Object.getOwnPropertyDescriptor(global, 'SVGElementInstance').configurable is true1246 1241 PASS Object.getOwnPropertyDescriptor(global, 'SVGEllipseElement').value is SVGEllipseElement 1247 1242 PASS Object.getOwnPropertyDescriptor(global, 'SVGEllipseElement').hasOwnProperty('get') is false -
trunk/LayoutTests/platform/ios-sim-deprecated/fast/dom/Window/window-property-descriptors-expected.txt
r178715 r179810 200 200 PASS typeof Object.getOwnPropertyDescriptor(window, 'SVGDocument') is 'object' 201 201 PASS typeof Object.getOwnPropertyDescriptor(window, 'SVGElement') is 'object' 202 PASS typeof Object.getOwnPropertyDescriptor(window, 'SVGElementInstance') is 'object'203 202 PASS typeof Object.getOwnPropertyDescriptor(window, 'SVGEllipseElement') is 'object' 204 203 PASS typeof Object.getOwnPropertyDescriptor(window, 'SVGException') is 'object' -
trunk/LayoutTests/platform/ios-sim-deprecated/fast/js/global-constructors-expected.txt
r178715 r179810 187 187 PASS SVGDocument.toString() is '[object SVGDocumentConstructor]' 188 188 PASS SVGElement.toString() is '[object SVGElementConstructor]' 189 PASS SVGElementInstance.toString() is '[object SVGElementInstanceConstructor]'190 189 PASS SVGEllipseElement.toString() is '[object SVGEllipseElementConstructor]' 191 190 PASS SVGException.toString() is '[object SVGExceptionConstructor]' -
trunk/LayoutTests/platform/ios-sim-deprecated/js/dom/global-constructors-attributes-expected.txt
r179687 r179810 1169 1169 PASS Object.getOwnPropertyDescriptor(global, 'SVGElement').enumerable is false 1170 1170 PASS Object.getOwnPropertyDescriptor(global, 'SVGElement').configurable is true 1171 PASS Object.getOwnPropertyDescriptor(global, 'SVGElementInstance').value is SVGElementInstance1172 PASS Object.getOwnPropertyDescriptor(global, 'SVGElementInstance').hasOwnProperty('get') is false1173 PASS Object.getOwnPropertyDescriptor(global, 'SVGElementInstance').hasOwnProperty('set') is false1174 PASS Object.getOwnPropertyDescriptor(global, 'SVGElementInstance').enumerable is false1175 PASS Object.getOwnPropertyDescriptor(global, 'SVGElementInstance').configurable is true1176 1171 PASS Object.getOwnPropertyDescriptor(global, 'SVGEllipseElement').value is SVGEllipseElement 1177 1172 PASS Object.getOwnPropertyDescriptor(global, 'SVGEllipseElement').hasOwnProperty('get') is false -
trunk/LayoutTests/platform/mac-mavericks/js/dom/global-constructors-attributes-expected.txt
r179687 r179810 1169 1169 PASS Object.getOwnPropertyDescriptor(global, 'SVGElement').enumerable is false 1170 1170 PASS Object.getOwnPropertyDescriptor(global, 'SVGElement').configurable is true 1171 PASS Object.getOwnPropertyDescriptor(global, 'SVGElementInstance').value is SVGElementInstance1172 PASS Object.getOwnPropertyDescriptor(global, 'SVGElementInstance').hasOwnProperty('get') is false1173 PASS Object.getOwnPropertyDescriptor(global, 'SVGElementInstance').hasOwnProperty('set') is false1174 PASS Object.getOwnPropertyDescriptor(global, 'SVGElementInstance').enumerable is false1175 PASS Object.getOwnPropertyDescriptor(global, 'SVGElementInstance').configurable is true1176 1171 PASS Object.getOwnPropertyDescriptor(global, 'SVGEllipseElement').value is SVGEllipseElement 1177 1172 PASS Object.getOwnPropertyDescriptor(global, 'SVGEllipseElement').hasOwnProperty('get') is false -
trunk/LayoutTests/platform/mac-mountainlion/js/dom/global-constructors-attributes-expected.txt
r179687 r179810 1159 1159 PASS Object.getOwnPropertyDescriptor(global, 'SVGElement').enumerable is false 1160 1160 PASS Object.getOwnPropertyDescriptor(global, 'SVGElement').configurable is true 1161 PASS Object.getOwnPropertyDescriptor(global, 'SVGElementInstance').value is SVGElementInstance1162 PASS Object.getOwnPropertyDescriptor(global, 'SVGElementInstance').hasOwnProperty('get') is false1163 PASS Object.getOwnPropertyDescriptor(global, 'SVGElementInstance').hasOwnProperty('set') is false1164 PASS Object.getOwnPropertyDescriptor(global, 'SVGElementInstance').enumerable is false1165 PASS Object.getOwnPropertyDescriptor(global, 'SVGElementInstance').configurable is true1166 1161 PASS Object.getOwnPropertyDescriptor(global, 'SVGEllipseElement').value is SVGEllipseElement 1167 1162 PASS Object.getOwnPropertyDescriptor(global, 'SVGEllipseElement').hasOwnProperty('get') is false -
trunk/LayoutTests/platform/mac/js/dom/global-constructors-attributes-expected.txt
r179687 r179810 1189 1189 PASS Object.getOwnPropertyDescriptor(global, 'SVGElement').enumerable is false 1190 1190 PASS Object.getOwnPropertyDescriptor(global, 'SVGElement').configurable is true 1191 PASS Object.getOwnPropertyDescriptor(global, 'SVGElementInstance').value is SVGElementInstance1192 PASS Object.getOwnPropertyDescriptor(global, 'SVGElementInstance').hasOwnProperty('get') is false1193 PASS Object.getOwnPropertyDescriptor(global, 'SVGElementInstance').hasOwnProperty('set') is false1194 PASS Object.getOwnPropertyDescriptor(global, 'SVGElementInstance').enumerable is false1195 PASS Object.getOwnPropertyDescriptor(global, 'SVGElementInstance').configurable is true1196 1191 PASS Object.getOwnPropertyDescriptor(global, 'SVGEllipseElement').value is SVGEllipseElement 1197 1192 PASS Object.getOwnPropertyDescriptor(global, 'SVGEllipseElement').hasOwnProperty('get') is false -
trunk/LayoutTests/platform/win/js/dom/global-constructors-attributes-expected.txt
r179687 r179810 1009 1009 PASS Object.getOwnPropertyDescriptor(global, 'SVGElement').enumerable is false 1010 1010 PASS Object.getOwnPropertyDescriptor(global, 'SVGElement').configurable is true 1011 PASS Object.getOwnPropertyDescriptor(global, 'SVGElementInstance').value is SVGElementInstance1012 PASS Object.getOwnPropertyDescriptor(global, 'SVGElementInstance').hasOwnProperty('get') is false1013 PASS Object.getOwnPropertyDescriptor(global, 'SVGElementInstance').hasOwnProperty('set') is false1014 PASS Object.getOwnPropertyDescriptor(global, 'SVGElementInstance').enumerable is false1015 PASS Object.getOwnPropertyDescriptor(global, 'SVGElementInstance').configurable is true1016 1011 PASS Object.getOwnPropertyDescriptor(global, 'SVGEllipseElement').value is SVGEllipseElement 1017 1012 PASS Object.getOwnPropertyDescriptor(global, 'SVGEllipseElement').hasOwnProperty('get') is false -
trunk/LayoutTests/svg/custom/global-constructors-expected.txt
r178715 r179810 41 41 PASS SVGSymbolElement.toString() is '[object SVGSymbolElementConstructor]' 42 42 PASS SVGUseElement.toString() is '[object SVGUseElementConstructor]' 43 PASS SVGElementInstance.toString() is '[object SVGElementInstanceConstructor]'44 43 PASS SVGImageElement.toString() is '[object SVGImageElementConstructor]' 45 44 PASS SVGSwitchElement.toString() is '[object SVGSwitchElementConstructor]' -
trunk/LayoutTests/svg/custom/script-tests/global-constructors.js
r178715 r179810 44 44 shouldBeDefined("SVGSymbolElement"); 45 45 shouldBeDefined("SVGUseElement"); 46 shouldBeDefined("SVGElementInstance");47 46 shouldBeDefined("SVGImageElement"); 48 47 shouldBeDefined("SVGSwitchElement"); -
trunk/LayoutTests/svg/dom/svg2-inheritance-expected.txt
r178715 r179810 36 36 PASS SVGDescElement inherits SVGElement 37 37 PASS SVGElement inherits Element 38 FAIL SVGElementInstance should inherit EventTarget but got EventTarget instead39 38 FAIL SVGEllipseElement should inherit SVGGeometryElement but got SVGGraphicsElement instead 40 39 PASS SVGFontElement inherits SVGElement -
trunk/LayoutTests/svg/dom/svg2-inheritance.html
r178715 r179810 64 64 checkParent("SVGDescElement", "SVGElement"); 65 65 checkParent("SVGElement", "Element"); 66 checkParent("SVGElementInstance", "EventTarget");67 66 checkParent("SVGEllipseElement", "SVGGeometryElement"); 68 67 checkParent("SVGFontElement", "SVGElement"); -
trunk/Source/WebCore/CMakeLists.txt
r179687 r179810 668 668 svg/SVGDocument.idl 669 669 svg/SVGElement.idl 670 svg/SVGElementInstance.idl671 670 svg/SVGEllipseElement.idl 672 671 svg/SVGException.idl … … 1139 1138 bindings/js/JSSQLResultSetRowListCustom.cpp 1140 1139 bindings/js/JSSQLTransactionCustom.cpp 1141 bindings/js/JSSVGElementInstanceCustom.cpp1142 1140 bindings/js/JSSVGLengthCustom.cpp 1143 1141 bindings/js/JSSVGPathSegCustom.cpp … … 1146 1144 bindings/js/JSStyleSheetListCustom.cpp 1147 1145 bindings/js/JSSubtleCryptoCustom.cpp 1148 bindings/js/JSSVGElementInstanceCustom.cpp1149 1146 bindings/js/JSSVGLengthCustom.cpp 1150 1147 bindings/js/JSSVGPathSegCustom.cpp … … 2534 2531 svg/SVGDocumentExtensions.cpp 2535 2532 svg/SVGElement.cpp 2536 svg/SVGElementInstance.cpp2537 2533 svg/SVGEllipseElement.cpp 2538 2534 svg/SVGException.cpp -
trunk/Source/WebCore/ChangeLog
r179808 r179810 1 2015-02-08 Darin Adler <darin@apple.com> 2 3 Remove the SVG instance tree 4 https://bugs.webkit.org/show_bug.cgi?id=140602 5 6 Reviewed by Dean Jackson. 7 8 * CMakeLists.txt: Removed SVGElementInstance source files. 9 * DerivedSources.cpp: Ditto. 10 * DerivedSources.make: Ditto. 11 * WebCore.vcxproj/WebCore.vcxproj: Ditto. 12 * WebCore.vcxproj/WebCore.vcxproj.filters: Ditto. 13 * WebCore.xcodeproj/project.pbxproj: Ditto. 14 * bindings/js/JSBindingsAllInOne.cpp: Ditto. 15 16 * bindings/js/JSEventListener.cpp: 17 (WebCore::forwardsEventListeners): Deleted. Only returned true for JSSVGElementInstance. 18 (WebCore::correspondingElementWrapper): Deleted. Only used for JSSVGElementInstance. 19 (WebCore::createJSEventListenerForAttribute): Deleted. Argument type was JSSVGElementInstance. 20 (WebCore::createJSEventListenerForAdd): Removed most of the code; later we can delete this entirely. 21 22 * bindings/js/JSEventListener.h: Removed the overload of createJSEventListenerForAttribute 23 that takes a JSSVGElementInstance. 24 25 * bindings/js/JSSVGElementInstanceCustom.cpp: Removed. 26 27 * dom/ContainerNodeAlgorithms.h: Updated comment to reflect the fact that 28 this code is really now only used for ContainerNode and no longer needs to 29 exist in a generic form. 30 31 * dom/EventTarget.h: Removed forward declaration of SVGElementInstance. 32 * svg/SVGElement.h: Ditto. 33 34 * dom/EventTargetFactory.in: Removed SVGElementInstance. 35 36 * svg/SVGElementInstance.cpp: Removed. 37 * svg/SVGElementInstance.h: Removed. 38 * svg/SVGElementInstance.idl: Removed. 39 40 * svg/SVGUseElement.cpp: 41 (WebCore::SVGUseElement::insertedInto): Removed obsolete comment. 42 (WebCore::SVGUseElement::instanceTreeIsLoading): Deleted. Unused 43 function that I forgot to delete in my last patch. It also had a 44 glaring mistake, a missing "return" before the recursive call to 45 itself that would cause it to return false when it should return true. 46 47 * svg/SVGUseElement.h: Removed instanceTreeIsLoading. 48 49 * dom/EventDispatcher.cpp: Removed include of SVGElementInstance.h. 50 * page/EventHandler.cpp: Ditto. 51 * rendering/svg/RenderSVGViewportContainer.cpp: Ditto. 52 * svg/SVGAElement.cpp: Ditto. 53 * svg/SVGAllInOne.cpp: Ditto. 54 * svg/SVGAnimateMotionElement.cpp: Ditto. 55 * svg/SVGAnimatedTypeAnimator.h: Ditto. 56 * svg/SVGAnimationElement.cpp: Ditto. 57 * svg/SVGCircleElement.cpp: Ditto. 58 * svg/SVGClipPathElement.cpp: Ditto. 59 * svg/SVGComponentTransferFunctionElement.cpp: Ditto. 60 * svg/SVGCursorElement.cpp: Ditto. 61 * svg/SVGElement.cpp: Ditto. 62 * svg/SVGEllipseElement.cpp: Ditto. 63 * svg/SVGFEBlendElement.cpp: Ditto. 64 * svg/SVGFEColorMatrixElement.cpp: Ditto. 65 * svg/SVGFECompositeElement.cpp: Ditto. 66 * svg/SVGFEConvolveMatrixElement.cpp: Ditto. 67 * svg/SVGFEDiffuseLightingElement.cpp: Ditto. 68 * svg/SVGFEDisplacementMapElement.cpp: Ditto. 69 * svg/SVGFEDropShadowElement.cpp: Ditto. 70 * svg/SVGFEGaussianBlurElement.cpp: Ditto. 71 * svg/SVGFEImageElement.cpp: Ditto. 72 * svg/SVGFELightElement.cpp: Ditto. 73 * svg/SVGFEMergeNodeElement.cpp: Ditto. 74 * svg/SVGFEMorphologyElement.cpp: Ditto. 75 * svg/SVGFEOffsetElement.cpp: Ditto. 76 * svg/SVGFESpecularLightingElement.cpp: Ditto. 77 * svg/SVGFETileElement.cpp: Ditto. 78 * svg/SVGFETurbulenceElement.cpp: Ditto. 79 * svg/SVGFilterElement.cpp: Ditto. 80 * svg/SVGFilterPrimitiveStandardAttributes.cpp: Ditto. 81 * svg/SVGForeignObjectElement.cpp: Ditto. 82 * svg/SVGGElement.cpp: Ditto. 83 * svg/SVGGradientElement.cpp: Ditto. 84 * svg/SVGGraphicsElement.cpp: Ditto. 85 * svg/SVGImageElement.cpp: Ditto. 86 * svg/SVGLineElement.cpp: Ditto. 87 * svg/SVGLinearGradientElement.cpp: Ditto. 88 * svg/SVGMarkerElement.cpp: Ditto. 89 * svg/SVGMaskElement.cpp: Ditto. 90 * svg/SVGPathElement.cpp: Ditto. 91 * svg/SVGPatternElement.cpp: Ditto. 92 * svg/SVGPolyElement.cpp: Ditto. 93 * svg/SVGRadialGradientElement.cpp: Ditto. 94 * svg/SVGRectElement.cpp: Ditto. 95 * svg/SVGSVGElement.cpp: Ditto. 96 * svg/SVGScriptElement.cpp: Ditto. 97 * svg/SVGStopElement.cpp: Ditto. 98 * svg/SVGSymbolElement.cpp: Ditto. 99 * svg/SVGTRefElement.cpp: Ditto. 100 * svg/SVGTextContentElement.cpp: Ditto. 101 * svg/SVGTextElement.cpp: Ditto. 102 * svg/SVGTextPathElement.cpp: Ditto. 103 * svg/SVGTextPositioningElement.cpp: Ditto. 104 1 105 2015-02-07 Dean Jackson <dino@apple.com> 2 106 -
trunk/Source/WebCore/DerivedSources.cpp
r179687 r179810 361 361 #include "JSSVGDocument.cpp" 362 362 #include "JSSVGElement.cpp" 363 #include "JSSVGElementInstance.cpp"364 363 #include "JSSVGEllipseElement.cpp" 365 364 #include "JSSVGException.cpp" -
trunk/Source/WebCore/DerivedSources.make
r179687 r179810 562 562 $(WebCore)/svg/SVGDocument.idl \ 563 563 $(WebCore)/svg/SVGElement.idl \ 564 $(WebCore)/svg/SVGElementInstance.idl \565 564 $(WebCore)/svg/SVGEllipseElement.idl \ 566 565 $(WebCore)/svg/SVGException.idl \ … … 1169 1168 space += 1170 1169 1171 $(SUPPLEMENTAL_MAKEFILE_DEPS) : $(PREPROCESS_IDLS_SCRIPTS) $(BINDING_IDLS) $(PLATFORM_FEATURE_DEFINES) 1170 $(SUPPLEMENTAL_MAKEFILE_DEPS) : $(PREPROCESS_IDLS_SCRIPTS) $(BINDING_IDLS) $(PLATFORM_FEATURE_DEFINES) DerivedSources.make 1172 1171 printf "$(subst $(space),,$(patsubst %,%\n,$(BINDING_IDLS)))" > $(IDL_FILES_TMP) 1173 1172 $(call preprocess_idls_script, $(PREPROCESS_IDLS_SCRIPTS)) --defines "$(FEATURE_DEFINES) $(ADDITIONAL_IDL_DEFINES) LANGUAGE_JAVASCRIPT" --idlFilesList $(IDL_FILES_TMP) --supplementalDependencyFile $(SUPPLEMENTAL_DEPENDENCY_FILE) --windowConstructorsFile $(WINDOW_CONSTRUCTORS_FILE) --workerGlobalScopeConstructorsFile $(WORKERGLOBALSCOPE_CONSTRUCTORS_FILE) --dedicatedWorkerGlobalScopeConstructorsFile $(DEDICATEDWORKERGLOBALSCOPE_CONSTRUCTORS_FILE) --supplementalMakefileDeps $@ -
trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj
r179687 r179810 4627 4627 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild> 4628 4628 </ClCompile> 4629 <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSSVGElementInstance.cpp">4630 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>4631 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>4632 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>4633 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>4634 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>4635 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>4636 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>4637 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>4638 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>4639 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>4640 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>4641 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>4642 </ClCompile>4643 4629 <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSSVGElementWrapperFactory.cpp" /> 4644 4630 <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSSVGEllipseElement.cpp"> … … 17656 17642 </ClCompile> 17657 17643 <ClCompile Include="..\bindings\js\JSStyleSheetListCustom.cpp"> 17658 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>17659 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>17660 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>17661 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>17662 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>17663 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>17664 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>17665 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>17666 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>17667 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>17668 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>17669 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>17670 </ClCompile>17671 <ClCompile Include="..\bindings\js\JSSVGElementInstanceCustom.cpp">17672 17644 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> 17673 17645 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> … … 18803 18775 <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSSVGDocument.h" /> 18804 18776 <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSSVGElement.h" /> 18805 <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSSVGElementInstance.h" />18806 18777 <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSSVGElementWrapperFactory.h" /> 18807 18778 <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSSVGEllipseElement.h" /> … … 21249 21220 <ClInclude Include="..\svg\SVGDocumentExtensions.h" /> 21250 21221 <ClInclude Include="..\svg\SVGElement.h" /> 21251 <ClInclude Include="..\svg\SVGElementInstance.h" />21252 21222 <ClInclude Include="..\svg\SVGElementRareData.h" /> 21253 21223 <ClInclude Include="..\svg\SVGEllipseElement.h" /> -
trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters
r179687 r179810 4438 4438 <Filter>bindings\js</Filter> 4439 4439 </ClCompile> 4440 <ClCompile Include="..\bindings\js\JSSVGElementInstanceCustom.cpp">4441 <Filter>bindings\js</Filter>4442 </ClCompile>4443 4440 <ClCompile Include="..\bindings\js\JSSVGLengthCustom.cpp"> 4444 4441 <Filter>bindings\js</Filter> … … 5835 5832 </ClCompile> 5836 5833 <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSSVGElement.cpp"> 5837 <Filter>DerivedSources</Filter>5838 </ClCompile>5839 <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSSVGElementInstance.cpp">5840 5834 <Filter>DerivedSources</Filter> 5841 5835 </ClCompile> … … 13179 13173 <Filter>DerivedSources</Filter> 13180 13174 </ClInclude> 13181 <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSSVGElementInstance.h">13182 <Filter>DerivedSources</Filter>13183 </ClInclude>13184 13175 <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSSVGElementWrapperFactory.h"> 13185 13176 <Filter>DerivedSources</Filter> … … 14680 14671 </ClInclude> 14681 14672 <ClInclude Include="..\svg\SVGElement.h"> 14682 <Filter>svg</Filter>14683 </ClInclude>14684 <ClInclude Include="..\svg\SVGElementInstance.h">14685 14673 <Filter>svg</Filter> 14686 14674 </ClInclude> -
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
r179687 r179810 437 437 08A484770E5272C500C3FE76 /* ScriptElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 08A484750E5272C500C3FE76 /* ScriptElement.cpp */; }; 438 438 08A484780E5272C500C3FE76 /* ScriptElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 08A484760E5272C500C3FE76 /* ScriptElement.h */; }; 439 08A48A6E0E86CF6D00E225DD /* JSSVGElementInstanceCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 08A48A6D0E86CF6D00E225DD /* JSSVGElementInstanceCustom.cpp */; };440 439 08B35B13127B6A7C005314DD /* SVGAnimatedNumber.h in Headers */ = {isa = PBXBuildFile; fileRef = 08B35B12127B6A7C005314DD /* SVGAnimatedNumber.h */; settings = {ATTRIBUTES = (Private, ); }; }; 441 440 08B35B17127B6A88005314DD /* SVGAnimatedNumberList.h in Headers */ = {isa = PBXBuildFile; fileRef = 08B35B16127B6A88005314DD /* SVGAnimatedNumberList.h */; settings = {ATTRIBUTES = (Private, ); }; }; … … 4424 4423 B22279B60D00BF220071B782 /* SVGElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B22278200D00BF1F0071B782 /* SVGElement.cpp */; }; 4425 4424 B22279B70D00BF220071B782 /* SVGElement.h in Headers */ = {isa = PBXBuildFile; fileRef = B22278210D00BF1F0071B782 /* SVGElement.h */; settings = {ATTRIBUTES = (Private, ); }; }; 4426 B22279B90D00BF220071B782 /* SVGElementInstance.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B22278230D00BF1F0071B782 /* SVGElementInstance.cpp */; };4427 B22279BA0D00BF220071B782 /* SVGElementInstance.h in Headers */ = {isa = PBXBuildFile; fileRef = B22278240D00BF1F0071B782 /* SVGElementInstance.h */; };4428 4425 B22279BF0D00BF220071B782 /* SVGEllipseElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B22278290D00BF1F0071B782 /* SVGEllipseElement.cpp */; }; 4429 4426 B22279C00D00BF220071B782 /* SVGEllipseElement.h in Headers */ = {isa = PBXBuildFile; fileRef = B222782A0D00BF1F0071B782 /* SVGEllipseElement.h */; }; … … 4740 4737 B2C3DA6C0D006CD600EF6F26 /* GlyphBuffer.h in Headers */ = {isa = PBXBuildFile; fileRef = B2C3DA5B0D006CD600EF6F26 /* GlyphBuffer.h */; settings = {ATTRIBUTES = (Private, ); }; }; 4741 4738 B2C96D8D0B3AF2B7005E80EC /* JSSVGPathSegCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2C96D8C0B3AF2B7005E80EC /* JSSVGPathSegCustom.cpp */; }; 4742 B2CB92420B5BD966009BAA78 /* JSSVGElementInstance.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2CB923B0B5BD941009BAA78 /* JSSVGElementInstance.cpp */; };4743 B2CB92440B5BD970009BAA78 /* JSSVGElementInstance.h in Headers */ = {isa = PBXBuildFile; fileRef = B2CB923C0B5BD941009BAA78 /* JSSVGElementInstance.h */; };4744 4739 B2D3DA640D006CD600EF6F27 /* OpenTypeMathData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2D3DA530D006CD600EF6F27 /* OpenTypeMathData.cpp */; }; 4745 4740 B2D3DA650D006CD600EF6F27 /* OpenTypeMathData.h in Headers */ = {isa = PBXBuildFile; fileRef = B2D3DA540D006CD600EF6F27 /* OpenTypeMathData.h */; settings = {ATTRIBUTES = (Private, ); }; }; … … 7428 7423 08A484750E5272C500C3FE76 /* ScriptElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScriptElement.cpp; sourceTree = "<group>"; }; 7429 7424 08A484760E5272C500C3FE76 /* ScriptElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptElement.h; sourceTree = "<group>"; }; 7430 08A48A6D0E86CF6D00E225DD /* JSSVGElementInstanceCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSSVGElementInstanceCustom.cpp; sourceTree = "<group>"; };7431 7425 08B35B12127B6A7C005314DD /* SVGAnimatedNumber.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGAnimatedNumber.h; sourceTree = "<group>"; }; 7432 7426 08B35B16127B6A88005314DD /* SVGAnimatedNumberList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGAnimatedNumberList.h; sourceTree = "<group>"; }; … … 11727 11721 B22278210D00BF1F0071B782 /* SVGElement.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SVGElement.h; sourceTree = "<group>"; }; 11728 11722 B22278220D00BF1F0071B782 /* SVGElement.idl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = SVGElement.idl; sourceTree = "<group>"; }; 11729 B22278230D00BF1F0071B782 /* SVGElementInstance.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SVGElementInstance.cpp; sourceTree = "<group>"; };11730 B22278240D00BF1F0071B782 /* SVGElementInstance.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SVGElementInstance.h; sourceTree = "<group>"; };11731 B22278250D00BF1F0071B782 /* SVGElementInstance.idl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = SVGElementInstance.idl; sourceTree = "<group>"; };11732 11723 B22278290D00BF1F0071B782 /* SVGEllipseElement.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SVGEllipseElement.cpp; sourceTree = "<group>"; }; 11733 11724 B222782A0D00BF1F0071B782 /* SVGEllipseElement.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SVGEllipseElement.h; sourceTree = "<group>"; }; … … 12157 12148 B2C3DA5B0D006CD600EF6F26 /* GlyphBuffer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = GlyphBuffer.h; sourceTree = "<group>"; }; 12158 12149 B2C96D8C0B3AF2B7005E80EC /* JSSVGPathSegCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSSVGPathSegCustom.cpp; sourceTree = "<group>"; }; 12159 B2CB923B0B5BD941009BAA78 /* JSSVGElementInstance.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSSVGElementInstance.cpp; sourceTree = "<group>"; };12160 B2CB923C0B5BD941009BAA78 /* JSSVGElementInstance.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSSVGElementInstance.h; sourceTree = "<group>"; };12161 12150 B2D3DA530D006CD600EF6F27 /* OpenTypeMathData.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = OpenTypeMathData.cpp; sourceTree = "<group>"; }; 12162 12151 B2D3DA540D006CD600EF6F27 /* OpenTypeMathData.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = OpenTypeMathData.h; sourceTree = "<group>"; }; … … 19129 19118 B222F69A0AB771B80022EFAD /* JSSVGElement.cpp */, 19130 19119 B222F69B0AB771B80022EFAD /* JSSVGElement.h */, 19131 B2CB923B0B5BD941009BAA78 /* JSSVGElementInstance.cpp */,19132 B2CB923C0B5BD941009BAA78 /* JSSVGElementInstance.h */,19133 19120 B2FA3C800AB75A6E000E5AC4 /* JSSVGEllipseElement.cpp */, 19134 19121 B2FA3C810AB75A6E000E5AC4 /* JSSVGEllipseElement.h */, … … 20030 20017 B22278210D00BF1F0071B782 /* SVGElement.h */, 20031 20018 B22278220D00BF1F0071B782 /* SVGElement.idl */, 20032 B22278230D00BF1F0071B782 /* SVGElementInstance.cpp */,20033 B22278240D00BF1F0071B782 /* SVGElementInstance.h */,20034 B22278250D00BF1F0071B782 /* SVGElementInstance.idl */,20035 20019 081AA8D91111237E002AB06E /* SVGElementRareData.h */, 20036 20020 B22278290D00BF1F0071B782 /* SVGEllipseElement.cpp */, … … 21124 21108 A84EBD770CB8C89200079609 /* JSStyleSheetListCustom.cpp */, 21125 21109 E1FF8F661807460800132674 /* JSSubtleCryptoCustom.cpp */, 21126 08A48A6D0E86CF6D00E225DD /* JSSVGElementInstanceCustom.cpp */,21127 21110 08E4FE450E2BD41400F4CAE0 /* JSSVGLengthCustom.cpp */, 21128 21111 B2C96D8C0B3AF2B7005E80EC /* JSSVGPathSegCustom.cpp */, … … 25209 25192 B2FA3D670AB75A6F000E5AC4 /* JSSVGDocument.h in Headers */, 25210 25193 B222F69D0AB771B80022EFAD /* JSSVGElement.h in Headers */, 25211 B2CB92440B5BD970009BAA78 /* JSSVGElementInstance.h in Headers */,25212 25194 8542A7990AE5C94400DF58DF /* JSSVGElementWrapperFactory.h in Headers */, 25213 25195 B2FA3D690AB75A6F000E5AC4 /* JSSVGEllipseElement.h in Headers */, … … 26344 26326 B22279B70D00BF220071B782 /* SVGElement.h in Headers */, 26345 26327 656581FE09D1508D000E61D7 /* SVGElementFactory.h in Headers */, 26346 B22279BA0D00BF220071B782 /* SVGElementInstance.h in Headers */,26347 26328 081AA8DA1111237E002AB06E /* SVGElementRareData.h in Headers */, 26348 26329 B562DB6117D3CD660010AF96 /* SVGElementTypeHelpers.h in Headers */, … … 28779 28760 B2FA3D660AB75A6F000E5AC4 /* JSSVGDocument.cpp in Sources */, 28780 28761 B222F69C0AB771B80022EFAD /* JSSVGElement.cpp in Sources */, 28781 B2CB92420B5BD966009BAA78 /* JSSVGElementInstance.cpp in Sources */,28782 08A48A6E0E86CF6D00E225DD /* JSSVGElementInstanceCustom.cpp in Sources */,28783 28762 8542A79A0AE5C94400DF58DF /* JSSVGElementWrapperFactory.cpp in Sources */, 28784 28763 B2FA3D680AB75A6F000E5AC4 /* JSSVGEllipseElement.cpp in Sources */, … … 29759 29738 B22279B60D00BF220071B782 /* SVGElement.cpp in Sources */, 29760 29739 A833C8520A2CF52800D57664 /* SVGElementFactory.cpp in Sources */, 29761 B22279B90D00BF220071B782 /* SVGElementInstance.cpp in Sources */,29762 29740 B22279BF0D00BF220071B782 /* SVGEllipseElement.cpp in Sources */, 29763 29741 978D07CA145A10160096908D /* SVGException.cpp in Sources */, -
trunk/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp
r179687 r179810 119 119 #include "JSSQLResultSetRowListCustom.cpp" 120 120 #include "JSSQLTransactionCustom.cpp" 121 #include "JSSVGElementInstanceCustom.cpp"122 121 #include "JSSVGLengthCustom.cpp" 123 122 #include "JSSVGPathSegCustom.cpp" -
trunk/Source/WebCore/bindings/js/JSEventListener.cpp
r178633 r179810 28 28 #include "JSMainThreadExecState.h" 29 29 #include "JSMainThreadExecStateInstrumentation.h" 30 #include "JSSVGElementInstance.h"31 30 #include "ScriptController.h" 32 31 #include "WorkerGlobalScope.h" … … 165 164 } 166 165 167 // SVGElementInstance forwards listeners to its corresponding element, so the listeners are168 // protected by the wrapper of the corresponding element, not the element instance's wrapper.169 170 bool forwardsEventListeners(JSC::JSObject& object)171 {172 if (object.classInfo() == JSSVGElementInstance::info())173 return true;174 ASSERT(!object.inherits(JSSVGElementInstance::info()));175 return false;176 }177 178 static JSC::JSObject& correspondingElementWrapper(JSC::ExecState& state, JSC::JSObject& wrapper)179 {180 JSSVGElementInstance& castedWrapper = *jsCast<JSSVGElementInstance*>(&wrapper);181 return *asObject(toJS(&state, castedWrapper.globalObject(), *castedWrapper.impl().correspondingElement()));182 }183 184 RefPtr<JSEventListener> createJSEventListenerForAttribute(JSC::ExecState& state, JSC::JSValue listener, JSSVGElementInstance& wrapper)185 {186 return createJSEventListenerForAttribute(state, listener, correspondingElementWrapper(state, wrapper));187 }188 189 166 Ref<JSEventListener> createJSEventListenerForAdd(JSC::ExecState& state, JSC::JSObject& listener, JSC::JSObject& wrapper) 190 167 { 191 JSC::JSObject& actualWrapper = forwardsEventListeners(wrapper) ? correspondingElementWrapper(state, wrapper) : wrapper;192 ASSERT(!forwardsEventListeners(actualWrapper));193 return JSEventListener::create(&listener, & actualWrapper, false, currentWorld(&state));168 // FIXME: This abstraction is no longer needed. It was part of support for SVGElementInstance. 169 // We should remove it and simplify the bindings generation scripts. 170 return JSEventListener::create(&listener, &wrapper, false, currentWorld(&state)); 194 171 } 195 172 -
trunk/Source/WebCore/bindings/js/JSEventListener.h
r178633 r179810 31 31 32 32 class JSDOMGlobalObject; 33 class JSSVGElementInstance;34 33 35 34 class JSEventListener : public EventListener { … … 79 78 // For "onXXX" event attributes. 80 79 RefPtr<JSEventListener> createJSEventListenerForAttribute(JSC::ExecState&, JSC::JSValue listener, JSC::JSObject& wrapper); 81 RefPtr<JSEventListener> createJSEventListenerForAttribute(JSC::ExecState&, JSC::JSValue listener, JSSVGElementInstance& wrapper);82 80 83 81 Ref<JSEventListener> createJSEventListenerForAdd(JSC::ExecState&, JSC::JSObject& listener, JSC::JSObject& wrapper); -
trunk/Source/WebCore/dom/ContainerNodeAlgorithms.h
r178988 r179810 79 79 } 80 80 81 // Helper functions for TreeShared-derived classes, which have a 'Node' style interface 82 // This applies to 'ContainerNode' and 'SVGElementInstance' 81 // This no longer needs to be generic. It's only used for Node and ContainerNode now. 83 82 template<class GenericNode, class GenericNodeContainer> 84 83 inline void removeDetachedChildrenInContainer(GenericNodeContainer& container) -
trunk/Source/WebCore/dom/EventDispatcher.cpp
r179785 r179810 38 38 #include "ScopedEventQueue.h" 39 39 #include "ShadowRoot.h" 40 #include "SVGElementInstance.h"41 40 #include "SVGNames.h" 42 41 #include "SVGUseElement.h" -
trunk/Source/WebCore/dom/EventTarget.h
r178310 r179810 66 66 class Node; 67 67 class Notification; 68 class SVGElementInstance;69 68 class ScriptExecutionContext; 70 69 class TextTrack; -
trunk/Source/WebCore/dom/EventTargetFactory.in
r178310 r179810 30 30 SourceBufferList conditional=MEDIA_SOURCE 31 31 SpeechSynthesisUtterance conditional=SPEECH_SYNTHESIS 32 SVGElementInstance33 32 TextTrack conditional=VIDEO_TRACK 34 33 TextTrackCue conditional=VIDEO_TRACK -
trunk/Source/WebCore/page/EventHandler.cpp
r179324 r179810 81 81 #include "RuntimeApplicationChecks.h" 82 82 #include "SVGDocument.h" 83 #include "SVGElementInstance.h"84 83 #include "SVGNames.h" 85 84 #include "SVGUseElement.h" -
trunk/Source/WebCore/rendering/svg/RenderSVGViewportContainer.cpp
r179069 r179810 26 26 #include "GraphicsContext.h" 27 27 #include "RenderView.h" 28 #include "SVGElementInstance.h"29 28 #include "SVGNames.h" 30 29 #include "SVGSVGElement.h" -
trunk/Source/WebCore/svg/SVGAElement.cpp
r179695 r179810 41 41 #include "RenderSVGTransformableContainer.h" 42 42 #include "ResourceRequest.h" 43 #include "SVGElementInstance.h"44 43 #include "SVGNames.h" 45 44 #include "SVGSMILElement.h" -
trunk/Source/WebCore/svg/SVGAllInOne.cpp
r178715 r179810 67 67 #include "SVGDocumentExtensions.cpp" 68 68 #include "SVGElement.cpp" 69 #include "SVGElementInstance.cpp"70 69 #include "SVGEllipseElement.cpp" 71 70 #include "SVGException.cpp" -
trunk/Source/WebCore/svg/SVGAnimateMotionElement.cpp
r179260 r179810 28 28 #include "RenderObject.h" 29 29 #include "RenderSVGResource.h" 30 #include "SVGElementInstance.h"31 30 #include "SVGImageElement.h" 32 31 #include "SVGMPathElement.h" -
trunk/Source/WebCore/svg/SVGAnimatedTypeAnimator.h
r179695 r179810 24 24 #include "SVGAnimatedProperty.h" 25 25 #include "SVGAnimatedType.h" 26 #include "SVGElementInstance.h"27 26 #include <wtf/StdLibExtras.h> 28 27 -
trunk/Source/WebCore/svg/SVGAnimationElement.cpp
r179772 r179810 36 36 #include "SVGAnimateElement.h" 37 37 #include "SVGElement.h" 38 #include "SVGElementInstance.h"39 38 #include "SVGNames.h" 40 39 #include "SVGParserUtilities.h" -
trunk/Source/WebCore/svg/SVGCircleElement.cpp
r179695 r179810 28 28 #include "RenderSVGPath.h" 29 29 #include "RenderSVGResource.h" 30 #include "SVGElementInstance.h"31 30 #include "SVGException.h" 32 31 #include "SVGLength.h" -
trunk/Source/WebCore/svg/SVGClipPathElement.cpp
r179695 r179810 26 26 #include "Document.h" 27 27 #include "RenderSVGResourceClipper.h" 28 #include "SVGElementInstance.h"29 28 #include "SVGNames.h" 30 29 #include "SVGTransformList.h" -
trunk/Source/WebCore/svg/SVGComponentTransferFunctionElement.cpp
r179695 r179810 23 23 24 24 #include "Attribute.h" 25 #include "SVGElementInstance.h"26 25 #include "SVGFEComponentTransferElement.h" 27 26 #include "SVGNames.h" -
trunk/Source/WebCore/svg/SVGCursorElement.cpp
r179695 r179810 24 24 #include "Attr.h" 25 25 #include "Document.h" 26 #include "SVGElementInstance.h"27 26 #include "SVGNames.h" 28 27 #include "XLinkNames.h" -
trunk/Source/WebCore/svg/SVGElement.cpp
r179807 r179810 45 45 #include "SVGCursorElement.h" 46 46 #include "SVGDocumentExtensions.h" 47 #include "SVGElementInstance.h"48 47 #include "SVGElementRareData.h" 49 48 #include "SVGGraphicsElement.h" -
trunk/Source/WebCore/svg/SVGElement.h
r179807 r179810 47 47 class SVGCursorElement; 48 48 class SVGDocumentExtensions; 49 class SVGElementInstance;50 49 class SVGElementRareData; 51 50 class SVGSVGElement; … … 189 188 190 189 private: 191 friend class SVGElementInstance;192 193 190 virtual RenderStyle* computedStyle(PseudoId = NOPSEUDO) override final; 194 191 virtual bool willRecalcStyle(Style::Change) override; -
trunk/Source/WebCore/svg/SVGEllipseElement.cpp
r179695 r179810 27 27 #include "RenderSVGPath.h" 28 28 #include "RenderSVGResource.h" 29 #include "SVGElementInstance.h"30 29 #include "SVGLength.h" 31 30 #include "SVGNames.h" -
trunk/Source/WebCore/svg/SVGFEBlendElement.cpp
r179695 r179810 25 25 #include "Attribute.h" 26 26 #include "FilterEffect.h" 27 #include "SVGElementInstance.h"28 27 #include "SVGFilterBuilder.h" 29 28 #include "SVGNames.h" -
trunk/Source/WebCore/svg/SVGFEColorMatrixElement.cpp
r179695 r179810 24 24 #include "Attribute.h" 25 25 #include "FilterEffect.h" 26 #include "SVGElementInstance.h"27 26 #include "SVGFilterBuilder.h" 28 27 #include "SVGNames.h" -
trunk/Source/WebCore/svg/SVGFECompositeElement.cpp
r179695 r179810 24 24 #include "Attribute.h" 25 25 #include "FilterEffect.h" 26 #include "SVGElementInstance.h"27 26 #include "SVGFilterBuilder.h" 28 27 #include "SVGNames.h" -
trunk/Source/WebCore/svg/SVGFEConvolveMatrixElement.cpp
r179695 r179810 26 26 #include "IntPoint.h" 27 27 #include "IntSize.h" 28 #include "SVGElementInstance.h"29 28 #include "SVGFilterBuilder.h" 30 29 #include "SVGNames.h" -
trunk/Source/WebCore/svg/SVGFEDiffuseLightingElement.cpp
r179695 r179810 26 26 #include "RenderStyle.h" 27 27 #include "SVGColor.h" 28 #include "SVGElementInstance.h"29 28 #include "SVGFELightElement.h" 30 29 #include "SVGFilterBuilder.h" -
trunk/Source/WebCore/svg/SVGFEDisplacementMapElement.cpp
r179695 r179810 23 23 #include "Attribute.h" 24 24 #include "FilterEffect.h" 25 #include "SVGElementInstance.h"26 25 #include "SVGFilterBuilder.h" 27 26 #include "SVGNames.h" -
trunk/Source/WebCore/svg/SVGFEDropShadowElement.cpp
r179695 r179810 23 23 #include "Attribute.h" 24 24 #include "RenderStyle.h" 25 #include "SVGElementInstance.h"26 25 #include "SVGFilterBuilder.h" 27 26 #include "SVGNames.h" -
trunk/Source/WebCore/svg/SVGFEGaussianBlurElement.cpp
r179695 r179810 24 24 #include "Attribute.h" 25 25 #include "FilterEffect.h" 26 #include "SVGElementInstance.h"27 26 #include "SVGFilterBuilder.h" 28 27 #include "SVGNames.h" -
trunk/Source/WebCore/svg/SVGFEImageElement.cpp
r179695 r179810 32 32 #include "RenderObject.h" 33 33 #include "RenderSVGResource.h" 34 #include "SVGElementInstance.h"35 34 #include "SVGNames.h" 36 35 #include "SVGPreserveAspectRatio.h" -
trunk/Source/WebCore/svg/SVGFELightElement.cpp
r179695 r179810 27 27 #include "RenderObject.h" 28 28 #include "RenderSVGResource.h" 29 #include "SVGElementInstance.h"30 29 #include "SVGFEDiffuseLightingElement.h" 31 30 #include "SVGFESpecularLightingElement.h" -
trunk/Source/WebCore/svg/SVGFEMergeNodeElement.cpp
r179695 r179810 25 25 #include "RenderObject.h" 26 26 #include "RenderSVGResource.h" 27 #include "SVGElementInstance.h"28 27 #include "SVGFilterElement.h" 29 28 #include "SVGFilterPrimitiveStandardAttributes.h" -
trunk/Source/WebCore/svg/SVGFEMorphologyElement.cpp
r179695 r179810 23 23 #include "Attribute.h" 24 24 #include "FilterEffect.h" 25 #include "SVGElementInstance.h"26 25 #include "SVGFilterBuilder.h" 27 26 #include "SVGNames.h" -
trunk/Source/WebCore/svg/SVGFEOffsetElement.cpp
r179695 r179810 24 24 #include "Attribute.h" 25 25 #include "FilterEffect.h" 26 #include "SVGElementInstance.h"27 26 #include "SVGFilterBuilder.h" 28 27 #include "SVGNames.h" -
trunk/Source/WebCore/svg/SVGFESpecularLightingElement.cpp
r179695 r179810 27 27 #include "RenderStyle.h" 28 28 #include "SVGColor.h" 29 #include "SVGElementInstance.h"30 29 #include "SVGFELightElement.h" 31 30 #include "SVGFilterBuilder.h" -
trunk/Source/WebCore/svg/SVGFETileElement.cpp
r179695 r179810 24 24 #include "Attribute.h" 25 25 #include "FilterEffect.h" 26 #include "SVGElementInstance.h"27 26 #include "SVGFilterBuilder.h" 28 27 #include "SVGNames.h" -
trunk/Source/WebCore/svg/SVGFETurbulenceElement.cpp
r179695 r179810 23 23 24 24 #include "Attribute.h" 25 #include "SVGElementInstance.h"26 25 #include "SVGNames.h" 27 26 #include "SVGParserUtilities.h" -
trunk/Source/WebCore/svg/SVGFilterElement.cpp
r179695 r179810 28 28 #include "Attr.h" 29 29 #include "RenderSVGResourceFilter.h" 30 #include "SVGElementInstance.h"31 30 #include "SVGFilterBuilder.h" 32 31 #include "SVGFilterPrimitiveStandardAttributes.h" -
trunk/Source/WebCore/svg/SVGFilterPrimitiveStandardAttributes.cpp
r179695 r179810 27 27 #include "RenderSVGResourceFilterPrimitive.h" 28 28 #include "SVGElement.h" 29 #include "SVGElementInstance.h"30 29 #include "SVGFilterBuilder.h" 31 30 #include "SVGLength.h" -
trunk/Source/WebCore/svg/SVGForeignObjectElement.cpp
r179695 r179810 27 27 #include "RenderSVGForeignObject.h" 28 28 #include "RenderSVGResource.h" 29 #include "SVGElementInstance.h"30 29 #include "SVGLength.h" 31 30 #include "SVGNames.h" -
trunk/Source/WebCore/svg/SVGGElement.cpp
r179695 r179810 25 25 #include "RenderSVGResource.h" 26 26 #include "RenderSVGTransformableContainer.h" 27 #include "SVGElementInstance.h"28 27 #include "SVGNames.h" 29 28 #include <wtf/NeverDestroyed.h> -
trunk/Source/WebCore/svg/SVGGradientElement.cpp
r179695 r179810 28 28 #include "RenderSVGResourceLinearGradient.h" 29 29 #include "RenderSVGResourceRadialGradient.h" 30 #include "SVGElementInstance.h"31 30 #include "SVGNames.h" 32 31 #include "SVGStopElement.h" -
trunk/Source/WebCore/svg/SVGGraphicsElement.cpp
r179695 r179810 26 26 #include "RenderSVGPath.h" 27 27 #include "RenderSVGResource.h" 28 #include "SVGElementInstance.h"29 28 #include "SVGNames.h" 30 29 #include "SVGPathData.h" -
trunk/Source/WebCore/svg/SVGImageElement.cpp
r179695 r179810 29 29 #include "RenderSVGImage.h" 30 30 #include "RenderSVGResource.h" 31 #include "SVGElementInstance.h"32 31 #include "SVGNames.h" 33 32 #include "SVGSVGElement.h" -
trunk/Source/WebCore/svg/SVGLineElement.cpp
r179695 r179810 26 26 #include "RenderSVGPath.h" 27 27 #include "RenderSVGResource.h" 28 #include "SVGElementInstance.h"29 28 #include "SVGLength.h" 30 29 #include "SVGNames.h" -
trunk/Source/WebCore/svg/SVGLinearGradientElement.cpp
r179695 r179810 30 30 #include "LinearGradientAttributes.h" 31 31 #include "RenderSVGResourceLinearGradient.h" 32 #include "SVGElementInstance.h"33 32 #include "SVGLength.h" 34 33 #include "SVGNames.h" -
trunk/Source/WebCore/svg/SVGMarkerElement.cpp
r179695 r179810 25 25 #include "Attribute.h" 26 26 #include "RenderSVGResourceMarker.h" 27 #include "SVGElementInstance.h"28 27 #include "SVGFitToViewBox.h" 29 28 #include "SVGNames.h" -
trunk/Source/WebCore/svg/SVGMaskElement.cpp
r179695 r179810 28 28 #include "Attribute.h" 29 29 #include "RenderSVGResourceMasker.h" 30 #include "SVGElementInstance.h"31 30 #include "SVGNames.h" 32 31 #include "SVGRenderSupport.h" -
trunk/Source/WebCore/svg/SVGPathElement.cpp
r179695 r179810 25 25 #include "RenderSVGPath.h" 26 26 #include "RenderSVGResource.h" 27 #include "SVGElementInstance.h"28 27 #include "SVGMPathElement.h" 29 28 #include "SVGNames.h" -
trunk/Source/WebCore/svg/SVGPatternElement.cpp
r179695 r179810 33 33 #include "RenderSVGContainer.h" 34 34 #include "RenderSVGResourcePattern.h" 35 #include "SVGElementInstance.h"36 35 #include "SVGFitToViewBox.h" 37 36 #include "SVGGraphicsElement.h" -
trunk/Source/WebCore/svg/SVGPolyElement.cpp
r179695 r179810 28 28 #include "RenderSVGResource.h" 29 29 #include "SVGAnimatedPointList.h" 30 #include "SVGElementInstance.h"31 30 #include "SVGNames.h" 32 31 #include "SVGParserUtilities.h" -
trunk/Source/WebCore/svg/SVGRadialGradientElement.cpp
r179695 r179810 30 30 #include "RadialGradientAttributes.h" 31 31 #include "RenderSVGResourceRadialGradient.h" 32 #include "SVGElementInstance.h"33 32 #include "SVGNames.h" 34 33 #include "SVGStopElement.h" -
trunk/Source/WebCore/svg/SVGRectElement.cpp
r179695 r179810 27 27 #include "RenderSVGRect.h" 28 28 #include "RenderSVGResource.h" 29 #include "SVGElementInstance.h"30 29 #include "SVGLength.h" 31 30 #include "SVGNames.h" -
trunk/Source/WebCore/svg/SVGSVGElement.cpp
r179695 r179810 47 47 #include "SMILTimeContainer.h" 48 48 #include "SVGAngle.h" 49 #include "SVGElementInstance.h"50 49 #include "SVGFitToViewBox.h" 51 50 #include "SVGNames.h" -
trunk/Source/WebCore/svg/SVGScriptElement.cpp
r179695 r179810 28 28 #include "HTMLNames.h" 29 29 #include "SVGAnimatedStaticPropertyTearOff.h" 30 #include "SVGElementInstance.h"31 30 #include "XLinkNames.h" 32 31 #include <wtf/NeverDestroyed.h> -
trunk/Source/WebCore/svg/SVGStopElement.cpp
r179695 r179810 26 26 #include "RenderSVGGradientStop.h" 27 27 #include "RenderSVGResource.h" 28 #include "SVGElementInstance.h"29 28 #include "SVGGradientElement.h" 30 29 #include "SVGNames.h" -
trunk/Source/WebCore/svg/SVGSymbolElement.cpp
r179695 r179810 23 23 24 24 #include "RenderSVGHiddenContainer.h" 25 #include "SVGElementInstance.h"26 25 #include "SVGFitToViewBox.h" 27 26 #include "SVGNames.h" -
trunk/Source/WebCore/svg/SVGTRefElement.cpp
r179695 r179810 32 32 #include "ShadowRoot.h" 33 33 #include "SVGDocument.h" 34 #include "SVGElementInstance.h"35 34 #include "SVGNames.h" 36 35 #include "StyleInheritedData.h" -
trunk/Source/WebCore/svg/SVGTextContentElement.cpp
r179695 r179810 30 30 #include "RenderSVGText.h" 31 31 #include "SVGDocumentExtensions.h" 32 #include "SVGElementInstance.h"33 32 #include "SVGNames.h" 34 33 #include "SVGTextQuery.h" -
trunk/Source/WebCore/svg/SVGTextElement.cpp
r178048 r179810 25 25 #include "RenderSVGResource.h" 26 26 #include "RenderSVGText.h" 27 #include "SVGElementInstance.h"28 27 #include "SVGNames.h" 29 28 #include "SVGRenderStyle.h" -
trunk/Source/WebCore/svg/SVGTextPathElement.cpp
r179695 r179810 25 25 #include "RenderSVGResource.h" 26 26 #include "RenderSVGTextPath.h" 27 #include "SVGElementInstance.h"28 27 #include "SVGNames.h" 29 28 #include "XLinkNames.h" -
trunk/Source/WebCore/svg/SVGTextPositioningElement.cpp
r179695 r179810 28 28 #include "RenderSVGText.h" 29 29 #include "SVGAltGlyphElement.h" 30 #include "SVGElementInstance.h"31 30 #include "SVGLengthList.h" 32 31 #include "SVGNames.h" -
trunk/Source/WebCore/svg/SVGUseElement.cpp
r179807 r179810 40 40 #include "RenderSVGTransformableContainer.h" 41 41 #include "ShadowRoot.h" 42 #include "SVGElementInstance.h"43 42 #include "SVGElementRareData.h" 44 43 #include "SVGGElement.h" … … 154 153 Node::InsertionNotificationRequest SVGUseElement::insertedInto(ContainerNode& rootParent) 155 154 { 156 // This functions exists to assure assumptions made in the code regarding SVGElementInstance creation/destruction are satisfied.157 155 SVGGraphicsElement::insertedInto(rootParent); 158 156 if (!rootParent.inDocument()) … … 650 648 } 651 649 652 bool SVGUseElement::instanceTreeIsLoading(SVGElementInstance* targetElementInstance)653 {654 for (SVGElementInstance* instance = targetElementInstance->firstChild(); instance; instance = instance->nextSibling()) {655 if (SVGUseElement* use = instance->correspondingUseElement()) {656 if (use->cachedDocumentIsStillLoading())657 return true;658 }659 if (instance->hasChildNodes())660 instanceTreeIsLoading(instance);661 }662 return false;663 }664 665 650 void SVGUseElement::finishParsingChildren() 666 651 { -
trunk/Source/WebCore/svg/SVGUseElement.h
r179807 r179810 99 99 bool cachedDocumentIsStillLoading(); 100 100 Document* externalDocument() const; 101 bool instanceTreeIsLoading(SVGElementInstance*);102 101 virtual void notifyFinished(CachedResource*) override; 103 102 Document* referencedDocument() const; -
trunk/Tools/ChangeLog
r179793 r179810 1 2015-02-08 Darin Adler <darin@apple.com> 2 3 Remove the SVG instance tree 4 https://bugs.webkit.org/show_bug.cgi?id=140602 5 6 Reviewed by Dean Jackson. 7 8 * Scripts/check-for-global-initializers: Removed special case for 9 SVGElementInstance.o. 10 1 11 2015-02-07 David Kilzer <ddkilzer@apple.com> 2 12 -
trunk/Tools/Scripts/check-for-global-initializers
r165676 r179810 117 117 next if $shortName eq "Range.o"; 118 118 next if $shortName eq "RenderObject.o"; 119 next if $shortName eq "SVGElementInstance.o";120 119 next if $shortName eq "SubresourceLoader.o"; 121 120 next if $shortName eq "XMLHttpRequest.o";
Note: See TracChangeset
for help on using the changeset viewer.