Attachment 346336 Details for Bug 186751 – Remove SVG macros from SVGFELightElement

[patch] Remove SVG macros from SVGFELightElement

186751-52.patch (text/plain), 11.35 KB, created by Said Abou-Hallawa on 2018-08-01 17:54:17 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Said Abou-Hallawa

Created: 2018-08-01 17:54:17 PDT

Size: 11.35 KB

patch

obsolete

>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index b59b2925f92..be63f5b8196 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,19 @@
>+2018-08-01  Said Abou-Hallawa  <sabouhallawa@apple.com>
>+
>+        [52] Remove the SVG elements' attributes macros
>+        https://bugs.webkit.org/show_bug.cgi?id=186751
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Remove SVG macros from SVGFELightElement.
>+
>+        * svg/SVGFELightElement.cpp:
>+        (WebCore::SVGFELightElement::SVGFELightElement):
>+        (WebCore::SVGFELightElement::registerAttributes):
>+        (WebCore::SVGFELightElement::parseAttribute):
>+        (WebCore::SVGFELightElement::svgAttributeChanged):
>+        * svg/SVGFELightElement.h:
>+
> 2018-08-01  Said Abou-Hallawa  <sabouhallawa@apple.com>
> 
>         [51] Remove the SVG elements' attributes macros
>diff --git a/Source/WebCore/svg/SVGFELightElement.cpp b/Source/WebCore/svg/SVGFELightElement.cpp
>index 9c9530c34ec..24191fbb1b0 100644
>--- a/Source/WebCore/svg/SVGFELightElement.cpp
>+++ b/Source/WebCore/svg/SVGFELightElement.cpp
>@@ -2,6 +2,7 @@
>  * Copyright (C) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org>
>  * Copyright (C) 2004, 2005, 2006 Rob Buis <buis@kde.org>
>  * Copyright (C) 2005 Oliver Hunt <oliver@nerget.com>
>+ * 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
>@@ -39,36 +40,10 @@ namespace WebCore {
> 
> WTF_MAKE_ISO_ALLOCATED_IMPL(SVGFELightElement);
> 
>-// Animated property definitions
>-DEFINE_ANIMATED_NUMBER(SVGFELightElement, SVGNames::azimuthAttr, Azimuth, azimuth)
>-DEFINE_ANIMATED_NUMBER(SVGFELightElement, SVGNames::elevationAttr, Elevation, elevation)
>-DEFINE_ANIMATED_NUMBER(SVGFELightElement, SVGNames::xAttr, X, x)
>-DEFINE_ANIMATED_NUMBER(SVGFELightElement, SVGNames::yAttr, Y, y)
>-DEFINE_ANIMATED_NUMBER(SVGFELightElement, SVGNames::zAttr, Z, z)
>-DEFINE_ANIMATED_NUMBER(SVGFELightElement, SVGNames::pointsAtXAttr, PointsAtX, pointsAtX)
>-DEFINE_ANIMATED_NUMBER(SVGFELightElement, SVGNames::pointsAtYAttr, PointsAtY, pointsAtY)
>-DEFINE_ANIMATED_NUMBER(SVGFELightElement, SVGNames::pointsAtZAttr, PointsAtZ, pointsAtZ)
>-DEFINE_ANIMATED_NUMBER(SVGFELightElement, SVGNames::specularExponentAttr, SpecularExponent, specularExponent)
>-DEFINE_ANIMATED_NUMBER(SVGFELightElement, SVGNames::limitingConeAngleAttr, LimitingConeAngle, limitingConeAngle)
>-
>-BEGIN_REGISTER_ANIMATED_PROPERTIES(SVGFELightElement)
>-    REGISTER_LOCAL_ANIMATED_PROPERTY(azimuth)
>-    REGISTER_LOCAL_ANIMATED_PROPERTY(elevation)
>-    REGISTER_LOCAL_ANIMATED_PROPERTY(x)
>-    REGISTER_LOCAL_ANIMATED_PROPERTY(y)
>-    REGISTER_LOCAL_ANIMATED_PROPERTY(z)
>-    REGISTER_LOCAL_ANIMATED_PROPERTY(pointsAtX)
>-    REGISTER_LOCAL_ANIMATED_PROPERTY(pointsAtY)
>-    REGISTER_LOCAL_ANIMATED_PROPERTY(pointsAtZ)
>-    REGISTER_LOCAL_ANIMATED_PROPERTY(specularExponent)
>-    REGISTER_LOCAL_ANIMATED_PROPERTY(limitingConeAngle)
>-END_REGISTER_ANIMATED_PROPERTIES
>-
> SVGFELightElement::SVGFELightElement(const QualifiedName& tagName, Document& document)
>     : SVGElement(tagName, document)
>-    , m_specularExponent(1)
> {
>-    registerAnimatedPropertiesForSVGFELightElement();
>+    registerAttributes();
> }
> 
> SVGFELightElement* SVGFELightElement::findLightElement(const SVGElement* svgElement)
>@@ -80,55 +55,72 @@ SVGFELightElement* SVGFELightElement::findLightElement(const SVGElement* svgElem
>     return nullptr;
> }
> 
>+void SVGFELightElement::registerAttributes()
>+{
>+    auto& registry = attributeRegistry();
>+    if (!registry.isEmpty())
>+        return;
>+    registry.registerAttribute<SVGNames::azimuthAttr, &SVGFELightElement::m_azimuth>();
>+    registry.registerAttribute<SVGNames::elevationAttr, &SVGFELightElement::m_elevation>();
>+    registry.registerAttribute<SVGNames::xAttr, &SVGFELightElement::m_x>();
>+    registry.registerAttribute<SVGNames::yAttr, &SVGFELightElement::m_y>();
>+    registry.registerAttribute<SVGNames::zAttr, &SVGFELightElement::m_z>();
>+    registry.registerAttribute<SVGNames::pointsAtXAttr, &SVGFELightElement::m_pointsAtX>();
>+    registry.registerAttribute<SVGNames::pointsAtYAttr, &SVGFELightElement::m_pointsAtY>();
>+    registry.registerAttribute<SVGNames::pointsAtZAttr, &SVGFELightElement::m_pointsAtZ>();
>+    registry.registerAttribute<SVGNames::specularExponentAttr, &SVGFELightElement::m_specularExponent>();
>+    registry.registerAttribute<SVGNames::limitingConeAngleAttr, &SVGFELightElement::m_limitingConeAngle>();
>+}
>+
> void SVGFELightElement::parseAttribute(const QualifiedName& name, const AtomicString& value)
> {
>     if (name == SVGNames::azimuthAttr) {
>-        setAzimuthBaseValue(value.toFloat());
>+        m_azimuth.setValue(value.toFloat());
>         return;
>     }
> 
>     if (name == SVGNames::elevationAttr) {
>-        setElevationBaseValue(value.toFloat());
>+        m_elevation.setValue(value.toFloat());
>         return;
>     }
> 
>     if (name == SVGNames::xAttr) {
>-        setXBaseValue(value.toFloat());
>+        m_x.setValue(value.toFloat());
>         return;
>     }
> 
>     if (name == SVGNames::yAttr) {
>-        setYBaseValue(value.toFloat());
>+        m_y.setValue(value.toFloat());
>         return;
>     }
> 
>     if (name == SVGNames::zAttr) {
>-        setZBaseValue(value.toFloat());
>+        m_z.setValue(value.toFloat());
>         return;
>     }
> 
>     if (name == SVGNames::pointsAtXAttr) {
>-        setPointsAtXBaseValue(value.toFloat());
>+        m_pointsAtX.setValue(value.toFloat());
>         return;
>     }
> 
>     if (name == SVGNames::pointsAtYAttr) {
>-        setPointsAtYBaseValue(value.toFloat());
>+        m_pointsAtY.setValue(value.toFloat());
>         return;
>     }
> 
>     if (name == SVGNames::pointsAtZAttr) {
>-        setPointsAtZBaseValue(value.toFloat());
>+        m_pointsAtZ.setValue(value.toFloat());
>         return;
>     }
> 
>     if (name == SVGNames::specularExponentAttr) {
>-        setSpecularExponentBaseValue(value.toFloat());
>+        m_specularExponent.setValue(value.toFloat());
>         return;
>     }
> 
>     if (name == SVGNames::limitingConeAngleAttr) {
>-        setLimitingConeAngleBaseValue(value.toFloat());
>+        m_limitingConeAngle.setValue(value.toFloat());
>         return;
>     }
> 
>@@ -137,11 +129,7 @@ void SVGFELightElement::parseAttribute(const QualifiedName& name, const AtomicSt
> 
> void SVGFELightElement::svgAttributeChanged(const QualifiedName& attrName)
> {
>-    if (attrName == SVGNames::azimuthAttr || attrName == SVGNames::elevationAttr
>-        || attrName == SVGNames::xAttr || attrName == SVGNames::yAttr || attrName == SVGNames::zAttr
>-        || attrName == SVGNames::pointsAtXAttr || attrName == SVGNames::pointsAtYAttr || attrName == SVGNames::pointsAtZAttr
>-        || attrName == SVGNames::specularExponentAttr || attrName == SVGNames::limitingConeAngleAttr) {
>-
>+   if (isKnownAttribute(attrName)) {
>         auto parent = makeRefPtr(parentElement());
>         if (!parent)
>             return;
>diff --git a/Source/WebCore/svg/SVGFELightElement.h b/Source/WebCore/svg/SVGFELightElement.h
>index 91b17fa79d3..aa52ffd53ce 100644
>--- a/Source/WebCore/svg/SVGFELightElement.h
>+++ b/Source/WebCore/svg/SVGFELightElement.h
>@@ -2,6 +2,7 @@
>  * Copyright (C) 2004, 2005 Nikolas Zimmermann <zimmermann@kde.org>
>  * Copyright (C) 2004, 2005, 2006 Rob Buis <buis@kde.org>
>  * Copyright (C) 2005 Oliver Hunt <oliver@nerget.com>
>+ * 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,28 +36,55 @@ public:
>     virtual Ref<LightSource> lightSource(SVGFilterBuilder&) const = 0;
>     static SVGFELightElement* findLightElement(const SVGElement*);
> 
>+    float azimuth() const { return m_azimuth.currentValue(); }
>+    float elevation() const { return m_elevation.currentValue(); }
>+    float x() const { return m_x.currentValue(); }
>+    float y() const { return m_y.currentValue(); }
>+    float z() const { return m_z.currentValue(); }
>+    float pointsAtX() const { return m_pointsAtX.currentValue(); }
>+    float pointsAtY() const { return m_pointsAtY.currentValue(); }
>+    float pointsAtZ() const { return m_pointsAtZ.currentValue(); }
>+    float specularExponent() const { return m_specularExponent.currentValue(); }
>+    float limitingConeAngle() const { return m_limitingConeAngle.currentValue(); }
>+
>+    RefPtr<SVGAnimatedNumber> azimuthAnimated() { return m_azimuth.animatedProperty(); }
>+    RefPtr<SVGAnimatedNumber> elevationAnimated() { return m_elevation.animatedProperty(); }
>+    RefPtr<SVGAnimatedNumber> xAnimated() { return m_x.animatedProperty(); }
>+    RefPtr<SVGAnimatedNumber> yAnimated() { return m_y.animatedProperty(); }
>+    RefPtr<SVGAnimatedNumber> zAnimated() { return m_z.animatedProperty(); }
>+    RefPtr<SVGAnimatedNumber> pointsAtXAnimated() { return m_pointsAtX.animatedProperty(); }
>+    RefPtr<SVGAnimatedNumber> pointsAtYAnimated() { return m_pointsAtY.animatedProperty(); }
>+    RefPtr<SVGAnimatedNumber> pointsAtZAnimated() { return m_pointsAtZ.animatedProperty(); }
>+    RefPtr<SVGAnimatedNumber> specularExponentAnimated() { return m_specularExponent.animatedProperty(); }
>+    RefPtr<SVGAnimatedNumber> limitingConeAngleAnimated() { return m_limitingConeAngle.animatedProperty(); }
>+
> protected:
>     SVGFELightElement(const QualifiedName&, Document&);
> 
>     bool rendererIsNeeded(const RenderStyle&) override { return false; }
> 
> private:
>+    using AttributeOwnerProxy = SVGAttributeOwnerProxyImpl<SVGFELightElement, SVGElement>;
>+    static auto& 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;
>     void childrenChanged(const ChildChange&) override;
> 
>-    BEGIN_DECLARE_ANIMATED_PROPERTIES(SVGFELightElement)
>-        DECLARE_ANIMATED_NUMBER(Azimuth, azimuth)
>-        DECLARE_ANIMATED_NUMBER(Elevation, elevation)
>-        DECLARE_ANIMATED_NUMBER(X, x)
>-        DECLARE_ANIMATED_NUMBER(Y, y)
>-        DECLARE_ANIMATED_NUMBER(Z, z)
>-        DECLARE_ANIMATED_NUMBER(PointsAtX, pointsAtX)
>-        DECLARE_ANIMATED_NUMBER(PointsAtY, pointsAtY)
>-        DECLARE_ANIMATED_NUMBER(PointsAtZ, pointsAtZ)
>-        DECLARE_ANIMATED_NUMBER(SpecularExponent, specularExponent)
>-        DECLARE_ANIMATED_NUMBER(LimitingConeAngle, limitingConeAngle)
>-    END_DECLARE_ANIMATED_PROPERTIES
>+    AttributeOwnerProxy m_attributeOwnerProxy { *this };
>+    SVGAnimatedNumberAttribute m_azimuth { m_attributeOwnerProxy };
>+    SVGAnimatedNumberAttribute m_elevation { m_attributeOwnerProxy };
>+    SVGAnimatedNumberAttribute m_x { m_attributeOwnerProxy };
>+    SVGAnimatedNumberAttribute m_y { m_attributeOwnerProxy };
>+    SVGAnimatedNumberAttribute m_z { m_attributeOwnerProxy };
>+    SVGAnimatedNumberAttribute m_pointsAtX { m_attributeOwnerProxy };
>+    SVGAnimatedNumberAttribute m_pointsAtY { m_attributeOwnerProxy };
>+    SVGAnimatedNumberAttribute m_pointsAtZ { m_attributeOwnerProxy };
>+    SVGAnimatedNumberAttribute m_specularExponent { m_attributeOwnerProxy, 1 };
>+    SVGAnimatedNumberAttribute m_limitingConeAngle { 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