Changeset 242978 in webkit
- Timestamp:
- Mar 14, 2019, 5:15:09 PM (7 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 27 edited
- 3 moved
-
ChangeLog (modified) (1 diff)
-
Sources.txt (modified) (1 diff)
-
WebCore.xcodeproj/project.pbxproj (modified) (11 diffs)
-
svg/SVGAngle.h (modified) (2 diffs)
-
svg/SVGAnimateElement.h (modified) (1 diff)
-
svg/SVGAnimatedTypeAnimator.h (modified) (3 diffs)
-
svg/SVGElement.h (modified) (1 diff)
-
svg/SVGLength.h (modified) (2 diffs)
-
svg/SVGMatrix.h (modified) (2 diffs)
-
svg/SVGNumber.h (modified) (2 diffs)
-
svg/SVGPathElement.cpp (modified) (1 diff)
-
svg/SVGPathElement.h (modified) (1 diff)
-
svg/SVGPathSegList.cpp (modified) (1 diff)
-
svg/SVGPathSegWithContext.h (modified) (1 diff)
-
svg/SVGPoint.h (modified) (2 diffs)
-
svg/SVGPreserveAspectRatio.h (modified) (2 diffs)
-
svg/SVGRect.h (modified) (2 diffs)
-
svg/SVGTransform.h (modified) (2 diffs)
-
svg/properties/SVGAnimatedListPropertyTearOff.h (modified) (4 diffs)
-
svg/properties/SVGAnimatedPropertyTearOff.h (modified) (3 diffs)
-
svg/properties/SVGAnimatedStaticPropertyTearOff.h (modified) (2 diffs)
-
svg/properties/SVGAttributeAccessor.h (modified) (8 diffs)
-
svg/properties/SVGAttributeOwnerProxy.h (modified) (2 diffs)
-
svg/properties/SVGAttributeOwnerProxyImpl.h (modified) (1 diff)
-
svg/properties/SVGAttributeRegistry.h (modified) (7 diffs)
-
svg/properties/SVGLegacyAnimatedProperty.cpp (moved) (moved from trunk/Source/WebCore/svg/properties/SVGAnimatedProperty.cpp ) (4 diffs)
-
svg/properties/SVGLegacyAnimatedProperty.h (moved) (moved from trunk/Source/WebCore/svg/properties/SVGAnimatedProperty.h ) (4 diffs)
-
svg/properties/SVGLegacyProperty.h (moved) (moved from trunk/Source/WebCore/svg/properties/SVGProperty.h ) (1 diff)
-
svg/properties/SVGListProperty.h (modified) (1 diff)
-
svg/properties/SVGPropertyTearOff.h (modified) (7 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r242977 r242978 1 2019-03-14 Said Abou-Hallawa <sabouhallawa@apple.com> 2 3 Rename SVGProperty to SVGLegacyProperty and rename SVGAnimatedProperty to SVGLegacyAnimatedProperty 4 https://bugs.webkit.org/show_bug.cgi?id=195767 5 6 Reviewed by Tim Horton. 7 8 This is a step towards removing the SVG properties tear off objects. 9 10 * Sources.txt: 11 * WebCore.xcodeproj/project.pbxproj: 12 * svg/SVGAngle.h: 13 (WebCore::SVGAngle::create): 14 (WebCore::SVGAngle::SVGAngle): 15 * svg/SVGAnimateElement.h: 16 * svg/SVGAnimatedTypeAnimator.h: 17 (WebCore::SVGAnimatedTypeAnimator::castAnimatedPropertyToActualType): 18 * svg/SVGElement.h: 19 (WebCore::SVGElement::lookupAnimatedProperty const): 20 (WebCore::SVGElement::lookupOrCreateAnimatedProperty): 21 (WebCore::SVGElement::lookupOrCreateAnimatedProperties): 22 * svg/SVGLength.h: 23 (WebCore::SVGLength::create): 24 (WebCore::SVGLength::SVGLength): 25 * svg/SVGMatrix.h: 26 (WebCore::SVGMatrix::create): 27 (WebCore::SVGMatrix::SVGMatrix): 28 * svg/SVGNumber.h: 29 (WebCore::SVGNumber::create): 30 (WebCore::SVGNumber::SVGNumber): 31 * svg/SVGPathElement.cpp: 32 (WebCore::SVGPathElement::lookupOrCreateDWrapper): 33 * svg/SVGPathElement.h: 34 * svg/SVGPathSegList.cpp: 35 (WebCore::SVGPathSegList::processIncomingListItemValue): 36 * svg/SVGPathSegWithContext.h: 37 (WebCore::SVGPathSegWithContext::animatedProperty const): 38 * svg/SVGPoint.h: 39 (WebCore::SVGPoint::create): 40 (WebCore::SVGPoint::SVGPoint): 41 * svg/SVGPreserveAspectRatio.h: 42 (WebCore::SVGPreserveAspectRatio::create): 43 (WebCore::SVGPreserveAspectRatio::SVGPreserveAspectRatio): 44 * svg/SVGRect.h: 45 (WebCore::SVGRect::create): 46 (WebCore::SVGRect::SVGRect): 47 * svg/SVGTransform.h: 48 (WebCore::SVGTransform::create): 49 (WebCore::SVGTransform::SVGTransform): 50 * svg/properties/SVGAnimatedListPropertyTearOff.h: 51 (WebCore::SVGAnimatedListPropertyTearOff::findItem): 52 (WebCore::SVGAnimatedListPropertyTearOff::SVGAnimatedListPropertyTearOff): 53 * svg/properties/SVGAnimatedProperty.cpp: Removed. 54 * svg/properties/SVGAnimatedProperty.h: Removed. 55 * svg/properties/SVGAnimatedPropertyTearOff.h: 56 * svg/properties/SVGAnimatedStaticPropertyTearOff.h: 57 (WebCore::SVGAnimatedStaticPropertyTearOff::SVGAnimatedStaticPropertyTearOff): 58 * svg/properties/SVGAttributeAccessor.h: 59 (WebCore::SVGAttributeAccessor::lookupOrCreateAnimatedProperty const): 60 (WebCore::SVGAttributeAccessor::lookupAnimatedProperty const): 61 (WebCore::SVGAttributeAccessor::lookupOrCreateAnimatedProperties const): 62 (WebCore::SVGAnimatedAttributeAccessor::lookupOrCreateAnimatedProperty): 63 (WebCore::SVGAnimatedAttributeAccessor::lookupAnimatedProperty): 64 * svg/properties/SVGAttributeOwnerProxy.h: 65 * svg/properties/SVGAttributeOwnerProxyImpl.h: 66 * svg/properties/SVGAttributeRegistry.h: 67 (WebCore::SVGAttributeRegistry::lookupOrCreateAnimatedProperty const): 68 (WebCore::SVGAttributeRegistry::lookupAnimatedProperty const): 69 (WebCore::SVGAttributeRegistry::lookupOrCreateAnimatedProperties const): 70 (WebCore::SVGAttributeRegistry::lookupOrCreateAnimatedPropertyBaseTypes): 71 (WebCore::SVGAttributeRegistry::lookupAnimatedPropertyBaseTypes): 72 (WebCore::SVGAttributeRegistry::lookupOrCreateAnimatedPropertiesBaseTypes): 73 * svg/properties/SVGLegacyAnimatedProperty.cpp: Copied from Source/WebCore/svg/properties/SVGAnimatedProperty.cpp. 74 (WebCore::SVGLegacyAnimatedProperty::SVGLegacyAnimatedProperty): 75 (WebCore::SVGLegacyAnimatedProperty::~SVGLegacyAnimatedProperty): 76 (WebCore::SVGLegacyAnimatedProperty::commitChange): 77 (WebCore::SVGAnimatedProperty::SVGAnimatedProperty): Deleted. 78 (WebCore::SVGAnimatedProperty::~SVGAnimatedProperty): Deleted. 79 (WebCore::SVGAnimatedProperty::commitChange): Deleted. 80 * svg/properties/SVGLegacyAnimatedProperty.h: Copied from Source/WebCore/svg/properties/SVGAnimatedProperty.h. 81 (WebCore::SVGLegacyAnimatedProperty::lookupOrCreateAnimatedProperty): 82 (WebCore::SVGLegacyAnimatedProperty::lookupAnimatedProperty): 83 (WebCore::SVGAnimatedProperty::isAnimating const): Deleted. 84 (WebCore::SVGAnimatedProperty::isAnimatedListTearOff const): Deleted. 85 (WebCore::SVGAnimatedProperty::contextElement const): Deleted. 86 (WebCore::SVGAnimatedProperty::attributeName const): Deleted. 87 (WebCore::SVGAnimatedProperty::animatedPropertyType const): Deleted. 88 (WebCore::SVGAnimatedProperty::isReadOnly const): Deleted. 89 (WebCore::SVGAnimatedProperty::setIsReadOnly): Deleted. 90 (WebCore::SVGAnimatedProperty::lookupOrCreateAnimatedProperty): Deleted. 91 (WebCore::SVGAnimatedProperty::lookupAnimatedProperty): Deleted. 92 (WebCore::SVGAnimatedProperty::animatedPropertyCache): Deleted. 93 * svg/properties/SVGLegacyProperty.h: Copied from Source/WebCore/svg/properties/SVGProperty.h. 94 * svg/properties/SVGListProperty.h: 95 * svg/properties/SVGProperty.h: Removed. 96 * svg/properties/SVGPropertyTearOff.h: 97 (WebCore::SVGPropertyTearOff::create): 98 (WebCore::SVGPropertyTearOff::animatedProperty const): 99 (WebCore::SVGPropertyTearOff::setAnimatedProperty): 100 (WebCore::SVGPropertyTearOff::SVGPropertyTearOff): 101 1 102 2019-03-14 Ryan Haddad <ryanhaddad@apple.com> 2 103 -
trunk/Source/WebCore/Sources.txt
r242974 r242978 2425 2425 2426 2426 svg/properties/SVGAnimatedPathSegListPropertyTearOff.cpp 2427 svg/properties/SVGAnimatedProperty.cpp2428 2427 svg/properties/SVGAttributeOwnerProxy.cpp 2428 svg/properties/SVGLegacyAnimatedProperty.cpp 2429 2429 2430 2430 workers/AbstractWorker.cpp -
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
r242974 r242978 276 276 088A0E08126EF1DB00978F7A /* SVGAnimatedPropertyTearOff.h in Headers */ = {isa = PBXBuildFile; fileRef = 088A0DFF126EF1DB00978F7A /* SVGAnimatedPropertyTearOff.h */; }; 277 277 088A0E09126EF1DB00978F7A /* SVGListPropertyTearOff.h in Headers */ = {isa = PBXBuildFile; fileRef = 088A0E00126EF1DB00978F7A /* SVGListPropertyTearOff.h */; }; 278 088A0E0A126EF1DB00978F7A /* SVGProperty.h in Headers */ = {isa = PBXBuildFile; fileRef = 088A0E01126EF1DB00978F7A /* SVGProperty.h */; settings = {ATTRIBUTES = (Private, ); }; };279 278 088A0E0B126EF1DB00978F7A /* SVGPropertyTearOff.h in Headers */ = {isa = PBXBuildFile; fileRef = 088A0E02126EF1DB00978F7A /* SVGPropertyTearOff.h */; }; 280 279 088A0E0C126EF1DB00978F7A /* SVGPropertyTraits.h in Headers */ = {isa = PBXBuildFile; fileRef = 088A0E03126EF1DB00978F7A /* SVGPropertyTraits.h */; settings = {ATTRIBUTES = (Private, ); }; }; … … 1790 1789 55A336F91D821E3C0022C4C7 /* ImageBackingStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 55A336F81D821E3C0022C4C7 /* ImageBackingStore.h */; settings = {ATTRIBUTES = (Private, ); }; }; 1791 1790 55AF14E61EAAC59B0026EEAA /* UTIRegistry.h in Headers */ = {isa = PBXBuildFile; fileRef = 55AF14E41EAAC59B0026EEAA /* UTIRegistry.h */; settings = {ATTRIBUTES = (Private, ); }; }; 1791 55D70D23223B017C00044B8E /* SVGLegacyAnimatedProperty.h in Headers */ = {isa = PBXBuildFile; fileRef = 55D70D20223B009100044B8E /* SVGLegacyAnimatedProperty.h */; settings = {ATTRIBUTES = (Private, ); }; }; 1792 1792 55EC9599206AA7A0007DD0A9 /* PaintFrequencyTracker.h in Headers */ = {isa = PBXBuildFile; fileRef = 55EC95972069C92D007DD0A9 /* PaintFrequencyTracker.h */; settings = {ATTRIBUTES = (Private, ); }; }; 1793 1793 55FA7FF0210FA386005AEFE7 /* SVGAttribute.h in Headers */ = {isa = PBXBuildFile; fileRef = 55FA7FEF210FA386005AEFE7 /* SVGAttribute.h */; settings = {ATTRIBUTES = (Private, ); }; }; … … 1796 1796 55FA7FFB2110ECD7005AEFE7 /* SVGZoomAndPanType.h in Headers */ = {isa = PBXBuildFile; fileRef = 55FA7FFA2110ECD7005AEFE7 /* SVGZoomAndPanType.h */; settings = {ATTRIBUTES = (Private, ); }; }; 1797 1797 55FA7FFF21110E6E005AEFE7 /* SVGAnimatedPropertyType.h in Headers */ = {isa = PBXBuildFile; fileRef = 55FA7FFE21110E6E005AEFE7 /* SVGAnimatedPropertyType.h */; settings = {ATTRIBUTES = (Private, ); }; }; 1798 55FA8001211113EE005AEFE7 /* SVGAnimatedProperty.h in Headers */ = {isa = PBXBuildFile; fileRef = 088A0DFC126EF1DB00978F7A /* SVGAnimatedProperty.h */; settings = {ATTRIBUTES = (Private, ); }; };1799 1798 5704405A1E53936200356601 /* JSAesCbcCfbParams.h in Headers */ = {isa = PBXBuildFile; fileRef = 570440591E53936200356601 /* JSAesCbcCfbParams.h */; }; 1800 1799 5706A6961DDE5C9500A03B14 /* CryptoAlgorithmRsaOaepParams.h in Headers */ = {isa = PBXBuildFile; fileRef = 5706A6951DDE5C9500A03B14 /* CryptoAlgorithmRsaOaepParams.h */; }; … … 5648 5647 0885067E11DA045B00182B98 /* PaintPhase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PaintPhase.h; sourceTree = "<group>"; }; 5649 5648 088A0DFB126EF1DB00978F7A /* SVGAnimatedListPropertyTearOff.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGAnimatedListPropertyTearOff.h; sourceTree = "<group>"; }; 5650 088A0DFC126EF1DB00978F7A /* SVGAnimatedProperty.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGAnimatedProperty.h; sourceTree = "<group>"; };5651 5649 088A0DFD126EF1DB00978F7A /* SVGAnimatedPropertyDescription.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGAnimatedPropertyDescription.h; sourceTree = "<group>"; }; 5652 5650 088A0DFF126EF1DB00978F7A /* SVGAnimatedPropertyTearOff.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGAnimatedPropertyTearOff.h; sourceTree = "<group>"; }; 5653 5651 088A0E00126EF1DB00978F7A /* SVGListPropertyTearOff.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGListPropertyTearOff.h; sourceTree = "<group>"; }; 5654 088A0E01126EF1DB00978F7A /* SVGProperty.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGProperty.h; sourceTree = "<group>"; };5655 5652 088A0E02126EF1DB00978F7A /* SVGPropertyTearOff.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGPropertyTearOff.h; sourceTree = "<group>"; }; 5656 5653 088A0E03126EF1DB00978F7A /* SVGPropertyTraits.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGPropertyTraits.h; sourceTree = "<group>"; }; … … 8674 8671 55AF14E41EAAC59B0026EEAA /* UTIRegistry.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UTIRegistry.h; sourceTree = "<group>"; }; 8675 8672 55D408F71A7C631800C78450 /* SVGImageClients.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGImageClients.h; sourceTree = "<group>"; }; 8673 55D70D20223B009100044B8E /* SVGLegacyAnimatedProperty.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGLegacyAnimatedProperty.h; sourceTree = "<group>"; }; 8674 55D70D21223B00BB00044B8E /* SVGLegacyAnimatedProperty.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = SVGLegacyAnimatedProperty.cpp; sourceTree = "<group>"; }; 8675 55D70D22223B00EA00044B8E /* SVGLegacyProperty.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGLegacyProperty.h; sourceTree = "<group>"; }; 8676 8676 55EC95972069C92D007DD0A9 /* PaintFrequencyTracker.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PaintFrequencyTracker.h; sourceTree = "<group>"; }; 8677 8677 55FA7FEF210FA386005AEFE7 /* SVGAttribute.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SVGAttribute.h; sourceTree = "<group>"; }; … … 10139 10139 836DAA051CEAB7CD00A2B707 /* RenderDescendantIterator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderDescendantIterator.h; sourceTree = "<group>"; }; 10140 10140 836FBCE9178C113200B21A15 /* SVGAnimatedTypeAnimator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGAnimatedTypeAnimator.cpp; sourceTree = "<group>"; }; 10141 836FBCEB178C117F00B21A15 /* SVGAnimatedProperty.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGAnimatedProperty.cpp; sourceTree = "<group>"; };10142 10141 837056881F50915000D93425 /* JSFileCallback.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSFileCallback.cpp; sourceTree = "<group>"; }; 10143 10142 837056891F50915000D93425 /* JSFileSystemEntryCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSFileSystemEntryCallback.h; sourceTree = "<group>"; }; … … 16180 16179 55FA7FFC2110F813005AEFE7 /* SVGAnimatedPathSegListPropertyTearOff.cpp */, 16181 16180 089A8E06128D8B3D00E7A534 /* SVGAnimatedPathSegListPropertyTearOff.h */, 16182 836FBCEB178C117F00B21A15 /* SVGAnimatedProperty.cpp */,16183 088A0DFC126EF1DB00978F7A /* SVGAnimatedProperty.h */,16184 16181 088A0DFD126EF1DB00978F7A /* SVGAnimatedPropertyDescription.h */, 16185 16182 088A0DFF126EF1DB00978F7A /* SVGAnimatedPropertyTearOff.h */, … … 16193 16190 55346AFA2117FFAF0059BCDD /* SVGAttributeOwnerProxyImpl.h */, 16194 16191 55FA7FF6210FBE3E005AEFE7 /* SVGAttributeRegistry.h */, 16192 55D70D21223B00BB00044B8E /* SVGLegacyAnimatedProperty.cpp */, 16193 55D70D20223B009100044B8E /* SVGLegacyAnimatedProperty.h */, 16194 55D70D22223B00EA00044B8E /* SVGLegacyProperty.h */, 16195 16195 0810764312828556007C63BA /* SVGListProperty.h */, 16196 16196 088A0E00126EF1DB00978F7A /* SVGListPropertyTearOff.h */, 16197 16197 08CA3D4312894A3800FFF260 /* SVGMatrixTearOff.h */, 16198 088A0E01126EF1DB00978F7A /* SVGProperty.h */,16199 16198 088A0E02126EF1DB00978F7A /* SVGPropertyTearOff.h */, 16200 16199 088A0E03126EF1DB00978F7A /* SVGPropertyTraits.h */, … … 31862 31861 43B9336913B261B1004584BF /* SVGAnimatedPointList.h in Headers */, 31863 31862 08FE0BC5127E2AC1000C4FB5 /* SVGAnimatedPreserveAspectRatio.h in Headers */, 31864 55FA8001211113EE005AEFE7 /* SVGAnimatedProperty.h in Headers */,31865 31863 088A0E06126EF1DB00978F7A /* SVGAnimatedPropertyDescription.h in Headers */, 31866 31864 088A0E08126EF1DB00978F7A /* SVGAnimatedPropertyTearOff.h in Headers */, … … 31951 31949 0854B0211255E4E600B9CDD0 /* SVGInlineTextBox.h in Headers */, 31952 31950 B2227A300D00BF220071B782 /* SVGLangSpace.h in Headers */, 31951 55D70D23223B017C00044B8E /* SVGLegacyAnimatedProperty.h in Headers */, 31953 31952 7134496E146941B300720312 /* SVGLengthContext.h in Headers */, 31954 31953 B2227A360D00BF220071B782 /* SVGLengthList.h in Headers */, … … 32024 32023 B2227A940D00BF220071B782 /* SVGPolylineElement.h in Headers */, 32025 32024 B2227A970D00BF220071B782 /* SVGPreserveAspectRatio.h in Headers */, 32026 088A0E0A126EF1DB00978F7A /* SVGProperty.h in Headers */,32027 32025 088A0E0B126EF1DB00978F7A /* SVGPropertyTearOff.h in Headers */, 32028 32026 088A0E0C126EF1DB00978F7A /* SVGPropertyTraits.h in Headers */, -
trunk/Source/WebCore/svg/SVGAngle.h
r228721 r242978 33 33 class SVGAngle : public SVGPropertyTearOff<SVGAngleValue> { 34 34 public: 35 static Ref<SVGAngle> create(SVG AnimatedProperty& animatedProperty, SVGPropertyRole role, SVGAngleValue& value)35 static Ref<SVGAngle> create(SVGLegacyAnimatedProperty& animatedProperty, SVGPropertyRole role, SVGAngleValue& value) 36 36 { 37 37 return adoptRef(*new SVGAngle(animatedProperty, role, value)); … … 132 132 133 133 private: 134 SVGAngle(SVG AnimatedProperty& animatedProperty, SVGPropertyRole role, SVGAngleValue& value)134 SVGAngle(SVGLegacyAnimatedProperty& animatedProperty, SVGPropertyRole role, SVGAngleValue& value) 135 135 : SVGPropertyTearOff<SVGAngleValue>(&animatedProperty, role, value) 136 136 { -
trunk/Source/WebCore/svg/SVGAnimateElement.h
r229694 r242978 30 30 namespace WebCore { 31 31 32 class SVG AnimatedProperty;32 class SVGLegacyAnimatedProperty; 33 33 34 34 class SVGAnimateElement final : public SVGAnimateElementBase { -
trunk/Source/WebCore/svg/SVGAnimatedTypeAnimator.h
r229417 r242978 22 22 #pragma once 23 23 24 #include "SVGAnimatedProperty.h"25 24 #include "SVGAnimatedType.h" 25 #include "SVGLegacyAnimatedProperty.h" 26 26 #include <wtf/StdLibExtras.h> 27 27 … … 30 30 struct SVGElementAnimatedProperties { 31 31 SVGElement* element; 32 Vector<RefPtr<SVG AnimatedProperty>> properties;32 Vector<RefPtr<SVGLegacyAnimatedProperty>> properties; 33 33 }; 34 34 typedef Vector<SVGElementAnimatedProperties> SVGElementAnimatedPropertyList; … … 167 167 168 168 template<typename AnimValType> 169 AnimValType* castAnimatedPropertyToActualType(SVG AnimatedProperty* property)169 AnimValType* castAnimatedPropertyToActualType(SVGLegacyAnimatedProperty* property) 170 170 { 171 171 ASSERT(property); -
trunk/Source/WebCore/svg/SVGElement.h
r239427 r242978 147 147 void synchronizeAttributes() { attributeOwnerProxy().synchronizeAttributes(); } 148 148 Vector<AnimatedPropertyType> animatedTypes(const QualifiedName& attributeName) const { return attributeOwnerProxy().animatedTypes(attributeName); } 149 RefPtr<SVG AnimatedProperty> lookupAnimatedProperty(const SVGAttribute& attribute) const { return attributeOwnerProxy().lookupAnimatedProperty(attribute); }150 RefPtr<SVG AnimatedProperty> lookupOrCreateAnimatedProperty(const SVGAttribute& attribute) { return attributeOwnerProxy().lookupOrCreateAnimatedProperty(attribute); }151 Vector<RefPtr<SVG AnimatedProperty>> lookupOrCreateAnimatedProperties(const QualifiedName& name) { return attributeOwnerProxy().lookupOrCreateAnimatedProperties(name); }149 RefPtr<SVGLegacyAnimatedProperty> lookupAnimatedProperty(const SVGAttribute& attribute) const { return attributeOwnerProxy().lookupAnimatedProperty(attribute); } 150 RefPtr<SVGLegacyAnimatedProperty> lookupOrCreateAnimatedProperty(const SVGAttribute& attribute) { return attributeOwnerProxy().lookupOrCreateAnimatedProperty(attribute); } 151 Vector<RefPtr<SVGLegacyAnimatedProperty>> lookupOrCreateAnimatedProperties(const QualifiedName& name) { return attributeOwnerProxy().lookupOrCreateAnimatedProperties(name); } 152 152 153 153 // These are needed for the RenderTree, animation and DOM. -
trunk/Source/WebCore/svg/SVGLength.h
r228721 r242978 48 48 }; 49 49 50 static Ref<SVGLength> create(SVG AnimatedProperty& animatedProperty, SVGPropertyRole role, SVGLengthValue& value)50 static Ref<SVGLength> create(SVGLegacyAnimatedProperty& animatedProperty, SVGPropertyRole role, SVGLengthValue& value) 51 51 { 52 52 return adoptRef(*new SVGLength(animatedProperty, role, value)); … … 149 149 150 150 private: 151 SVGLength(SVG AnimatedProperty& animatedProperty, SVGPropertyRole role, SVGLengthValue& value)151 SVGLength(SVGLegacyAnimatedProperty& animatedProperty, SVGPropertyRole role, SVGLengthValue& value) 152 152 : SVGPropertyTearOff<SVGLengthValue>(&animatedProperty, role, value) 153 153 { -
trunk/Source/WebCore/svg/SVGMatrix.h
r228721 r242978 34 34 class SVGMatrix : public SVGPropertyTearOff<SVGMatrixValue> { 35 35 public: 36 static Ref<SVGMatrix> create(SVG AnimatedProperty& animatedProperty, SVGPropertyRole role, SVGMatrixValue& value)36 static Ref<SVGMatrix> create(SVGLegacyAnimatedProperty& animatedProperty, SVGPropertyRole role, SVGMatrixValue& value) 37 37 { 38 38 return adoptRef(*new SVGMatrix(animatedProperty, role, value)); … … 273 273 274 274 protected: 275 SVGMatrix(SVG AnimatedProperty& animatedProperty, SVGPropertyRole role, SVGMatrixValue& value)275 SVGMatrix(SVGLegacyAnimatedProperty& animatedProperty, SVGPropertyRole role, SVGMatrixValue& value) 276 276 : SVGPropertyTearOff<SVGMatrixValue>(&animatedProperty, role, value) 277 277 { -
trunk/Source/WebCore/svg/SVGNumber.h
r228721 r242978 32 32 class SVGNumber : public SVGPropertyTearOff<float> { 33 33 public: 34 static Ref<SVGNumber> create(SVG AnimatedProperty& animatedProperty, SVGPropertyRole role, float& value)34 static Ref<SVGNumber> create(SVGLegacyAnimatedProperty& animatedProperty, SVGPropertyRole role, float& value) 35 35 { 36 36 return adoptRef(*new SVGNumber(animatedProperty, role, value)); … … 66 66 67 67 private: 68 SVGNumber(SVG AnimatedProperty& animatedProperty, SVGPropertyRole role, float& value)68 SVGNumber(SVGLegacyAnimatedProperty& animatedProperty, SVGPropertyRole role, float& value) 69 69 : SVGPropertyTearOff<float>(&animatedProperty, role, value) 70 70 { -
trunk/Source/WebCore/svg/SVGPathElement.cpp
r240237 r242978 284 284 } 285 285 286 RefPtr<SVG AnimatedProperty> SVGPathElement::lookupOrCreateDWrapper()286 RefPtr<SVGLegacyAnimatedProperty> SVGPathElement::lookupOrCreateDWrapper() 287 287 { 288 288 return m_pathSegList.animatedProperty(attributeOwnerProxy()); -
trunk/Source/WebCore/svg/SVGPathElement.h
r239427 r242978 121 121 bool isValid() const final { return SVGTests::isValid(); } 122 122 bool supportsMarkers() const final { return true; } 123 RefPtr<SVG AnimatedProperty> lookupOrCreateDWrapper();123 RefPtr<SVGLegacyAnimatedProperty> lookupOrCreateDWrapper(); 124 124 125 125 RenderPtr<RenderElement> createElementRenderer(RenderStyle&&, const RenderTreePosition&) final; -
trunk/Source/WebCore/svg/SVGPathSegList.cpp
r242515 r242978 68 68 { 69 69 SVGPathSegWithContext* newItemWithContext = static_cast<SVGPathSegWithContext*>(newItem.get()); 70 RefPtr<SVG AnimatedProperty> animatedPropertyOfItem = newItemWithContext->animatedProperty();70 RefPtr<SVGLegacyAnimatedProperty> animatedPropertyOfItem = newItemWithContext->animatedProperty(); 71 71 72 72 // Alter the role, after calling animatedProperty(), as that may influence the returned animated property. -
trunk/Source/WebCore/svg/SVGPathSegWithContext.h
r234620 r242978 32 32 } 33 33 34 RefPtr<SVG AnimatedProperty> animatedProperty() const34 RefPtr<SVGLegacyAnimatedProperty> animatedProperty() const 35 35 { 36 36 if (!m_element) -
trunk/Source/WebCore/svg/SVGPoint.h
r228721 r242978 35 35 class SVGPoint : public SVGPropertyTearOff<FloatPoint> { 36 36 public: 37 static Ref<SVGPoint> create(SVG AnimatedProperty& animatedProperty, SVGPropertyRole role, FloatPoint& value)37 static Ref<SVGPoint> create(SVGLegacyAnimatedProperty& animatedProperty, SVGPropertyRole role, FloatPoint& value) 38 38 { 39 39 return adoptRef(*new SVGPoint(animatedProperty, role, value)); … … 96 96 97 97 protected: 98 SVGPoint(SVG AnimatedProperty& animatedProperty, SVGPropertyRole role, FloatPoint& value)98 SVGPoint(SVGLegacyAnimatedProperty& animatedProperty, SVGPropertyRole role, FloatPoint& value) 99 99 : SVGPropertyTearOff<FloatPoint>(&animatedProperty, role, value) 100 100 { -
trunk/Source/WebCore/svg/SVGPreserveAspectRatio.h
r228721 r242978 33 33 class SVGPreserveAspectRatio : public SVGPropertyTearOff<SVGPreserveAspectRatioValue> { 34 34 public: 35 static Ref<SVGPreserveAspectRatio> create(SVG AnimatedProperty& animatedProperty, SVGPropertyRole role, SVGPreserveAspectRatioValue& value)35 static Ref<SVGPreserveAspectRatio> create(SVGLegacyAnimatedProperty& animatedProperty, SVGPropertyRole role, SVGPreserveAspectRatioValue& value) 36 36 { 37 37 return adoptRef(*new SVGPreserveAspectRatio(animatedProperty, role, value)); … … 87 87 88 88 private: 89 SVGPreserveAspectRatio(SVG AnimatedProperty& animatedProperty, SVGPropertyRole role, SVGPreserveAspectRatioValue& value)89 SVGPreserveAspectRatio(SVGLegacyAnimatedProperty& animatedProperty, SVGPropertyRole role, SVGPreserveAspectRatioValue& value) 90 90 : SVGPropertyTearOff<SVGPreserveAspectRatioValue>(&animatedProperty, role, value) 91 91 { -
trunk/Source/WebCore/svg/SVGRect.h
r228721 r242978 28 28 class SVGRect : public SVGPropertyTearOff<FloatRect> { 29 29 public: 30 static Ref<SVGRect> create(SVG AnimatedProperty& animatedProperty, SVGPropertyRole role, FloatRect& value)30 static Ref<SVGRect> create(SVGLegacyAnimatedProperty& animatedProperty, SVGPropertyRole role, FloatRect& value) 31 31 { 32 32 return adoptRef(*new SVGRect(animatedProperty, role, value)); … … 110 110 111 111 private: 112 SVGRect(SVG AnimatedProperty& animatedProperty, SVGPropertyRole role, FloatRect& value)112 SVGRect(SVGLegacyAnimatedProperty& animatedProperty, SVGPropertyRole role, FloatRect& value) 113 113 : SVGPropertyTearOff<FloatRect>(&animatedProperty, role, value) 114 114 { -
trunk/Source/WebCore/svg/SVGTransform.h
r228721 r242978 34 34 class SVGTransform : public SVGPropertyTearOff<SVGTransformValue> { 35 35 public: 36 static Ref<SVGTransform> create(SVG AnimatedProperty& animatedProperty, SVGPropertyRole role, SVGTransformValue& value)36 static Ref<SVGTransform> create(SVGLegacyAnimatedProperty& animatedProperty, SVGPropertyRole role, SVGTransformValue& value) 37 37 { 38 38 return adoptRef(*new SVGTransform(animatedProperty, role, value)); … … 130 130 131 131 private: 132 SVGTransform(SVG AnimatedProperty& animatedProperty, SVGPropertyRole role, SVGTransformValue& value)132 SVGTransform(SVGLegacyAnimatedProperty& animatedProperty, SVGPropertyRole role, SVGTransformValue& value) 133 133 : SVGPropertyTearOff<SVGTransformValue>(&animatedProperty, role, value) 134 134 { -
trunk/Source/WebCore/svg/properties/SVGAnimatedListPropertyTearOff.h
r232613 r242978 21 21 #pragma once 22 22 23 #include "SVG AnimatedProperty.h"23 #include "SVGLegacyAnimatedProperty.h" 24 24 #include "SVGListPropertyTearOff.h" 25 25 #include "SVGStaticListPropertyTearOff.h" … … 31 31 32 32 template<typename PropertyType> 33 class SVGAnimatedListPropertyTearOff : public SVG AnimatedProperty {33 class SVGAnimatedListPropertyTearOff : public SVGLegacyAnimatedProperty { 34 34 public: 35 35 using ListItemType = typename SVGPropertyTraits<PropertyType>::ListItemType; … … 69 69 bool isAnimatedListTearOff() const override { return true; } 70 70 71 int findItem(SVG Property* property)71 int findItem(SVGLegacyProperty* property) 72 72 { 73 73 // This should ever be called for our baseVal, as animVal can't modify the list. … … 163 163 protected: 164 164 SVGAnimatedListPropertyTearOff(SVGElement* contextElement, const QualifiedName& attributeName, AnimatedPropertyType animatedPropertyType, PropertyType& values) 165 : SVG AnimatedProperty(contextElement, attributeName, animatedPropertyType)165 : SVGLegacyAnimatedProperty(contextElement, attributeName, animatedPropertyType) 166 166 , m_values(values) 167 167 { -
trunk/Source/WebCore/svg/properties/SVGAnimatedPropertyTearOff.h
r232613 r242978 21 21 #pragma once 22 22 23 #include "SVG AnimatedProperty.h"23 #include "SVGLegacyAnimatedProperty.h" 24 24 #include "SVGPropertyTearOff.h" 25 25 … … 27 27 28 28 template<typename T> 29 class SVGAnimatedPropertyTearOff final : public SVG AnimatedProperty {29 class SVGAnimatedPropertyTearOff final : public SVGLegacyAnimatedProperty { 30 30 public: 31 31 using PropertyTearOff = T; … … 106 106 private: 107 107 SVGAnimatedPropertyTearOff(SVGElement* contextElement, const QualifiedName& attributeName, AnimatedPropertyType animatedPropertyType, PropertyType& property) 108 : SVG AnimatedProperty(contextElement, attributeName, animatedPropertyType)108 : SVGLegacyAnimatedProperty(contextElement, attributeName, animatedPropertyType) 109 109 , m_property(property) 110 110 { -
trunk/Source/WebCore/svg/properties/SVGAnimatedStaticPropertyTearOff.h
r226065 r242978 22 22 23 23 #include "ExceptionOr.h" 24 #include "SVG AnimatedProperty.h"24 #include "SVGLegacyAnimatedProperty.h" 25 25 26 26 namespace WebCore { 27 27 28 28 template<typename PropertyType> 29 class SVGAnimatedStaticPropertyTearOff : public SVG AnimatedProperty {29 class SVGAnimatedStaticPropertyTearOff : public SVGLegacyAnimatedProperty { 30 30 public: 31 31 typedef PropertyType ContentType; … … 101 101 protected: 102 102 SVGAnimatedStaticPropertyTearOff(SVGElement* contextElement, const QualifiedName& attributeName, AnimatedPropertyType animatedPropertyType, PropertyType& property) 103 : SVG AnimatedProperty(contextElement, attributeName, animatedPropertyType)103 : SVGLegacyAnimatedProperty(contextElement, attributeName, animatedPropertyType) 104 104 , m_property(property) 105 105 , m_animatedProperty(nullptr) -
trunk/Source/WebCore/svg/properties/SVGAttributeAccessor.h
r234620 r242978 28 28 #include "Element.h" 29 29 #include "QualifiedName.h" 30 #include "SVGAnimatedProperty.h"31 30 #include "SVGAnimatedPropertyType.h" 32 31 #include "SVGAttribute.h" 32 #include "SVGLegacyAnimatedProperty.h" 33 33 #include "SVGLengthValue.h" 34 34 #include "SVGNames.h" … … 59 59 virtual Vector<AnimatedPropertyType> animatedTypes() const { return { animatedType() }; } 60 60 61 virtual RefPtr<SVG AnimatedProperty> lookupOrCreateAnimatedProperty(OwnerType&, SVGElement&, const SVGAttribute&, AnimatedPropertyState) const { return nullptr; };62 virtual RefPtr<SVG AnimatedProperty> lookupAnimatedProperty(const OwnerType&, const SVGElement&, const SVGAttribute&) const { return nullptr; };63 virtual Vector<RefPtr<SVG AnimatedProperty>> lookupOrCreateAnimatedProperties(OwnerType&, SVGElement&, AnimatedPropertyState) const { return { }; }61 virtual RefPtr<SVGLegacyAnimatedProperty> lookupOrCreateAnimatedProperty(OwnerType&, SVGElement&, const SVGAttribute&, AnimatedPropertyState) const { return nullptr; }; 62 virtual RefPtr<SVGLegacyAnimatedProperty> lookupAnimatedProperty(const OwnerType&, const SVGElement&, const SVGAttribute&) const { return nullptr; }; 63 virtual Vector<RefPtr<SVGLegacyAnimatedProperty>> lookupOrCreateAnimatedProperties(OwnerType&, SVGElement&, AnimatedPropertyState) const { return { }; } 64 64 65 65 protected: … … 137 137 protected: 138 138 template<typename PropertyTearOff = PropertyTearOffType, typename Property = PropertyType, AnimatedPropertyType animatedType = type> 139 static RefPtr<SVG AnimatedProperty> lookupOrCreateAnimatedProperty(SVGElement& element, const QualifiedName& attributeName, const AtomicString& identifier, Property& property, AnimatedPropertyState animatedState)140 { 141 return SVG AnimatedProperty::lookupOrCreateAnimatedProperty<PropertyTearOff, Property, animatedType>(element, attributeName, identifier, property, animatedState);142 } 143 144 static RefPtr<SVG AnimatedProperty> lookupAnimatedProperty(const SVGElement& element, const AtomicString& identifier)145 { 146 return SVG AnimatedProperty::lookupAnimatedProperty(element, identifier);139 static RefPtr<SVGLegacyAnimatedProperty> lookupOrCreateAnimatedProperty(SVGElement& element, const QualifiedName& attributeName, const AtomicString& identifier, Property& property, AnimatedPropertyState animatedState) 140 { 141 return SVGLegacyAnimatedProperty::lookupOrCreateAnimatedProperty<PropertyTearOff, Property, animatedType>(element, attributeName, identifier, property, animatedState); 142 } 143 144 static RefPtr<SVGLegacyAnimatedProperty> lookupAnimatedProperty(const SVGElement& element, const AtomicString& identifier) 145 { 146 return SVGLegacyAnimatedProperty::lookupAnimatedProperty(element, identifier); 147 147 } 148 148 … … 150 150 AnimatedPropertyType animatedType() const override { return type; } 151 151 152 RefPtr<SVG AnimatedProperty> lookupOrCreateAnimatedProperty(OwnerType& owner, SVGElement& element, const SVGAttribute& attribute, AnimatedPropertyState animatedState) const override152 RefPtr<SVGLegacyAnimatedProperty> lookupOrCreateAnimatedProperty(OwnerType& owner, SVGElement& element, const SVGAttribute& attribute, AnimatedPropertyState animatedState) const override 153 153 { 154 154 ASSERT_UNUSED(attribute, isMatched(owner, attribute)); … … 156 156 } 157 157 158 RefPtr<SVG AnimatedProperty> lookupAnimatedProperty(const OwnerType&, const SVGElement& element, const SVGAttribute&) const override158 RefPtr<SVGLegacyAnimatedProperty> lookupAnimatedProperty(const OwnerType&, const SVGElement& element, const SVGAttribute&) const override 159 159 { 160 160 return lookupAnimatedProperty(element, m_identifier); 161 161 } 162 162 163 Vector<RefPtr<SVG AnimatedProperty>> lookupOrCreateAnimatedProperties(OwnerType& owner, SVGElement& element, AnimatedPropertyState animatedState) const override163 Vector<RefPtr<SVGLegacyAnimatedProperty>> lookupOrCreateAnimatedProperties(OwnerType& owner, SVGElement& element, AnimatedPropertyState animatedState) const override 164 164 { 165 165 return { lookupOrCreateAnimatedProperty(element, m_attributeName, m_identifier, attribute(owner).value(), animatedState) }; … … 215 215 Vector<AnimatedPropertyType> animatedTypes() const override { return { type, secondType }; } 216 216 217 RefPtr<SVG AnimatedProperty> lookupOrCreateAnimatedProperty(OwnerType& owner, SVGElement& element, const SVGAttribute& attribute, AnimatedPropertyState animatedState) const override217 RefPtr<SVGLegacyAnimatedProperty> lookupOrCreateAnimatedProperty(OwnerType& owner, SVGElement& element, const SVGAttribute& attribute, AnimatedPropertyState animatedState) const override 218 218 { 219 219 if (Base::isMatched(owner, attribute)) … … 223 223 } 224 224 225 RefPtr<SVG AnimatedProperty> lookupAnimatedProperty(const OwnerType& owner, const SVGElement& element, const SVGAttribute& attribute) const override225 RefPtr<SVGLegacyAnimatedProperty> lookupAnimatedProperty(const OwnerType& owner, const SVGElement& element, const SVGAttribute& attribute) const override 226 226 { 227 227 if (Base::isMatched(owner, attribute)) … … 231 231 } 232 232 233 Vector<RefPtr<SVG AnimatedProperty>> lookupOrCreateAnimatedProperties(OwnerType& owner, SVGElement& element, AnimatedPropertyState animatedState) const override233 Vector<RefPtr<SVGLegacyAnimatedProperty>> lookupOrCreateAnimatedProperties(OwnerType& owner, SVGElement& element, AnimatedPropertyState animatedState) const override 234 234 { 235 235 return { -
trunk/Source/WebCore/svg/properties/SVGAttributeOwnerProxy.h
r239070 r242978 31 31 namespace WebCore { 32 32 33 class SVGAnimatedProperty;34 33 class SVGAttribute; 35 34 class SVGElement; 35 class SVGLegacyAnimatedProperty; 36 36 37 37 class SVGAttributeOwnerProxy { … … 48 48 virtual Vector<AnimatedPropertyType> animatedTypes(const QualifiedName&) const = 0; 49 49 50 virtual RefPtr<SVG AnimatedProperty> lookupOrCreateAnimatedProperty(const SVGAttribute&) const = 0;51 virtual RefPtr<SVG AnimatedProperty> lookupAnimatedProperty(const SVGAttribute&) const = 0;52 virtual Vector<RefPtr<SVG AnimatedProperty>> lookupOrCreateAnimatedProperties(const QualifiedName&) const = 0;50 virtual RefPtr<SVGLegacyAnimatedProperty> lookupOrCreateAnimatedProperty(const SVGAttribute&) const = 0; 51 virtual RefPtr<SVGLegacyAnimatedProperty> lookupAnimatedProperty(const SVGAttribute&) const = 0; 52 virtual Vector<RefPtr<SVGLegacyAnimatedProperty>> lookupOrCreateAnimatedProperties(const QualifiedName&) const = 0; 53 53 54 54 protected: -
trunk/Source/WebCore/svg/properties/SVGAttributeOwnerProxyImpl.h
r239070 r242978 82 82 } 83 83 84 RefPtr<SVG AnimatedProperty> lookupOrCreateAnimatedProperty(const SVGAttribute& attribute) const override84 RefPtr<SVGLegacyAnimatedProperty> lookupOrCreateAnimatedProperty(const SVGAttribute& attribute) const override 85 85 { 86 86 return attributeRegistry().lookupOrCreateAnimatedProperty(m_owner, *m_element, attribute, m_animatedState); 87 87 } 88 88 89 RefPtr<SVG AnimatedProperty> lookupAnimatedProperty(const SVGAttribute& attribute) const override89 RefPtr<SVGLegacyAnimatedProperty> lookupAnimatedProperty(const SVGAttribute& attribute) const override 90 90 { 91 91 return attributeRegistry().lookupAnimatedProperty(m_owner, *m_element, attribute); 92 92 } 93 93 94 Vector<RefPtr<SVG AnimatedProperty>> lookupOrCreateAnimatedProperties(const QualifiedName& attributeName) const override94 Vector<RefPtr<SVGLegacyAnimatedProperty>> lookupOrCreateAnimatedProperties(const QualifiedName& attributeName) const override 95 95 { 96 96 return attributeRegistry().lookupOrCreateAnimatedProperties(m_owner, *m_element, attributeName, m_animatedState); -
trunk/Source/WebCore/svg/properties/SVGAttributeRegistry.h
r234620 r242978 35 35 #include "SVGAnimatedPointList.h" 36 36 #include "SVGAnimatedPreserveAspectRatio.h" 37 #include "SVGAnimatedProperty.h"38 37 #include "SVGAnimatedRect.h" 39 38 #include "SVGAnimatedString.h" 40 39 #include "SVGAnimatedTransformList.h" 41 40 #include "SVGAttributeAccessor.h" 41 #include "SVGLegacyAnimatedProperty.h" 42 42 #include "SVGStringListValues.h" 43 43 #include "SVGZoomAndPanType.h" … … 202 202 } 203 203 204 RefPtr<SVG AnimatedProperty> lookupOrCreateAnimatedProperty(OwnerType& owner, SVGElement& element, const SVGAttribute& attribute, AnimatedPropertyState animatedState) const204 RefPtr<SVGLegacyAnimatedProperty> lookupOrCreateAnimatedProperty(OwnerType& owner, SVGElement& element, const SVGAttribute& attribute, AnimatedPropertyState animatedState) const 205 205 { 206 206 if (const auto* attributeAccessor = findAttributeAccessor(owner, attribute)) … … 209 209 } 210 210 211 RefPtr<SVG AnimatedProperty> lookupAnimatedProperty(const OwnerType& owner, const SVGElement& element, const SVGAttribute& attribute) const211 RefPtr<SVGLegacyAnimatedProperty> lookupAnimatedProperty(const OwnerType& owner, const SVGElement& element, const SVGAttribute& attribute) const 212 212 { 213 213 if (const auto* attributeAccessor = findAttributeAccessor(owner, attribute)) … … 216 216 } 217 217 218 Vector<RefPtr<SVG AnimatedProperty>> lookupOrCreateAnimatedProperties(OwnerType& owner, SVGElement& element, const QualifiedName& attributeName, AnimatedPropertyState animatedState) const218 Vector<RefPtr<SVGLegacyAnimatedProperty>> lookupOrCreateAnimatedProperties(OwnerType& owner, SVGElement& element, const QualifiedName& attributeName, AnimatedPropertyState animatedState) const 219 219 { 220 220 if (const auto* attributeAccessor = findAttributeAccessor(attributeName)) … … 275 275 276 276 template<size_t I = 0> 277 static typename std::enable_if<I == sizeof...(BaseTypes), RefPtr<SVG AnimatedProperty>>::type lookupOrCreateAnimatedPropertyBaseTypes(OwnerType&, SVGElement&, const SVGAttribute&, AnimatedPropertyState) { return nullptr; }278 279 template<size_t I = 0> 280 static typename std::enable_if<I < sizeof...(BaseTypes), RefPtr<SVG AnimatedProperty>>::type lookupOrCreateAnimatedPropertyBaseTypes(OwnerType& owner, SVGElement& element, const SVGAttribute& attribute, AnimatedPropertyState animatedState)277 static typename std::enable_if<I == sizeof...(BaseTypes), RefPtr<SVGLegacyAnimatedProperty>>::type lookupOrCreateAnimatedPropertyBaseTypes(OwnerType&, SVGElement&, const SVGAttribute&, AnimatedPropertyState) { return nullptr; } 278 279 template<size_t I = 0> 280 static typename std::enable_if<I < sizeof...(BaseTypes), RefPtr<SVGLegacyAnimatedProperty>>::type lookupOrCreateAnimatedPropertyBaseTypes(OwnerType& owner, SVGElement& element, const SVGAttribute& attribute, AnimatedPropertyState animatedState) 281 281 { 282 282 using BaseType = typename std::tuple_element<I, typename std::tuple<BaseTypes...>>::type; … … 287 287 288 288 template<size_t I = 0> 289 static typename std::enable_if<I == sizeof...(BaseTypes), RefPtr<SVG AnimatedProperty>>::type lookupAnimatedPropertyBaseTypes(const OwnerType&, const SVGElement&, const SVGAttribute&) { return nullptr; }290 291 template<size_t I = 0> 292 static typename std::enable_if<I < sizeof...(BaseTypes), RefPtr<SVG AnimatedProperty>>::type lookupAnimatedPropertyBaseTypes(const OwnerType& owner, const SVGElement& element, const SVGAttribute& attribute)289 static typename std::enable_if<I == sizeof...(BaseTypes), RefPtr<SVGLegacyAnimatedProperty>>::type lookupAnimatedPropertyBaseTypes(const OwnerType&, const SVGElement&, const SVGAttribute&) { return nullptr; } 290 291 template<size_t I = 0> 292 static typename std::enable_if<I < sizeof...(BaseTypes), RefPtr<SVGLegacyAnimatedProperty>>::type lookupAnimatedPropertyBaseTypes(const OwnerType& owner, const SVGElement& element, const SVGAttribute& attribute) 293 293 { 294 294 using BaseType = typename std::tuple_element<I, typename std::tuple<BaseTypes...>>::type; … … 299 299 300 300 template<size_t I = 0> 301 static typename std::enable_if<I == sizeof...(BaseTypes), Vector<RefPtr<SVG AnimatedProperty>>>::type lookupOrCreateAnimatedPropertiesBaseTypes(OwnerType&, SVGElement&, const QualifiedName&, AnimatedPropertyState) { return { }; }302 303 template<size_t I = 0> 304 static typename std::enable_if<I < sizeof...(BaseTypes), Vector<RefPtr<SVG AnimatedProperty>>>::type lookupOrCreateAnimatedPropertiesBaseTypes(OwnerType& owner, SVGElement& element, const QualifiedName& attributeName, AnimatedPropertyState animatedState)301 static typename std::enable_if<I == sizeof...(BaseTypes), Vector<RefPtr<SVGLegacyAnimatedProperty>>>::type lookupOrCreateAnimatedPropertiesBaseTypes(OwnerType&, SVGElement&, const QualifiedName&, AnimatedPropertyState) { return { }; } 302 303 template<size_t I = 0> 304 static typename std::enable_if<I < sizeof...(BaseTypes), Vector<RefPtr<SVGLegacyAnimatedProperty>>>::type lookupOrCreateAnimatedPropertiesBaseTypes(OwnerType& owner, SVGElement& element, const QualifiedName& attributeName, AnimatedPropertyState animatedState) 305 305 { 306 306 using BaseType = typename std::tuple_element<I, typename std::tuple<BaseTypes...>>::type; -
trunk/Source/WebCore/svg/properties/SVGLegacyAnimatedProperty.cpp
r242977 r242978 21 21 22 22 #include "config.h" 23 #include "SVG AnimatedProperty.h"23 #include "SVGLegacyAnimatedProperty.h" 24 24 25 25 #include "SVGElement.h" … … 27 27 namespace WebCore { 28 28 29 SVG AnimatedProperty::SVGAnimatedProperty(SVGElement* contextElement, const QualifiedName& attributeName, AnimatedPropertyType animatedPropertyType)29 SVGLegacyAnimatedProperty::SVGLegacyAnimatedProperty(SVGElement* contextElement, const QualifiedName& attributeName, AnimatedPropertyType animatedPropertyType) 30 30 : m_contextElement(contextElement) 31 31 , m_attributeName(attributeName) … … 34 34 } 35 35 36 SVG AnimatedProperty::~SVGAnimatedProperty()36 SVGLegacyAnimatedProperty::~SVGLegacyAnimatedProperty() 37 37 { 38 38 // Assure that animationEnded() was called, if animationStarted() was called before. … … 50 50 } 51 51 52 void SVG AnimatedProperty::commitChange()52 void SVGLegacyAnimatedProperty::commitChange() 53 53 { 54 54 ASSERT(m_contextElement); -
trunk/Source/WebCore/svg/properties/SVGLegacyAnimatedProperty.h
r242977 r242978 30 30 31 31 class SVGElement; 32 class SVG Property;32 class SVGLegacyProperty; 33 33 34 class SVG AnimatedProperty : public RefCounted<SVGAnimatedProperty> {34 class SVGLegacyAnimatedProperty : public RefCounted<SVGLegacyAnimatedProperty> { 35 35 public: 36 virtual ~SVG AnimatedProperty();36 virtual ~SVGLegacyAnimatedProperty(); 37 37 virtual bool isAnimating() const { return false; } 38 38 virtual bool isAnimatedListTearOff() const { return false; } … … 47 47 48 48 template<typename TearOffType, typename PropertyType, AnimatedPropertyType animatedType> 49 static RefPtr<SVG AnimatedProperty> lookupOrCreateAnimatedProperty(SVGElement& element, const QualifiedName& attributeName, const AtomicString& identifier, PropertyType& property, AnimatedPropertyState animatedState)49 static RefPtr<SVGLegacyAnimatedProperty> lookupOrCreateAnimatedProperty(SVGElement& element, const QualifiedName& attributeName, const AtomicString& identifier, PropertyType& property, AnimatedPropertyState animatedState) 50 50 { 51 51 SVGAnimatedPropertyDescription key(&element, identifier); … … 62 62 // between SVGAnimatedProperty and SVGElement once the property pointer is not needed. 63 63 result.iterator->value = wrapper.ptr(); 64 return static_reference_cast<SVG AnimatedProperty>(wrapper);64 return static_reference_cast<SVGLegacyAnimatedProperty>(wrapper); 65 65 } 66 66 67 static RefPtr<SVG AnimatedProperty> lookupAnimatedProperty(const SVGElement& element, const AtomicString& identifier)67 static RefPtr<SVGLegacyAnimatedProperty> lookupAnimatedProperty(const SVGElement& element, const AtomicString& identifier) 68 68 { 69 69 SVGAnimatedPropertyDescription key(const_cast<SVGElement*>(&element), identifier); … … 72 72 73 73 protected: 74 SVG AnimatedProperty(SVGElement*, const QualifiedName&, AnimatedPropertyType);74 SVGLegacyAnimatedProperty(SVGElement*, const QualifiedName&, AnimatedPropertyType); 75 75 76 76 private: 77 77 // Caching facilities. 78 using Cache = HashMap<SVGAnimatedPropertyDescription, SVG AnimatedProperty*, SVGAnimatedPropertyDescriptionHash, SVGAnimatedPropertyDescriptionHashTraits>;78 using Cache = HashMap<SVGAnimatedPropertyDescription, SVGLegacyAnimatedProperty*, SVGAnimatedPropertyDescriptionHash, SVGAnimatedPropertyDescriptionHashTraits>; 79 79 static Cache& animatedPropertyCache() 80 80 { -
trunk/Source/WebCore/svg/properties/SVGLegacyProperty.h
r242977 r242978 30 30 }; 31 31 32 class SVG Property : public RefCounted<SVGProperty> {32 class SVGLegacyProperty : public RefCounted<SVGLegacyProperty> { 33 33 public: 34 virtual ~SVG Property() = default;34 virtual ~SVGLegacyProperty() = default; 35 35 36 36 virtual bool isReadOnly() const = 0; -
trunk/Source/WebCore/svg/properties/SVGListProperty.h
r232613 r242978 38 38 39 39 template<typename PropertyType> 40 class SVGListProperty : public SVG Property, public CanMakeWeakPtr<SVGListProperty<PropertyType>> {40 class SVGListProperty : public SVGLegacyProperty, public CanMakeWeakPtr<SVGListProperty<PropertyType>> { 41 41 public: 42 42 typedef SVGListProperty<PropertyType> Self; -
trunk/Source/WebCore/svg/properties/SVGPropertyTearOff.h
r232613 r242978 22 22 23 23 #include "ExceptionOr.h" 24 #include "SVG AnimatedProperty.h"25 #include "SVG Property.h"24 #include "SVGLegacyAnimatedProperty.h" 25 #include "SVGLegacyProperty.h" 26 26 #include <wtf/WeakPtr.h> 27 27 … … 30 30 class SVGElement; 31 31 32 class SVGPropertyTearOffBase : public SVG Property {32 class SVGPropertyTearOffBase : public SVGLegacyProperty { 33 33 public: 34 34 virtual void detachWrapper() = 0; … … 43 43 // Used for child types (baseVal/animVal) of a SVGAnimated* property (for example: SVGAnimatedLength::baseVal()). 44 44 // Also used for list tear offs (for example: text.x.baseVal.getItem(0)). 45 static Ref<Self> create(SVG AnimatedProperty& animatedProperty, SVGPropertyRole role, PropertyType& value)45 static Ref<Self> create(SVGLegacyAnimatedProperty& animatedProperty, SVGPropertyRole role, PropertyType& value) 46 46 { 47 47 return adoptRef(*new Self(animatedProperty, role, value)); … … 62 62 63 63 virtual PropertyType& propertyReference() { return *m_value; } 64 SVG AnimatedProperty* animatedProperty() const { return m_animatedProperty.get(); }64 SVGLegacyAnimatedProperty* animatedProperty() const { return m_animatedProperty.get(); } 65 65 66 66 virtual void setValue(PropertyType& value) … … 74 74 } 75 75 76 void setAnimatedProperty(SVG AnimatedProperty* animatedProperty)76 void setAnimatedProperty(SVGLegacyAnimatedProperty* animatedProperty) 77 77 { 78 78 m_animatedProperty = animatedProperty; … … 127 127 128 128 protected: 129 SVGPropertyTearOff(SVG AnimatedProperty* animatedProperty, SVGPropertyRole role, PropertyType& value)129 SVGPropertyTearOff(SVGLegacyAnimatedProperty* animatedProperty, SVGPropertyRole role, PropertyType& value) 130 130 : m_animatedProperty(animatedProperty) 131 131 , m_role(role) … … 165 165 } 166 166 167 RefPtr<SVG AnimatedProperty> m_animatedProperty;167 RefPtr<SVGLegacyAnimatedProperty> m_animatedProperty; 168 168 SVGPropertyRole m_role; 169 169 PropertyType* m_value;
Note:
See TracChangeset
for help on using the changeset viewer.