Attachment 346329 Details for Bug 186751 – Remove SVG macros from SVGFECompositeElement

[patch] Remove SVG macros from SVGFECompositeElement

186751-45.patch (text/plain), 8.85 KB, created by Said Abou-Hallawa on 2018-08-01 17:48:25 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Said Abou-Hallawa

Created: 2018-08-01 17:48:25 PDT

Size: 8.85 KB

patch

obsolete

>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 56b3b301c6d..96aae329aa3 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,18 @@
>+2018-08-01  Said Abou-Hallawa  <sabouhallawa@apple.com>
>+
>+        [45] Remove the SVG elements' attributes macros
>+        https://bugs.webkit.org/show_bug.cgi?id=186751
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Remove SVG macros from SVGFECompositeElement.
>+
>+        * svg/SVGFECompositeElement.cpp:
>+        (WebCore::SVGFECompositeElement::SVGFECompositeElement):
>+        (WebCore::SVGFECompositeElement::registerAttributes):
>+        (WebCore::SVGFECompositeElement::parseAttribute):
>+        * svg/SVGFECompositeElement.h:
>+
> 2018-08-01  Said Abou-Hallawa  <sabouhallawa@apple.com>
> 
>         [44] Remove the SVG elements' attributes macros
>diff --git a/Source/WebCore/svg/SVGFECompositeElement.cpp b/Source/WebCore/svg/SVGFECompositeElement.cpp
>index aba3e411570..c556246e61b 100644
>--- a/Source/WebCore/svg/SVGFECompositeElement.cpp
>+++ b/Source/WebCore/svg/SVGFECompositeElement.cpp
>@@ -1,6 +1,7 @@
> /*
>  * Copyright (C) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org>
>  * Copyright (C) 2004, 2005, 2006 Rob Buis <buis@kde.org>
>+ * Copyright (C) 2018 Apple Inc. All rights reserved.
>  *
>  * This library is free software; you can redistribute it and/or
>  * modify it under the terms of the GNU Library General Public
>@@ -30,32 +31,12 @@ namespace WebCore {
> 
> WTF_MAKE_ISO_ALLOCATED_IMPL(SVGFECompositeElement);
> 
>-// Animated property definitions
>-DEFINE_ANIMATED_STRING(SVGFECompositeElement, SVGNames::inAttr, In1, in1)
>-DEFINE_ANIMATED_STRING(SVGFECompositeElement, SVGNames::in2Attr, In2, in2)
>-DEFINE_ANIMATED_ENUMERATION(SVGFECompositeElement, SVGNames::operatorAttr, SVGOperator, svgOperator, CompositeOperationType)
>-DEFINE_ANIMATED_NUMBER(SVGFECompositeElement, SVGNames::k1Attr, K1, k1)
>-DEFINE_ANIMATED_NUMBER(SVGFECompositeElement, SVGNames::k2Attr, K2, k2)
>-DEFINE_ANIMATED_NUMBER(SVGFECompositeElement, SVGNames::k3Attr, K3, k3)
>-DEFINE_ANIMATED_NUMBER(SVGFECompositeElement, SVGNames::k4Attr, K4, k4)
>-
>-BEGIN_REGISTER_ANIMATED_PROPERTIES(SVGFECompositeElement)
>-    REGISTER_LOCAL_ANIMATED_PROPERTY(in1)
>-    REGISTER_LOCAL_ANIMATED_PROPERTY(in2)
>-    REGISTER_LOCAL_ANIMATED_PROPERTY(svgOperator)
>-    REGISTER_LOCAL_ANIMATED_PROPERTY(k1)
>-    REGISTER_LOCAL_ANIMATED_PROPERTY(k2)
>-    REGISTER_LOCAL_ANIMATED_PROPERTY(k3)
>-    REGISTER_LOCAL_ANIMATED_PROPERTY(k4)
>-    REGISTER_PARENT_ANIMATED_PROPERTIES(SVGFilterPrimitiveStandardAttributes)
>-END_REGISTER_ANIMATED_PROPERTIES
>-
> inline SVGFECompositeElement::SVGFECompositeElement(const QualifiedName& tagName, Document& document)
>     : SVGFilterPrimitiveStandardAttributes(tagName, document)
>     , m_svgOperator(FECOMPOSITE_OPERATOR_OVER)
> {
>     ASSERT(hasTagName(SVGNames::feCompositeTag));
>-    registerAnimatedPropertiesForSVGFECompositeElement();
>+    registerAttributes();
> }
> 
> Ref<SVGFECompositeElement> SVGFECompositeElement::create(const QualifiedName& tagName, Document& document)
>@@ -63,42 +44,56 @@ Ref<SVGFECompositeElement> SVGFECompositeElement::create(const QualifiedName& ta
>     return adoptRef(*new SVGFECompositeElement(tagName, document));
> }
> 
>+void SVGFECompositeElement::registerAttributes()
>+{
>+    auto& registry = attributeRegistry();
>+    if (!registry.isEmpty())
>+        return;
>+    registry.registerAttribute<SVGNames::inAttr, &SVGFECompositeElement::m_in1>();
>+    registry.registerAttribute<SVGNames::in2Attr, &SVGFECompositeElement::m_in2>();
>+    registry.registerAttribute<SVGNames::operatorAttr, CompositeOperationType, &SVGFECompositeElement::m_svgOperator>();
>+    registry.registerAttribute<SVGNames::k1Attr, &SVGFECompositeElement::m_k1>();
>+    registry.registerAttribute<SVGNames::k2Attr, &SVGFECompositeElement::m_k2>();
>+    registry.registerAttribute<SVGNames::k3Attr, &SVGFECompositeElement::m_k3>();
>+    registry.registerAttribute<SVGNames::k4Attr, &SVGFECompositeElement::m_k4>();
>+}
>+
> void SVGFECompositeElement::parseAttribute(const QualifiedName& name, const AtomicString& value)
> {
>     if (name == SVGNames::operatorAttr) {
>         CompositeOperationType propertyValue = SVGPropertyTraits<CompositeOperationType>::fromString(value);
>         if (propertyValue > 0)
>-            setSVGOperatorBaseValue(propertyValue);
>+            m_svgOperator.setValue(propertyValue);
>         return;
>     }
> 
>     if (name == SVGNames::inAttr) {
>-        setIn1BaseValue(value);
>+        m_in1.setValue(value);
>         return;
>     }
> 
>     if (name == SVGNames::in2Attr) {
>-        setIn2BaseValue(value);
>+        m_in2.setValue(value);
>         return;
>     }
> 
>     if (name == SVGNames::k1Attr) {
>-        setK1BaseValue(value.toFloat());
>+        m_k1.setValue(value.toFloat());
>         return;
>     }
> 
>     if (name == SVGNames::k2Attr) {
>-        setK2BaseValue(value.toFloat());
>+        m_k2.setValue(value.toFloat());
>         return;
>     }
> 
>     if (name == SVGNames::k3Attr) {
>-        setK3BaseValue(value.toFloat());
>+        m_k3.setValue(value.toFloat());
>         return;
>     }
> 
>     if (name == SVGNames::k4Attr) {
>-        setK4BaseValue(value.toFloat());
>+        m_k4.setValue(value.toFloat());
>         return;
>     }
> 
>diff --git a/Source/WebCore/svg/SVGFECompositeElement.h b/Source/WebCore/svg/SVGFECompositeElement.h
>index 9836a1be84b..8f131f01f69 100644
>--- a/Source/WebCore/svg/SVGFECompositeElement.h
>+++ b/Source/WebCore/svg/SVGFECompositeElement.h
>@@ -1,6 +1,7 @@
> /*
>  * Copyright (C) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org>
>  * Copyright (C) 2004, 2005, 2006 Rob Buis <buis@kde.org>
>+ * Copyright (C) 2018 Apple Inc. All rights reserved.
>  *
>  * This library is free software; you can redistribute it and/or
>  * modify it under the terms of the GNU Library General Public
>@@ -84,23 +85,45 @@ class SVGFECompositeElement final : public SVGFilterPrimitiveStandardAttributes
> public:
>     static Ref<SVGFECompositeElement> create(const QualifiedName&, Document&);
> 
>+    String in1() { return m_in1.currentValue(); }
>+    String in2() { return m_in2.currentValue(); }
>+    CompositeOperationType svgOperator() const { return m_svgOperator.currentValue(); }
>+    float k1() const { return m_k1.currentValue(); }
>+    float k2() const { return m_k2.currentValue(); }
>+    float k3() const { return m_k3.currentValue(); }
>+    float k4() const { return m_k4.currentValue(); }
>+
>+    RefPtr<SVGAnimatedString> in1Animated() { return m_in1.animatedProperty(); }
>+    RefPtr<SVGAnimatedString> in2Animated() { return m_in2.animatedProperty(); }
>+    RefPtr<SVGAnimatedEnumeration> svgOperatorAnimated() { return m_svgOperator.animatedProperty(); }
>+    RefPtr<SVGAnimatedNumber> k1Animated() { return m_k1.animatedProperty(); }
>+    RefPtr<SVGAnimatedNumber> k2Animated() { return m_k2.animatedProperty(); }
>+    RefPtr<SVGAnimatedNumber> k3Animated() { return m_k3.animatedProperty(); }
>+    RefPtr<SVGAnimatedNumber> k4Animated() { return m_k4.animatedProperty(); }
>+
> private:
>     SVGFECompositeElement(const QualifiedName&, Document&);
> 
>+    using AttributeOwnerProxy = SVGAttributeOwnerProxyImpl<SVGFECompositeElement, SVGFilterPrimitiveStandardAttributes>;
>+    static AttributeOwnerProxy::AttributeRegistry& attributeRegistry() { return AttributeOwnerProxy::attributeRegistry(); }
>+    static bool isKnownAttribute(const QualifiedName& attributeName) { return AttributeOwnerProxy::isKnownAttribute(attributeName); }
>+    static void registerAttributes();
>+
>+    const SVGAttributeOwnerProxy& attributeOwnerProxy() const final { return m_attributeOwnerProxy; }
>     void parseAttribute(const QualifiedName&, const AtomicString&) override;
>-    bool setFilterEffectAttribute(FilterEffect*, const QualifiedName&) override;
>     void svgAttributeChanged(const QualifiedName&) override;
>+
>+    bool setFilterEffectAttribute(FilterEffect*, const QualifiedName&) override;
>     RefPtr<FilterEffect> build(SVGFilterBuilder*, Filter&) override;
> 
>-    BEGIN_DECLARE_ANIMATED_PROPERTIES(SVGFECompositeElement)
>-        DECLARE_ANIMATED_STRING(In1, in1)
>-        DECLARE_ANIMATED_STRING(In2, in2)
>-        DECLARE_ANIMATED_ENUMERATION(SVGOperator, svgOperator, CompositeOperationType)
>-        DECLARE_ANIMATED_NUMBER(K1, k1)
>-        DECLARE_ANIMATED_NUMBER(K2, k2)
>-        DECLARE_ANIMATED_NUMBER(K3, k3)
>-        DECLARE_ANIMATED_NUMBER(K4, k4)
>-    END_DECLARE_ANIMATED_PROPERTIES
>+    AttributeOwnerProxy m_attributeOwnerProxy { *this };
>+    SVGAnimatedStringAttribute m_in1 { m_attributeOwnerProxy };
>+    SVGAnimatedStringAttribute m_in2 { m_attributeOwnerProxy };
>+    SVGAnimatedEnumerationAttribute<CompositeOperationType> m_svgOperator { m_attributeOwnerProxy, FECOMPOSITE_OPERATOR_OVER };
>+    SVGAnimatedNumberAttribute m_k1 { m_attributeOwnerProxy };
>+    SVGAnimatedNumberAttribute m_k2 { m_attributeOwnerProxy };
>+    SVGAnimatedNumberAttribute m_k3 { m_attributeOwnerProxy };
>+    SVGAnimatedNumberAttribute m_k4 { m_attributeOwnerProxy };
> };
> 
> } // 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