Attachment 346538 Details for Bug 186751 – Remove SVG macros from SVGAnimationElement

[patch] Remove SVG macros from SVGAnimationElement

186751-87.patch (text/plain), 4.78 KB, created by Said Abou-Hallawa on 2018-08-03 12:47:18 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Said Abou-Hallawa

Created: 2018-08-03 12:47:18 PDT

Size: 4.78 KB

patch

obsolete

>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 1453c7ab9a5..d6fd5a4243f 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,20 @@
>+2018-08-02  Said Abou-Hallawa  <sabouhallawa@apple.com>
>+
>+        [87] Remove the SVG elements' attributes macros
>+        https://bugs.webkit.org/show_bug.cgi?id=186751
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Remove SVG macros from SVGAnimationElement.
>+
>+        * svg/SVGAnimationElement.cpp:
>+        (WebCore::SVGAnimationElement::SVGAnimationElement):
>+        (WebCore::SVGAnimationElement::requiredFeatures): Deleted.
>+        (WebCore::SVGAnimationElement::requiredExtensions): Deleted.
>+        (WebCore::SVGAnimationElement::systemLanguage): Deleted.
>+        * svg/SVGAnimationElement.h:
>+        (WebCore::SVGAnimationElement::attributeRegistry):
>+
> 2018-08-02  Said Abou-Hallawa  <sabouhallawa@apple.com>
> 
>         [86] Remove the SVG elements' attributes macros
>diff --git a/Source/WebCore/svg/SVGAnimationElement.cpp b/Source/WebCore/svg/SVGAnimationElement.cpp
>index 0f91cd2e793..0441efb994d 100644
>--- a/Source/WebCore/svg/SVGAnimationElement.cpp
>+++ b/Source/WebCore/svg/SVGAnimationElement.cpp
>@@ -47,18 +47,11 @@ namespace WebCore {
> 
> WTF_MAKE_ISO_ALLOCATED_IMPL(SVGAnimationElement);
> 
>-// Animated property definitions
>-DEFINE_ANIMATED_BOOLEAN(SVGAnimationElement, SVGNames::externalResourcesRequiredAttr, ExternalResourcesRequired, externalResourcesRequired)
>-
>-BEGIN_REGISTER_ANIMATED_PROPERTIES(SVGAnimationElement)
>-    REGISTER_LOCAL_ANIMATED_PROPERTY(externalResourcesRequired)
>-    REGISTER_PARENT_ANIMATED_PROPERTIES(SVGTests)
>-END_REGISTER_ANIMATED_PROPERTIES
>-
> SVGAnimationElement::SVGAnimationElement(const QualifiedName& tagName, Document& document)
>     : SVGSMILElement(tagName, document)
>+    , SVGTests(*this)
>+    , SVGExternalResourcesRequired(*this)
> {
>-    registerAnimatedPropertiesForSVGAnimationElement();
> }
> 
> static void parseKeyTimes(const String& parse, Vector<float>& result, bool verifyOrder)
>@@ -691,19 +684,4 @@ void SVGAnimationElement::checkInvalidCSSAttributeType(SVGElement* target)
>     m_hasInvalidCSSAttributeType = target && hasValidAttributeName() && attributeType() == AttributeType::CSS && !isTargetAttributeCSSProperty(target, attributeName());
> }
> 
>-Ref<SVGStringList> SVGAnimationElement::requiredFeatures()
>-{
>-    return SVGTests::requiredFeatures(*this);
>-}
>-
>-Ref<SVGStringList> SVGAnimationElement::requiredExtensions()
>-{ 
>-    return SVGTests::requiredExtensions(*this);
>-}
>-
>-Ref<SVGStringList> SVGAnimationElement::systemLanguage()
>-{
>-    return SVGTests::systemLanguage(*this);
>-}
>-
> }
>diff --git a/Source/WebCore/svg/SVGAnimationElement.h b/Source/WebCore/svg/SVGAnimationElement.h
>index 7668f1872dd..6c57da81869 100644
>--- a/Source/WebCore/svg/SVGAnimationElement.h
>+++ b/Source/WebCore/svg/SVGAnimationElement.h
>@@ -146,14 +146,13 @@ public:
>             animatedNumber = number;
>     }
> 
>-    // SVGTests
>-    Ref<SVGStringList> requiredFeatures();
>-    Ref<SVGStringList> requiredExtensions();
>-    Ref<SVGStringList> systemLanguage();
>-
> protected:
>     SVGAnimationElement(const QualifiedName&, Document&);
> 
>+    using AttributeOwnerProxy = SVGAttributeOwnerProxyImpl<SVGAnimationElement, SVGElement, SVGTests, SVGExternalResourcesRequired>;
>+    static AttributeOwnerProxy::AttributeRegistry& attributeRegistry() { return AttributeOwnerProxy::attributeRegistry(); }
>+    const SVGAttributeOwnerProxy& attributeOwnerProxy() const override { return m_attributeOwnerProxy; }
>+
>     void computeCSSPropertyValue(SVGElement*, CSSPropertyID, String& value);
>     virtual void determinePropertyValueTypes(const String& from, const String& to);
>     virtual void resetAnimatedPropertyType();
>@@ -208,15 +207,6 @@ private:
>     void applyAnimatedValue(ShouldApplyAnimation, SVGElement* targetElement, const QualifiedName& attributeName, SVGAnimatedType*);
>     void adjustForInheritance(SVGElement* targetElement, const QualifiedName& attributeName, String&);
> 
>-    BEGIN_DECLARE_ANIMATED_PROPERTIES(SVGAnimationElement)
>-        DECLARE_ANIMATED_BOOLEAN_OVERRIDE(ExternalResourcesRequired, externalResourcesRequired)
>-    END_DECLARE_ANIMATED_PROPERTIES
>-
>-    // SVGTests
>-    void synchronizeRequiredFeatures() final { SVGTests::synchronizeRequiredFeatures(*this); }
>-    void synchronizeRequiredExtensions() final { SVGTests::synchronizeRequiredExtensions(*this); }
>-    void synchronizeSystemLanguage() final { SVGTests::synchronizeSystemLanguage(*this); }
>-
>     void setCalcMode(const AtomicString&);
> 
>     bool m_animationValid { false };
>@@ -231,6 +221,7 @@ private:
>     bool m_hasInvalidCSSAttributeType { false };
>     CalcMode m_calcMode { CalcMode::Linear };
>     AnimationMode m_animationMode { NoAnimation };
>+    AttributeOwnerProxy m_attributeOwnerProxy { *this };
> };
> 
> } // namespace WebCore

Actions: View | Formatted Diff | Diff

Attachments on bug 186751: 342916 | 342917 | 342985 | 343001 | 343114 | 343123 | 343124 | 343127 | 343129 | 343162 | 343167 | 343169 | 343171 | 343174 | 343213 | 343217 | 343327 | 343335 | 343338 | 343339 | 343343 | 343415 | 343979 | 343989 | 344002 | 344513 | 344516 | 344523 | 344534 | 344536 | 344988 | 344990 | 346097 | 346103 | 346124 | 346129 | 346177 | 346179 | 346180 | 346182 | 346185 | 346188 | 346190 | 346192 | 346193 | 346197 | 346199 | 346201 | 346202 | 346203 | 346204 | 346205 | 346206 | 346207 | 346211 | 346212 | 346217 | 346224 | 346230 | 346233 | 346241 | 346244 | 346245 | 346315 | 346316 | 346317 | 346318 | 346319 | 346320 | 346322 | 346323 | 346324 | 346325 | 346326 | 346327 | 346328 | 346329 | 346330 | 346331 | 346332 | 346333 | 346334 | 346335 | 346336 | 346337 | 346338 | 346339 | 346340 | 346341 | 346342 | 346343 | 346344 | 346345 | 346346 | 346347 | 346348 | 346349 | 346350 | 346518 | 346519 | 346520 | 346521 | 346522 | 346524 | 346525 | 346526 | 346527 | 346528 | 346529 | 346530 | 346531 | 346532 | 346533 | 346534 | 346535 | 346536 | 346537 | 346538 | 346539 | 346540 | 346541 | 346545 | 346546 | 346549 | 346551 | 346552 | 346601 | 346602 | 346611 | 346636 | 346642