Diff
Modified: trunk/LayoutTests/ChangeLog (152542 => 152543)
--- trunk/LayoutTests/ChangeLog 2013-07-10 20:31:41 UTC (rev 152542)
+++ trunk/LayoutTests/ChangeLog 2013-07-10 20:40:00 UTC (rev 152543)
@@ -1,3 +1,20 @@
+2013-07-10 Christophe Dumez <[email protected]>
+
+ Remove ElementTimeControl and expose SVGAnimationElement
+ https://bugs.webkit.org/show_bug.cgi?id=118349
+
+ Reviewed by Rob Buis.
+
+ Rebaseline several test cases now that SVGAnimationElement is exposed
+ on the global Window object.
+
+ * fast/js/global-constructors-attributes-expected.txt:
+ * platform/efl/fast/js/global-constructors-attributes-expected.txt:
+ * platform/gtk/fast/js/global-constructors-attributes-expected.txt:
+ * platform/mac-lion/fast/js/global-constructors-attributes-expected.txt:
+ * platform/qt/fast/js/global-constructors-attributes-expected.txt:
+ * svg/custom/global-constructors-expected.txt:
+
2013-07-09 Roger Fong <[email protected]>
HTMLPluginElement's state should be Playing before firing mouse click event.
Modified: trunk/LayoutTests/fast/js/global-constructors-attributes-expected.txt (152542 => 152543)
--- trunk/LayoutTests/fast/js/global-constructors-attributes-expected.txt 2013-07-10 20:31:41 UTC (rev 152542)
+++ trunk/LayoutTests/fast/js/global-constructors-attributes-expected.txt 2013-07-10 20:40:00 UTC (rev 152543)
@@ -1068,6 +1068,11 @@
PASS Object.getOwnPropertyDescriptor(global, 'SVGAnimatedTransformList').hasOwnProperty('set') is false
PASS Object.getOwnPropertyDescriptor(global, 'SVGAnimatedTransformList').enumerable is false
PASS Object.getOwnPropertyDescriptor(global, 'SVGAnimatedTransformList').configurable is true
+PASS Object.getOwnPropertyDescriptor(global, 'SVGAnimationElement').value is SVGAnimationElement
+PASS Object.getOwnPropertyDescriptor(global, 'SVGAnimationElement').hasOwnProperty('get') is false
+PASS Object.getOwnPropertyDescriptor(global, 'SVGAnimationElement').hasOwnProperty('set') is false
+PASS Object.getOwnPropertyDescriptor(global, 'SVGAnimationElement').enumerable is false
+PASS Object.getOwnPropertyDescriptor(global, 'SVGAnimationElement').configurable is true
PASS Object.getOwnPropertyDescriptor(global, 'SVGCircleElement').value is SVGCircleElement
PASS Object.getOwnPropertyDescriptor(global, 'SVGCircleElement').hasOwnProperty('get') is false
PASS Object.getOwnPropertyDescriptor(global, 'SVGCircleElement').hasOwnProperty('set') is false
Modified: trunk/LayoutTests/platform/efl/fast/js/global-constructors-attributes-expected.txt (152542 => 152543)
--- trunk/LayoutTests/platform/efl/fast/js/global-constructors-attributes-expected.txt 2013-07-10 20:31:41 UTC (rev 152542)
+++ trunk/LayoutTests/platform/efl/fast/js/global-constructors-attributes-expected.txt 2013-07-10 20:40:00 UTC (rev 152543)
@@ -1153,6 +1153,11 @@
PASS Object.getOwnPropertyDescriptor(global, 'SVGAnimatedTransformList').hasOwnProperty('set') is false
PASS Object.getOwnPropertyDescriptor(global, 'SVGAnimatedTransformList').enumerable is false
PASS Object.getOwnPropertyDescriptor(global, 'SVGAnimatedTransformList').configurable is true
+PASS Object.getOwnPropertyDescriptor(global, 'SVGAnimationElement').value is SVGAnimationElement
+PASS Object.getOwnPropertyDescriptor(global, 'SVGAnimationElement').hasOwnProperty('get') is false
+PASS Object.getOwnPropertyDescriptor(global, 'SVGAnimationElement').hasOwnProperty('set') is false
+PASS Object.getOwnPropertyDescriptor(global, 'SVGAnimationElement').enumerable is false
+PASS Object.getOwnPropertyDescriptor(global, 'SVGAnimationElement').configurable is true
PASS Object.getOwnPropertyDescriptor(global, 'SVGCircleElement').value is SVGCircleElement
PASS Object.getOwnPropertyDescriptor(global, 'SVGCircleElement').hasOwnProperty('get') is false
PASS Object.getOwnPropertyDescriptor(global, 'SVGCircleElement').hasOwnProperty('set') is false
Modified: trunk/LayoutTests/platform/gtk/fast/js/global-constructors-attributes-expected.txt (152542 => 152543)
--- trunk/LayoutTests/platform/gtk/fast/js/global-constructors-attributes-expected.txt 2013-07-10 20:31:41 UTC (rev 152542)
+++ trunk/LayoutTests/platform/gtk/fast/js/global-constructors-attributes-expected.txt 2013-07-10 20:40:00 UTC (rev 152543)
@@ -1168,6 +1168,11 @@
PASS Object.getOwnPropertyDescriptor(global, 'SVGAnimatedTransformList').hasOwnProperty('set') is false
PASS Object.getOwnPropertyDescriptor(global, 'SVGAnimatedTransformList').enumerable is false
PASS Object.getOwnPropertyDescriptor(global, 'SVGAnimatedTransformList').configurable is true
+PASS Object.getOwnPropertyDescriptor(global, 'SVGAnimationElement').value is SVGAnimationElement
+PASS Object.getOwnPropertyDescriptor(global, 'SVGAnimationElement').hasOwnProperty('get') is false
+PASS Object.getOwnPropertyDescriptor(global, 'SVGAnimationElement').hasOwnProperty('set') is false
+PASS Object.getOwnPropertyDescriptor(global, 'SVGAnimationElement').enumerable is false
+PASS Object.getOwnPropertyDescriptor(global, 'SVGAnimationElement').configurable is true
PASS Object.getOwnPropertyDescriptor(global, 'SVGCircleElement').value is SVGCircleElement
PASS Object.getOwnPropertyDescriptor(global, 'SVGCircleElement').hasOwnProperty('get') is false
PASS Object.getOwnPropertyDescriptor(global, 'SVGCircleElement').hasOwnProperty('set') is false
Modified: trunk/LayoutTests/platform/mac-lion/fast/js/global-constructors-attributes-expected.txt (152542 => 152543)
--- trunk/LayoutTests/platform/mac-lion/fast/js/global-constructors-attributes-expected.txt 2013-07-10 20:31:41 UTC (rev 152542)
+++ trunk/LayoutTests/platform/mac-lion/fast/js/global-constructors-attributes-expected.txt 2013-07-10 20:40:00 UTC (rev 152543)
@@ -1063,6 +1063,11 @@
PASS Object.getOwnPropertyDescriptor(global, 'SVGAnimatedTransformList').hasOwnProperty('set') is false
PASS Object.getOwnPropertyDescriptor(global, 'SVGAnimatedTransformList').enumerable is false
PASS Object.getOwnPropertyDescriptor(global, 'SVGAnimatedTransformList').configurable is true
+PASS Object.getOwnPropertyDescriptor(global, 'SVGAnimationElement').value is SVGAnimationElement
+PASS Object.getOwnPropertyDescriptor(global, 'SVGAnimationElement').hasOwnProperty('get') is false
+PASS Object.getOwnPropertyDescriptor(global, 'SVGAnimationElement').hasOwnProperty('set') is false
+PASS Object.getOwnPropertyDescriptor(global, 'SVGAnimationElement').enumerable is false
+PASS Object.getOwnPropertyDescriptor(global, 'SVGAnimationElement').configurable is true
PASS Object.getOwnPropertyDescriptor(global, 'SVGCircleElement').value is SVGCircleElement
PASS Object.getOwnPropertyDescriptor(global, 'SVGCircleElement').hasOwnProperty('get') is false
PASS Object.getOwnPropertyDescriptor(global, 'SVGCircleElement').hasOwnProperty('set') is false
Modified: trunk/LayoutTests/platform/qt/fast/js/global-constructors-attributes-expected.txt (152542 => 152543)
--- trunk/LayoutTests/platform/qt/fast/js/global-constructors-attributes-expected.txt 2013-07-10 20:31:41 UTC (rev 152542)
+++ trunk/LayoutTests/platform/qt/fast/js/global-constructors-attributes-expected.txt 2013-07-10 20:40:00 UTC (rev 152543)
@@ -998,6 +998,11 @@
PASS Object.getOwnPropertyDescriptor(global, 'SVGAnimatedTransformList').hasOwnProperty('set') is false
PASS Object.getOwnPropertyDescriptor(global, 'SVGAnimatedTransformList').enumerable is false
PASS Object.getOwnPropertyDescriptor(global, 'SVGAnimatedTransformList').configurable is true
+PASS Object.getOwnPropertyDescriptor(global, 'SVGAnimationElement').value is SVGAnimationElement
+PASS Object.getOwnPropertyDescriptor(global, 'SVGAnimationElement').hasOwnProperty('get') is false
+PASS Object.getOwnPropertyDescriptor(global, 'SVGAnimationElement').hasOwnProperty('set') is false
+PASS Object.getOwnPropertyDescriptor(global, 'SVGAnimationElement').enumerable is false
+PASS Object.getOwnPropertyDescriptor(global, 'SVGAnimationElement').configurable is true
PASS Object.getOwnPropertyDescriptor(global, 'SVGCircleElement').value is SVGCircleElement
PASS Object.getOwnPropertyDescriptor(global, 'SVGCircleElement').hasOwnProperty('get') is false
PASS Object.getOwnPropertyDescriptor(global, 'SVGCircleElement').hasOwnProperty('set') is false
Modified: trunk/LayoutTests/svg/custom/global-constructors-expected.txt (152542 => 152543)
--- trunk/LayoutTests/svg/custom/global-constructors-expected.txt 2013-07-10 20:31:41 UTC (rev 152542)
+++ trunk/LayoutTests/svg/custom/global-constructors-expected.txt 2013-07-10 20:40:00 UTC (rev 152543)
@@ -137,7 +137,7 @@
PASS SVGScriptElement.toString() is '[object SVGScriptElementConstructor]'
FAIL SVGEvent.toString() should be [object SVGEventConstructor]. Threw exception ReferenceError: Can't find variable: SVGEvent
PASS SVGZoomEvent.toString() is '[object SVGZoomEventConstructor]'
-FAIL SVGAnimationElement.toString() should be [object SVGAnimationElementConstructor]. Threw exception ReferenceError: Can't find variable: SVGAnimationElement
+PASS SVGAnimationElement.toString() is '[object SVGAnimationElementConstructor]'
PASS SVGAnimateElement.toString() is '[object SVGAnimateElementConstructor]'
PASS SVGSetElement.toString() is '[object SVGSetElementConstructor]'
PASS SVGAnimateMotionElement.toString() is '[object SVGAnimateMotionElementConstructor]'
Modified: trunk/Source/WebCore/ChangeLog (152542 => 152543)
--- trunk/Source/WebCore/ChangeLog 2013-07-10 20:31:41 UTC (rev 152542)
+++ trunk/Source/WebCore/ChangeLog 2013-07-10 20:40:00 UTC (rev 152543)
@@ -1,3 +1,34 @@
+2013-07-10 Christophe Dumez <[email protected]>
+
+ Remove ElementTimeControl and expose SVGAnimationElement
+ https://bugs.webkit.org/show_bug.cgi?id=118349
+
+ Reviewed by Rob Buis.
+
+ Remove ElementTimeControl IDL interface and move its attributes
+ to the SVGAnimationElement IDL interface as per the latest SVG2
+ specification:
+ https://svgwg.org/svg2-draft/animate.html#InterfaceSVGAnimationElement
+
+ Also remove [NoInterfaceObject] IDL extended attribute from
+ SVGAnimationElement as it is not present in the specification.
+
+ This is one step towards removing IDL multiple inheritance in SVG and
+ complying with the latest SVG2 specification.
+
+ No new tests, covered by existing test cases.
+
+ * DerivedSources.make:
+ * GNUmakefile.list.am:
+ * WebCore.vcxproj/WebCore.vcxproj:
+ * WebCore.vcxproj/WebCore.vcxproj.filters:
+ * WebCore.xcodeproj/project.pbxproj:
+ * bindings/scripts/CodeGeneratorObjC.pm:
+ * svg/ElementTimeControl.h: Removed.
+ * svg/ElementTimeControl.idl: Removed.
+ * svg/SVGAnimationElement.h:
+ * svg/SVGAnimationElement.idl:
+
2013-07-10 Arnaud Renevier <[email protected]>
Web Inspector: "Always enable" profiling does not work
Modified: trunk/Source/WebCore/DerivedSources.make (152542 => 152543)
--- trunk/Source/WebCore/DerivedSources.make 2013-07-10 20:31:41 UTC (rev 152542)
+++ trunk/Source/WebCore/DerivedSources.make 2013-07-10 20:40:00 UTC (rev 152543)
@@ -472,7 +472,6 @@
$(WebCore)/plugins/DOMPluginArray.idl \
$(WebCore)/storage/Storage.idl \
$(WebCore)/storage/StorageEvent.idl \
- $(WebCore)/svg/ElementTimeControl.idl \
$(WebCore)/svg/SVGAElement.idl \
$(WebCore)/svg/SVGAltGlyphDefElement.idl \
$(WebCore)/svg/SVGAltGlyphElement.idl \
Modified: trunk/Source/WebCore/GNUmakefile.list.am (152542 => 152543)
--- trunk/Source/WebCore/GNUmakefile.list.am 2013-07-10 20:31:41 UTC (rev 152542)
+++ trunk/Source/WebCore/GNUmakefile.list.am 2013-07-10 20:40:00 UTC (rev 152543)
@@ -230,7 +230,6 @@
DerivedSources/WebCore/JSDynamicsCompressorNode.cpp \
DerivedSources/WebCore/JSElement.cpp \
DerivedSources/WebCore/JSElement.h \
- DerivedSources/WebCore/JSElementTimeControl.h \
DerivedSources/WebCore/JSEntity.cpp \
DerivedSources/WebCore/JSEntity.h \
DerivedSources/WebCore/JSEntityReference.cpp \
@@ -4976,7 +4975,6 @@
Source/WebCore/svg/animation/SVGSMILElement.h \
Source/WebCore/svg/ColorDistance.cpp \
Source/WebCore/svg/ColorDistance.h \
- Source/WebCore/svg/ElementTimeControl.h \
Source/WebCore/svg/GradientAttributes.h \
Source/WebCore/svg/graphics/filters/SVGFEImage.cpp \
Source/WebCore/svg/graphics/filters/SVGFEImage.h \
Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (152542 => 152543)
--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2013-07-10 20:31:41 UTC (rev 152542)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2013-07-10 20:40:00 UTC (rev 152543)
@@ -13307,7 +13307,6 @@
<ClInclude Include="..\plugins\PluginView.h" />
<ClInclude Include="..\plugins\win\PluginMessageThrottlerWin.h" />
<ClInclude Include="..\svg\ColorDistance.h" />
- <ClInclude Include="..\svg\ElementTimeControl.h" />
<ClInclude Include="..\svg\SVGAElement.h" />
<ClInclude Include="..\svg\SVGAltGlyphDefElement.h" />
<ClInclude Include="..\svg\SVGAltGlyphElement.h" />
@@ -13924,4 +13923,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (152542 => 152543)
--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2013-07-10 20:31:41 UTC (rev 152542)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2013-07-10 20:40:00 UTC (rev 152543)
@@ -11745,9 +11745,6 @@
<ClInclude Include="..\svg\ColorDistance.h">
<Filter>rendering\svg</Filter>
</ClInclude>
- <ClInclude Include="..\svg\ElementTimeControl.h">
- <Filter>rendering\svg</Filter>
- </ClInclude>
<ClInclude Include="..\svg\SVGAElement.h">
<Filter>rendering\svg</Filter>
</ClInclude>
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (152542 => 152543)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2013-07-10 20:31:41 UTC (rev 152542)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2013-07-10 20:40:00 UTC (rev 152543)
@@ -5467,7 +5467,6 @@
E1F1E8300C3C2BB9006DB391 /* XSLTExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = E1F1E82E0C3C2BB9006DB391 /* XSLTExtensions.h */; };
E1FF57A30F01255B00891EBB /* ThreadGlobalData.h in Headers */ = {isa = PBXBuildFile; fileRef = E1FF57A20F01255B00891EBB /* ThreadGlobalData.h */; settings = {ATTRIBUTES = (Private, ); }; };
E1FF57A60F01256B00891EBB /* ThreadGlobalData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1FF57A50F01256B00891EBB /* ThreadGlobalData.cpp */; };
- E415F1840D9A1A830033CE97 /* ElementTimeControl.h in Headers */ = {isa = PBXBuildFile; fileRef = E415F1830D9A1A830033CE97 /* ElementTimeControl.h */; };
E4295FA412B0614E00D1ACE0 /* ResourceLoadPriority.h in Headers */ = {isa = PBXBuildFile; fileRef = E4295FA312B0614E00D1ACE0 /* ResourceLoadPriority.h */; settings = {ATTRIBUTES = (Private, ); }; };
E43105B816750F0C00DB2FB8 /* NodeTraversal.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E43105B716750F0C00DB2FB8 /* NodeTraversal.cpp */; };
E43105BB16750F1600DB2FB8 /* NodeTraversal.h in Headers */ = {isa = PBXBuildFile; fileRef = E43105BA16750F1600DB2FB8 /* NodeTraversal.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -12268,8 +12267,6 @@
E1FF57A20F01255B00891EBB /* ThreadGlobalData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThreadGlobalData.h; sourceTree = "<group>"; };
E1FF57A50F01256B00891EBB /* ThreadGlobalData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ThreadGlobalData.cpp; sourceTree = "<group>"; };
E406F3FB1198307D009D59D6 /* ColorData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ColorData.cpp; sourceTree = "<group>"; };
- E415F10C0D9A05870033CE97 /* ElementTimeControl.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ElementTimeControl.idl; sourceTree = "<group>"; };
- E415F1830D9A1A830033CE97 /* ElementTimeControl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ElementTimeControl.h; sourceTree = "<group>"; };
E41EA038119836DB00710BC5 /* CSSPropertyNames.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSPropertyNames.cpp; sourceTree = "<group>"; };
E41EA0391198374900710BC5 /* CSSValueKeywords.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSValueKeywords.cpp; sourceTree = "<group>"; };
E4295FA312B0614E00D1ACE0 /* ResourceLoadPriority.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResourceLoadPriority.h; sourceTree = "<group>"; };
@@ -17717,8 +17714,6 @@
081CDFBD126ECFE800D215CA /* properties */,
B22277CB0D00BF1F0071B782 /* ColorDistance.cpp */,
B22277CC0D00BF1F0071B782 /* ColorDistance.h */,
- E415F1830D9A1A830033CE97 /* ElementTimeControl.h */,
- E415F10C0D9A05870033CE97 /* ElementTimeControl.idl */,
B22277CD0D00BF1F0071B782 /* GradientAttributes.h */,
B22277CE0D00BF1F0071B782 /* LinearGradientAttributes.h */,
B22277DB0D00BF1F0071B782 /* PatternAttributes.h */,
@@ -21707,7 +21702,6 @@
63F5D4F70E8C4B7100C0BD04 /* ElementRareData.h in Headers */,
FBDB619F16D6036500BB3394 /* ElementRuleCollector.h in Headers */,
57CF4C8714F7597A00ECFF14 /* ElementShadow.h in Headers */,
- E415F1840D9A1A830033CE97 /* ElementTimeControl.h in Headers */,
A8CFF6BE0A156118000A4234 /* EllipsisBox.h in Headers */,
F55B3DBC1251F12D003EF269 /* EmailInputType.h in Headers */,
B25599A50D00D8BA00BB825C /* EmptyClients.h in Headers */,
Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorObjC.pm (152542 => 152543)
--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorObjC.pm 2013-07-10 20:31:41 UTC (rev 152542)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorObjC.pm 2013-07-10 20:40:00 UTC (rev 152543)
@@ -57,7 +57,7 @@
my %protocolTypeHash = ("XPathNSResolver" => 1, "EventListener" => 1, "EventTarget" => 1, "NodeFilter" => 1,
"SVGFilterPrimitiveStandardAttributes" => 1,
"SVGTests" => 1, "SVGLangSpace" => 1, "SVGExternalResourcesRequired" => 1, "SVGURIReference" => 1,
- "SVGZoomAndPan" => 1, "SVGFitToViewBox" => 1, "SVGAnimatedPathData" => 1, "ElementTimeControl" => 1);
+ "SVGZoomAndPan" => 1, "SVGFitToViewBox" => 1, "SVGAnimatedPathData" => 1);
my %nativeObjCTypeHash = ("URL" => 1, "Color" => 1);
# FIXME: this should be replaced with a function that recurses up the tree
Deleted: trunk/Source/WebCore/svg/ElementTimeControl.h (152542 => 152543)
--- trunk/Source/WebCore/svg/ElementTimeControl.h 2013-07-10 20:31:41 UTC (rev 152542)
+++ trunk/Source/WebCore/svg/ElementTimeControl.h 2013-07-10 20:40:00 UTC (rev 152543)
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2008 Apple Inc. All rights reserved.
- * Copyright (C) 2009 Cameron McCormack <[email protected]>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef ElementTimeControl_h
-#define ElementTimeControl_h
-
-#if ENABLE(SVG)
-
-namespace WebCore {
-
-class ElementTimeControl {
-public:
- virtual ~ElementTimeControl() {}
- virtual void beginElement() = 0;
- virtual void beginElementAt(float offset) = 0;
- virtual void endElement() = 0;
- virtual void endElementAt(float offset) = 0;
-};
-
-}
-
-#endif
-
-#endif
Deleted: trunk/Source/WebCore/svg/ElementTimeControl.idl (152542 => 152543)
--- trunk/Source/WebCore/svg/ElementTimeControl.idl 2013-07-10 20:31:41 UTC (rev 152542)
+++ trunk/Source/WebCore/svg/ElementTimeControl.idl 2013-07-10 20:40:00 UTC (rev 152543)
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2008 Apple Inc. All rights reserved.
- * Copyright (C) 2009 Cameron McCormack <[email protected]>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-[
- NoInterfaceObject,
- Conditional=SVG,
- ObjCProtocol,
-] interface ElementTimeControl {
- void beginElement();
- void beginElementAt([Default=Undefined] optional float offset);
- void endElement();
- void endElementAt([Default=Undefined] optional float offset);
-};
-
Modified: trunk/Source/WebCore/svg/SVGAnimationElement.h (152542 => 152543)
--- trunk/Source/WebCore/svg/SVGAnimationElement.h 2013-07-10 20:31:41 UTC (rev 152542)
+++ trunk/Source/WebCore/svg/SVGAnimationElement.h 2013-07-10 20:40:00 UTC (rev 152543)
@@ -26,7 +26,6 @@
#define SVGAnimationElement_h
#if ENABLE(SVG)
-#include "ElementTimeControl.h"
#include "SMILTime.h"
#include "SVGAnimatedBoolean.h"
#include "SVGExternalResourcesRequired.h"
@@ -68,19 +67,17 @@
class SVGAnimationElement : public SVGSMILElement,
public SVGTests,
- public SVGExternalResourcesRequired,
- public ElementTimeControl {
+ public SVGExternalResourcesRequired {
public:
// SVGAnimationElement
float getStartTime() const;
float getCurrentTime() const;
float getSimpleDuration(ExceptionCode&) const;
- // ElementTimeControl
- virtual void beginElement();
- virtual void beginElementAt(float offset);
- virtual void endElement();
- virtual void endElementAt(float offset);
+ void beginElement();
+ void beginElementAt(float offset);
+ void endElement();
+ void endElementAt(float offset);
static bool isTargetAttributeCSSProperty(SVGElement*, const QualifiedName&);
Modified: trunk/Source/WebCore/svg/SVGAnimationElement.idl (152542 => 152543)
--- trunk/Source/WebCore/svg/SVGAnimationElement.idl 2013-07-10 20:31:41 UTC (rev 152542)
+++ trunk/Source/WebCore/svg/SVGAnimationElement.idl 2013-07-10 20:40:00 UTC (rev 152543)
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2006 Apple Inc. All rights reserved.
+ * Copyright (C) 2006, 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2009 Cameron McCormack <[email protected]>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -24,15 +25,18 @@
*/
[
- NoInterfaceObject,
- Conditional=SVG,
-] interface SVGAnimationElement : SVGElement,
- ElementTimeControl {
+ Conditional=SVG
+] interface SVGAnimationElement : SVGElement {
readonly attribute SVGElement targetElement;
float getStartTime();
float getCurrentTime();
[RaisesException] float getSimpleDuration();
+
+ void beginElement();
+ void beginElementAt([Default=Undefined] optional float offset);
+ void endElement();
+ void endElementAt([Default=Undefined] optional float offset);
};
SVGAnimationElement implements SVGExternalResourcesRequired;
