Attachment 346334 Details for Bug 186751 – Remove SVG macros from SVGFEGaussianBlurElement

[patch] Remove SVG macros from SVGFEGaussianBlurElement

186751-50.patch (text/plain), 8.32 KB, created by Said Abou-Hallawa on 2018-08-01 17:53:20 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Said Abou-Hallawa

Created: 2018-08-01 17:53:20 PDT

Size: 8.32 KB

patch

obsolete

>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 1d7fc2cee30..93d3920de2f 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,20 @@
>+2018-08-01  Said Abou-Hallawa  <sabouhallawa@apple.com>
>+
>+        [50] Remove the SVG elements' attributes macros
>+        https://bugs.webkit.org/show_bug.cgi?id=186751
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Remove SVG macros from SVGFEGaussianBlurElement.
>+
>+        * svg/SVGFEGaussianBlurElement.cpp:
>+        (WebCore::SVGFEGaussianBlurElement::SVGFEGaussianBlurElement):
>+        (WebCore::SVGFEGaussianBlurElement::setStdDeviation):
>+        (WebCore::SVGFEGaussianBlurElement::registerAttributes):
>+        (WebCore::SVGFEGaussianBlurElement::parseAttribute):
>+        (WebCore::SVGFEGaussianBlurElement::svgAttributeChanged):
>+        * svg/SVGFEGaussianBlurElement.h:
>+
> 2018-08-01  Said Abou-Hallawa  <sabouhallawa@apple.com>
> 
>         [49] Remove the SVG elements' attributes macros
>diff --git a/Source/WebCore/svg/SVGFEGaussianBlurElement.cpp b/Source/WebCore/svg/SVGFEGaussianBlurElement.cpp
>index bd3f8a44288..933187e6d04 100644
>--- a/Source/WebCore/svg/SVGFEGaussianBlurElement.cpp
>+++ b/Source/WebCore/svg/SVGFEGaussianBlurElement.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
>@@ -31,26 +32,11 @@ namespace WebCore {
> 
> WTF_MAKE_ISO_ALLOCATED_IMPL(SVGFEGaussianBlurElement);
> 
>-// Animated property definitions
>-DEFINE_ANIMATED_STRING(SVGFEGaussianBlurElement, SVGNames::inAttr, In1, in1)
>-DEFINE_ANIMATED_NUMBER_MULTIPLE_WRAPPERS(SVGFEGaussianBlurElement, SVGNames::stdDeviationAttr, stdDeviationXIdentifier(), StdDeviationX, stdDeviationX)
>-DEFINE_ANIMATED_NUMBER_MULTIPLE_WRAPPERS(SVGFEGaussianBlurElement, SVGNames::stdDeviationAttr, stdDeviationYIdentifier(), StdDeviationY, stdDeviationY)
>-DEFINE_ANIMATED_ENUMERATION(SVGFEGaussianBlurElement, SVGNames::edgeModeAttr, EdgeMode, edgeMode, EdgeModeType)
>-
>-BEGIN_REGISTER_ANIMATED_PROPERTIES(SVGFEGaussianBlurElement)
>-    REGISTER_LOCAL_ANIMATED_PROPERTY(in1)
>-    REGISTER_LOCAL_ANIMATED_PROPERTY(stdDeviationX)
>-    REGISTER_LOCAL_ANIMATED_PROPERTY(stdDeviationY)
>-    REGISTER_LOCAL_ANIMATED_PROPERTY(edgeMode)
>-    REGISTER_PARENT_ANIMATED_PROPERTIES(SVGFilterPrimitiveStandardAttributes)
>-END_REGISTER_ANIMATED_PROPERTIES
>-
> inline SVGFEGaussianBlurElement::SVGFEGaussianBlurElement(const QualifiedName& tagName, Document& document)
>     : SVGFilterPrimitiveStandardAttributes(tagName, document)
>-    , m_edgeMode(EDGEMODE_NONE)
> {
>     ASSERT(hasTagName(SVGNames::feGaussianBlurTag));
>-    registerAnimatedPropertiesForSVGFEGaussianBlurElement();
>+    registerAttributes();
> }
> 
> Ref<SVGFEGaussianBlurElement> SVGFEGaussianBlurElement::create(const QualifiedName& tagName, Document& document)
>@@ -72,31 +58,43 @@ const AtomicString& SVGFEGaussianBlurElement::stdDeviationYIdentifier()
> 
> void SVGFEGaussianBlurElement::setStdDeviation(float x, float y)
> {
>-    setStdDeviationXBaseValue(x);
>-    setStdDeviationYBaseValue(y);
>+    m_stdDeviationX.setValue(x);
>+    m_stdDeviationY.setValue(y);
>     invalidate();
> }
> 
>+void SVGFEGaussianBlurElement::registerAttributes()
>+{
>+    auto& registry = attributeRegistry();
>+    if (!registry.isEmpty())
>+        return;
>+    registry.registerAttribute<SVGNames::inAttr, &SVGFEGaussianBlurElement::m_in1>();
>+    registry.registerAttribute<SVGNames::stdDeviationAttr,
>+        &SVGFEGaussianBlurElement::stdDeviationXIdentifier, &SVGFEGaussianBlurElement::m_stdDeviationX,
>+        &SVGFEGaussianBlurElement::stdDeviationYIdentifier, &SVGFEGaussianBlurElement::m_stdDeviationY>();
>+    registry.registerAttribute<SVGNames::edgeModeAttr, EdgeModeType, &SVGFEGaussianBlurElement::m_edgeMode>();
>+}
>+
> void SVGFEGaussianBlurElement::parseAttribute(const QualifiedName& name, const AtomicString& value)
> {
>     if (name == SVGNames::stdDeviationAttr) {
>         float x, y;
>         if (parseNumberOptionalNumber(value, x, y)) {
>-            setStdDeviationXBaseValue(x);
>-            setStdDeviationYBaseValue(y);
>+            m_stdDeviationX.setValue(x);
>+            m_stdDeviationY.setValue(y);
>         }
>         return;
>     }
> 
>     if (name == SVGNames::inAttr) {
>-        setIn1BaseValue(value);
>+        m_in1.setValue(value);
>         return;
>     }
> 
>     if (name == SVGNames::edgeModeAttr) {
>         auto propertyValue = SVGPropertyTraits<EdgeModeType>::fromString(value);
>         if (propertyValue > 0)
>-            setEdgeModeBaseValue(propertyValue);
>+            m_edgeMode.setValue(propertyValue);
>         else
>             document().accessSVGExtensions().reportWarning("feGaussianBlur: problem parsing edgeMode=\"" + value + "\". Filtered element will not be displayed.");
>         return;
>@@ -107,7 +105,7 @@ void SVGFEGaussianBlurElement::parseAttribute(const QualifiedName& name, const A
> 
> void SVGFEGaussianBlurElement::svgAttributeChanged(const QualifiedName& attrName)
> {
>-    if (attrName == SVGNames::inAttr || attrName == SVGNames::stdDeviationAttr || attrName == SVGNames::edgeModeAttr) {
>+    if (isKnownAttribute(attrName)) {
>         InstanceInvalidationGuard guard(*this);
>         invalidate();
>         return;
>diff --git a/Source/WebCore/svg/SVGFEGaussianBlurElement.h b/Source/WebCore/svg/SVGFEGaussianBlurElement.h
>index 5a271cc23ca..ce762891977 100644
>--- a/Source/WebCore/svg/SVGFEGaussianBlurElement.h
>+++ b/Source/WebCore/svg/SVGFEGaussianBlurElement.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
>@@ -35,22 +36,38 @@ public:
> 
>     void setStdDeviation(float stdDeviationX, float stdDeviationY);
> 
>+    String in1() const { return m_in1.currentValue(); }
>+    float stdDeviationX() const { return m_stdDeviationX.currentValue(); }
>+    float stdDeviationY() const { return m_stdDeviationY.currentValue(); }
>+    EdgeModeType edgeMode() const { return m_edgeMode.currentValue(); }
>+
>+    RefPtr<SVGAnimatedString> in1Animated() { return m_in1.animatedProperty(); }
>+    RefPtr<SVGAnimatedNumber> stdDeviationXAnimated() { return m_stdDeviationX.animatedProperty(); }
>+    RefPtr<SVGAnimatedNumber> stdDeviationYAnimated() { return m_stdDeviationY.animatedProperty(); }
>+    RefPtr<SVGAnimatedEnumeration> edgeModeAnimated() { return m_edgeMode.animatedProperty(); }
>+
> private:
>     SVGFEGaussianBlurElement(const QualifiedName&, Document&);
> 
>+    using AttributeOwnerProxy = SVGAttributeOwnerProxyImpl<SVGFEGaussianBlurElement, 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;
>     void svgAttributeChanged(const QualifiedName&) override;
>+
>     RefPtr<FilterEffect> build(SVGFilterBuilder*, Filter&) override;
> 
>     static const AtomicString& stdDeviationXIdentifier();
>     static const AtomicString& stdDeviationYIdentifier();
> 
>-    BEGIN_DECLARE_ANIMATED_PROPERTIES(SVGFEGaussianBlurElement)
>-        DECLARE_ANIMATED_STRING(In1, in1)
>-        DECLARE_ANIMATED_NUMBER(StdDeviationX, stdDeviationX)
>-        DECLARE_ANIMATED_NUMBER(StdDeviationY, stdDeviationY)
>-        DECLARE_ANIMATED_ENUMERATION(EdgeMode, edgeMode, EdgeModeType)
>-    END_DECLARE_ANIMATED_PROPERTIES
>+    AttributeOwnerProxy m_attributeOwnerProxy { *this };
>+    SVGAnimatedStringAttribute m_in1 { m_attributeOwnerProxy };
>+    SVGAnimatedNumberAttribute m_stdDeviationX { m_attributeOwnerProxy };
>+    SVGAnimatedNumberAttribute m_stdDeviationY { m_attributeOwnerProxy };
>+    SVGAnimatedEnumerationAttribute<EdgeModeType> m_edgeMode { m_attributeOwnerProxy, EDGEMODE_NONE };
> };
> 
> } // 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