Attachment 346244 Details for Bug 186751 – Remove SVG macros from SVGRectElement

[patch] Remove SVG macros from SVGRectElement

186751-30.patch (text/plain), 10.78 KB, created by Said Abou-Hallawa on 2018-07-31 18:22:01 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Said Abou-Hallawa

Created: 2018-07-31 18:22:01 PDT

Size: 10.78 KB

patch

obsolete

>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 23b271723cf..da9381ee560 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,22 @@
>+2018-07-31  Said Abou-Hallawa  <sabouhallawa@apple.com>
>+
>+        [30] Remove the SVG elements' attributes macros
>+        https://bugs.webkit.org/show_bug.cgi?id=186751
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Remove SVG macros from SVGRectElement.
>+
>+        The attributes of SVGExternalResourcesRequired will not be added since
>+        they are now owned by SVGExternalResourcesRequired.
>+
>+        * svg/SVGRectElement.cpp:
>+        (WebCore::SVGRectElement::SVGRectElement):
>+        (WebCore::SVGRectElement::registerAttributes):
>+        (WebCore::SVGRectElement::parseAttribute):
>+        (WebCore::SVGRectElement::svgAttributeChanged):
>+        * svg/SVGRectElement.h:
>+
> 2018-07-31  Said Abou-Hallawa  <sabouhallawa@apple.com>
> 
>         [29] Remove the SVG elements' attributes macros
>diff --git a/Source/WebCore/svg/SVGRectElement.cpp b/Source/WebCore/svg/SVGRectElement.cpp
>index a05f2abb5c7..cfdf196d035 100644
>--- a/Source/WebCore/svg/SVGRectElement.cpp
>+++ b/Source/WebCore/svg/SVGRectElement.cpp
>@@ -2,6 +2,7 @@
>  * Copyright (C) 2004, 2005, 2006, 2008 Nikolas Zimmermann <zimmermann@kde.org>
>  * Copyright (C) 2004, 2005, 2006, 2007 Rob Buis <buis@kde.org>
>  * Copyright (C) 2014 Adobe Systems Incorporated. All rights reserved.
>+ * 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
>@@ -22,48 +23,20 @@
> #include "config.h"
> #include "SVGRectElement.h"
> 
>-#include "RenderSVGPath.h"
> #include "RenderSVGRect.h"
> #include "RenderSVGResource.h"
>-#include "SVGLengthValue.h"
>-#include "SVGNames.h"
> #include <wtf/IsoMallocInlines.h>
> 
> namespace WebCore {
> 
> WTF_MAKE_ISO_ALLOCATED_IMPL(SVGRectElement);
> 
>-// Animated property definitions
>-DEFINE_ANIMATED_LENGTH(SVGRectElement, SVGNames::xAttr, X, x)
>-DEFINE_ANIMATED_LENGTH(SVGRectElement, SVGNames::yAttr, Y, y)
>-DEFINE_ANIMATED_LENGTH(SVGRectElement, SVGNames::widthAttr, Width, width)
>-DEFINE_ANIMATED_LENGTH(SVGRectElement, SVGNames::heightAttr, Height, height)
>-DEFINE_ANIMATED_LENGTH(SVGRectElement, SVGNames::rxAttr, Rx, rx)
>-DEFINE_ANIMATED_LENGTH(SVGRectElement, SVGNames::ryAttr, Ry, ry)
>-DEFINE_ANIMATED_BOOLEAN(SVGRectElement, SVGNames::externalResourcesRequiredAttr, ExternalResourcesRequired, externalResourcesRequired)
>-
>-BEGIN_REGISTER_ANIMATED_PROPERTIES(SVGRectElement)
>-    REGISTER_LOCAL_ANIMATED_PROPERTY(x)
>-    REGISTER_LOCAL_ANIMATED_PROPERTY(y)
>-    REGISTER_LOCAL_ANIMATED_PROPERTY(width)
>-    REGISTER_LOCAL_ANIMATED_PROPERTY(height)
>-    REGISTER_LOCAL_ANIMATED_PROPERTY(rx)
>-    REGISTER_LOCAL_ANIMATED_PROPERTY(ry)
>-    REGISTER_LOCAL_ANIMATED_PROPERTY(externalResourcesRequired)
>-    REGISTER_PARENT_ANIMATED_PROPERTIES(SVGGeometryElement)
>-END_REGISTER_ANIMATED_PROPERTIES
>-
> inline SVGRectElement::SVGRectElement(const QualifiedName& tagName, Document& document)
>     : SVGGeometryElement(tagName, document)
>-    , m_x(LengthModeWidth)
>-    , m_y(LengthModeHeight)
>-    , m_width(LengthModeWidth)
>-    , m_height(LengthModeHeight)
>-    , m_rx(LengthModeWidth)
>-    , m_ry(LengthModeHeight)
>+    , SVGExternalResourcesRequired(this)
> {
>     ASSERT(hasTagName(SVGNames::rectTag));
>-    registerAnimatedPropertiesForSVGRectElement();
>+    registerAttributes();
> }
> 
> Ref<SVGRectElement> SVGRectElement::create(const QualifiedName& tagName, Document& document)
>@@ -71,46 +44,52 @@ Ref<SVGRectElement> SVGRectElement::create(const QualifiedName& tagName, Documen
>     return adoptRef(*new SVGRectElement(tagName, document));
> }
> 
>+void SVGRectElement::registerAttributes()
>+{
>+    auto& registry = attributeRegistry();
>+    if (!registry.isEmpty())
>+        return;
>+    registry.registerAttribute<SVGNames::xAttr, &SVGRectElement::m_x>();
>+    registry.registerAttribute<SVGNames::yAttr, &SVGRectElement::m_y>();
>+    registry.registerAttribute<SVGNames::widthAttr, &SVGRectElement::m_width>();
>+    registry.registerAttribute<SVGNames::heightAttr, &SVGRectElement::m_height>();
>+    registry.registerAttribute<SVGNames::rxAttr, &SVGRectElement::m_rx>();
>+    registry.registerAttribute<SVGNames::ryAttr, &SVGRectElement::m_ry>();
>+}
>+
> void SVGRectElement::parseAttribute(const QualifiedName& name, const AtomicString& value)
> {
>     SVGParsingError parseError = NoError;
> 
>     if (name == SVGNames::xAttr)
>-        setXBaseValue(SVGLengthValue::construct(LengthModeWidth, value, parseError));
>+        m_x.setValue(SVGLengthValue::construct(LengthModeWidth, value, parseError));
>     else if (name == SVGNames::yAttr)
>-        setYBaseValue(SVGLengthValue::construct(LengthModeHeight, value, parseError));
>+        m_y.setValue(SVGLengthValue::construct(LengthModeHeight, value, parseError));
>     else if (name == SVGNames::rxAttr)
>-        setRxBaseValue(SVGLengthValue::construct(LengthModeWidth, value, parseError, ForbidNegativeLengths));
>+        m_rx.setValue(SVGLengthValue::construct(LengthModeWidth, value, parseError, ForbidNegativeLengths));
>     else if (name == SVGNames::ryAttr)
>-        setRyBaseValue(SVGLengthValue::construct(LengthModeHeight, value, parseError, ForbidNegativeLengths));
>+        m_ry.setValue(SVGLengthValue::construct(LengthModeHeight, value, parseError, ForbidNegativeLengths));
>     else if (name == SVGNames::widthAttr)
>-        setWidthBaseValue(SVGLengthValue::construct(LengthModeWidth, value, parseError, ForbidNegativeLengths));
>+        m_width.setValue(SVGLengthValue::construct(LengthModeWidth, value, parseError, ForbidNegativeLengths));
>     else if (name == SVGNames::heightAttr)
>-        setHeightBaseValue(SVGLengthValue::construct(LengthModeHeight, value, parseError, ForbidNegativeLengths));
>+        m_height.setValue(SVGLengthValue::construct(LengthModeHeight, value, parseError, ForbidNegativeLengths));
> 
>     reportAttributeParsingError(parseError, name, value);
> 
>-    SVGGraphicsElement::parseAttribute(name, value);
>+    SVGGeometryElement::parseAttribute(name, value);
>     SVGExternalResourcesRequired::parseAttribute(name, value);
> }
> 
> void SVGRectElement::svgAttributeChanged(const QualifiedName& attrName)
> {
>-    if (attrName == SVGNames::xAttr || attrName == SVGNames::yAttr || attrName == SVGNames::widthAttr || attrName == SVGNames::heightAttr || attrName == SVGNames::rxAttr || attrName == SVGNames::ryAttr) {
>+    if (isKnownAttribute(attrName)) {
>         InstanceInvalidationGuard guard(*this);
>         invalidateSVGPresentationAttributeStyle();
>         return;
>     }
> 
>-    if (SVGLangSpace::isKnownAttribute(attrName) || SVGExternalResourcesRequired::isKnownAttribute(attrName)) {
>-        if (auto* renderer = downcast<RenderSVGShape>(this->renderer())) {
>-            InstanceInvalidationGuard guard(*this);
>-            RenderSVGResource::markForLayoutAndParentResourceInvalidation(*renderer);
>-        }
>-        return;
>-    }
>-
>-    SVGGraphicsElement::svgAttributeChanged(attrName);
>+    SVGGeometryElement::svgAttributeChanged(attrName);
>+    SVGExternalResourcesRequired::svgAttributeChanged(attrName);
> }
> 
> RenderPtr<RenderElement> SVGRectElement::createElementRenderer(RenderStyle&& style, const RenderTreePosition&)
>diff --git a/Source/WebCore/svg/SVGRectElement.h b/Source/WebCore/svg/SVGRectElement.h
>index d2408643f04..ecf76166023 100644
>--- a/Source/WebCore/svg/SVGRectElement.h
>+++ b/Source/WebCore/svg/SVGRectElement.h
>@@ -1,6 +1,7 @@
> /*
>  * Copyright (C) 2004, 2005, 2006, 2008 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
>@@ -33,27 +34,44 @@ class SVGRectElement final : public SVGGeometryElement, public SVGExternalResour
> public:
>     static Ref<SVGRectElement> create(const QualifiedName&, Document&);
> 
>+    const SVGLengthValue& x() const { return m_x.currentValue(); }
>+    const SVGLengthValue& y() const { return m_y.currentValue(); }
>+    const SVGLengthValue& width() const { return m_width.currentValue(); }
>+    const SVGLengthValue& height() const { return m_height.currentValue(); }
>+    const SVGLengthValue& rx() const { return m_rx.currentValue(); }
>+    const SVGLengthValue& ry() const { return m_ry.currentValue(); }
>+
>+    RefPtr<SVGAnimatedLength> xAnimated() { return m_x.animatedProperty(); }
>+    RefPtr<SVGAnimatedLength> yAnimated() { return m_y.animatedProperty(); }
>+    RefPtr<SVGAnimatedLength> widthAnimated() { return m_width.animatedProperty(); }
>+    RefPtr<SVGAnimatedLength> heightAnimated() { return m_height.animatedProperty(); }
>+    RefPtr<SVGAnimatedLength> rxAnimated() { return m_rx.animatedProperty(); }
>+    RefPtr<SVGAnimatedLength> ryAnimated() { return m_ry.animatedProperty(); }
>+
> private:
>     SVGRectElement(const QualifiedName&, Document&);
>-    
>-    bool isValid() const final { return SVGTests::isValid(); }
> 
>+    using AttributeOwnerProxy = SVGAttributeOwnerProxyImpl<SVGRectElement, SVGGeometryElement, SVGExternalResourcesRequired>;
>+    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&) final;
>     void svgAttributeChanged(const QualifiedName&) final;
> 
>+    bool isValid() const final { return SVGTests::isValid(); }
>     bool selfHasRelativeLengths() const final { return true; }
> 
>     RenderPtr<RenderElement> createElementRenderer(RenderStyle&&, const RenderTreePosition&) final;
> 
>-    BEGIN_DECLARE_ANIMATED_PROPERTIES(SVGRectElement)
>-        DECLARE_ANIMATED_LENGTH(X, x)
>-        DECLARE_ANIMATED_LENGTH(Y, y)
>-        DECLARE_ANIMATED_LENGTH(Width, width)
>-        DECLARE_ANIMATED_LENGTH(Height, height)
>-        DECLARE_ANIMATED_LENGTH(Rx, rx)
>-        DECLARE_ANIMATED_LENGTH(Ry, ry)
>-        DECLARE_ANIMATED_BOOLEAN_OVERRIDE(ExternalResourcesRequired, externalResourcesRequired)
>-    END_DECLARE_ANIMATED_PROPERTIES
>+    AttributeOwnerProxy m_attributeOwnerProxy { *this };
>+    SVGAnimatedLengthAttribute m_x { m_attributeOwnerProxy, LengthModeWidth };
>+    SVGAnimatedLengthAttribute m_y { m_attributeOwnerProxy, LengthModeHeight };
>+    SVGAnimatedLengthAttribute m_width { m_attributeOwnerProxy, LengthModeWidth };
>+    SVGAnimatedLengthAttribute m_height { m_attributeOwnerProxy, LengthModeHeight };
>+    SVGAnimatedLengthAttribute m_rx { m_attributeOwnerProxy, LengthModeWidth };
>+    SVGAnimatedLengthAttribute m_ry { m_attributeOwnerProxy, LengthModeHeight};
> };
> 
> } // 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