Attachment 346316 Details for Bug 186751 – Remove SVG macros from SVGLineElement

[patch] Remove SVG macros from SVGLineElement

186751-33.patch (text/plain), 10.38 KB, created by Said Abou-Hallawa on 2018-08-01 17:40:58 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Said Abou-Hallawa

Created: 2018-08-01 17:40:58 PDT

Size: 10.38 KB

patch

obsolete

>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 0d58f22ec3a..a077524c064 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,20 @@
>+2018-08-01  Said Abou-Hallawa  <sabouhallawa@apple.com>
>+
>+        [33] Remove the SVG elements' attributes macros
>+        https://bugs.webkit.org/show_bug.cgi?id=186751
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Remove SVG macros from SVGLineElement.
>+
>+        * svg/SVGLineElement.cpp:
>+        (WebCore::SVGLineElement::SVGLineElement):
>+        (WebCore::SVGLineElement::registerAttributes):
>+        (WebCore::SVGLineElement::parseAttribute):
>+        (WebCore::SVGLineElement::svgAttributeChanged):
>+        (WebCore::SVGLineElement::isSupportedAttribute): Deleted.
>+        * svg/SVGLineElement.h:
>+
> 2018-08-01  Said Abou-Hallawa  <sabouhallawa@apple.com>
> 
>         [32] Remove the SVG elements' attributes macros
>diff --git a/Source/WebCore/svg/SVGLineElement.cpp b/Source/WebCore/svg/SVGLineElement.cpp
>index 34815df1632..626b4732f8a 100644
>--- a/Source/WebCore/svg/SVGLineElement.cpp
>+++ b/Source/WebCore/svg/SVGLineElement.cpp
>@@ -1,6 +1,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) 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
>@@ -21,43 +22,20 @@
> #include "config.h"
> #include "SVGLineElement.h"
> 
>-#include "FloatPoint.h"
>-#include "RenderSVGPath.h"
> #include "RenderSVGResource.h"
> #include "SVGLengthValue.h"
>-#include "SVGNames.h"
> #include <wtf/IsoMallocInlines.h>
>-#include <wtf/NeverDestroyed.h>
> 
> namespace WebCore {
> 
> WTF_MAKE_ISO_ALLOCATED_IMPL(SVGLineElement);
> 
>-// Animated property definitions
>-DEFINE_ANIMATED_LENGTH(SVGLineElement, SVGNames::x1Attr, X1, x1)
>-DEFINE_ANIMATED_LENGTH(SVGLineElement, SVGNames::y1Attr, Y1, y1)
>-DEFINE_ANIMATED_LENGTH(SVGLineElement, SVGNames::x2Attr, X2, x2)
>-DEFINE_ANIMATED_LENGTH(SVGLineElement, SVGNames::y2Attr, Y2, y2)
>-DEFINE_ANIMATED_BOOLEAN(SVGLineElement, SVGNames::externalResourcesRequiredAttr, ExternalResourcesRequired, externalResourcesRequired)
>-
>-BEGIN_REGISTER_ANIMATED_PROPERTIES(SVGLineElement)
>-    REGISTER_LOCAL_ANIMATED_PROPERTY(x1)
>-    REGISTER_LOCAL_ANIMATED_PROPERTY(y1)
>-    REGISTER_LOCAL_ANIMATED_PROPERTY(x2)
>-    REGISTER_LOCAL_ANIMATED_PROPERTY(y2)
>-    REGISTER_LOCAL_ANIMATED_PROPERTY(externalResourcesRequired)
>-    REGISTER_PARENT_ANIMATED_PROPERTIES(SVGGeometryElement)
>-END_REGISTER_ANIMATED_PROPERTIES
>-
> inline SVGLineElement::SVGLineElement(const QualifiedName& tagName, Document& document)
>     : SVGGeometryElement(tagName, document)
>-    , m_x1(LengthModeWidth)
>-    , m_y1(LengthModeHeight)
>-    , m_x2(LengthModeWidth)
>-    , m_y2(LengthModeHeight)
>+    , SVGExternalResourcesRequired(*this)
> {
>     ASSERT(hasTagName(SVGNames::lineTag));
>-    registerAnimatedPropertiesForSVGLineElement();
>+    egisterAttributes();
> }
> 
> Ref<SVGLineElement> SVGLineElement::create(const QualifiedName& tagName, Document& document)
>@@ -65,16 +43,15 @@ Ref<SVGLineElement> SVGLineElement::create(const QualifiedName& tagName, Documen
>     return adoptRef(*new SVGLineElement(tagName, document));
> }
> 
>-bool SVGLineElement::isSupportedAttribute(const QualifiedName& attrName)
>+void SVGLineElement::registerAttributes()
> {
>-    static const auto supportedAttributes = makeNeverDestroyed([] {
>-        HashSet<QualifiedName> set;
>-        SVGLangSpace::addSupportedAttributes(set);
>-        SVGExternalResourcesRequired::addSupportedAttributes(set);
>-        set.add({ SVGNames::x1Attr.get(), SVGNames::x2Attr.get(), SVGNames::y1Attr.get(), SVGNames::y2Attr.get() });
>-        return set;
>-    }());
>-    return supportedAttributes.get().contains<SVGAttributeHashTranslator>(attrName);
>+    auto& registry = attributeRegistry();
>+    if (!registry.isEmpty())
>+        return;
>+    registry.registerAttribute<SVGNames::x1Attr, &SVGLineElement::m_x1>();
>+    registry.registerAttribute<SVGNames::y1Attr, &SVGLineElement::m_y1>();
>+    registry.registerAttribute<SVGNames::x2Attr, &SVGLineElement::m_x2>();
>+    registry.registerAttribute<SVGNames::y2Attr, &SVGLineElement::m_y2>();
> }
> 
> void SVGLineElement::parseAttribute(const QualifiedName& name, const AtomicString& value)
>@@ -82,53 +59,35 @@ void SVGLineElement::parseAttribute(const QualifiedName& name, const AtomicStrin
>     SVGParsingError parseError = NoError;
> 
>     if (name == SVGNames::x1Attr)
>-        setX1BaseValue(SVGLengthValue::construct(LengthModeWidth, value, parseError));
>+        m_x1.setValue(SVGLengthValue::construct(LengthModeWidth, value, parseError));
>     else if (name == SVGNames::y1Attr)
>-        setY1BaseValue(SVGLengthValue::construct(LengthModeHeight, value, parseError));
>+        m_y1.setValue(SVGLengthValue::construct(LengthModeHeight, value, parseError));
>     else if (name == SVGNames::x2Attr)
>-        setX2BaseValue(SVGLengthValue::construct(LengthModeWidth, value, parseError));
>+        m_x2.setValue(SVGLengthValue::construct(LengthModeWidth, value, parseError));
>     else if (name == SVGNames::y2Attr)
>-        setY2BaseValue(SVGLengthValue::construct(LengthModeHeight, value, parseError));
>+        m_y2.setValue(SVGLengthValue::construct(LengthModeHeight, value, parseError));
> 
>     reportAttributeParsingError(parseError, name, value);
> 
>-    SVGGraphicsElement::parseAttribute(name, value);
>+    SVGGeometryElement::parseAttribute(name, value);
>     SVGExternalResourcesRequired::parseAttribute(name, value);
> }
> 
> void SVGLineElement::svgAttributeChanged(const QualifiedName& attrName)
> {
>-    if (!isSupportedAttribute(attrName)) {
>-        SVGGraphicsElement::svgAttributeChanged(attrName);
>-        return;
>-    }
>-
>-    InstanceInvalidationGuard guard(*this);
>-    
>-    bool isLengthAttribute = attrName == SVGNames::x1Attr
>-                          || attrName == SVGNames::y1Attr
>-                          || attrName == SVGNames::x2Attr
>-                          || attrName == SVGNames::y2Attr;
>-
>-    if (isLengthAttribute)
>+    if (isKnownAttribute(attrName)) {
>+        InstanceInvalidationGuard guard(*this);
>         updateRelativeLengthsInformation();
> 
>-    auto* renderer = downcast<RenderSVGShape>(this->renderer());
>-    if (!renderer)
>-        return;
>-
>-    if (isLengthAttribute) {
>-        renderer->setNeedsShapeUpdate();
>-        RenderSVGResource::markForLayoutAndParentResourceInvalidation(*renderer);
>-        return;
>-    }
>-
>-    if (SVGLangSpace::isKnownAttribute(attrName) || SVGExternalResourcesRequired::isKnownAttribute(attrName)) {
>-        RenderSVGResource::markForLayoutAndParentResourceInvalidation(*renderer);
>+        if (auto* renderer = downcast<RenderSVGShape>(this->renderer())) {
>+            renderer->setNeedsShapeUpdate();
>+            RenderSVGResource::markForLayoutAndParentResourceInvalidation(*renderer);
>+        }
>         return;
>     }
> 
>-    ASSERT_NOT_REACHED();
>+    SVGGeometryElement::svgAttributeChanged(attrName);
>+    SVGExternalResourcesRequired::svgAttributeChanged(attrName);
> }
> 
> bool SVGLineElement::selfHasRelativeLengths() const
>diff --git a/Source/WebCore/svg/SVGLineElement.h b/Source/WebCore/svg/SVGLineElement.h
>index 609b6d93d04..6d671180f34 100644
>--- a/Source/WebCore/svg/SVGLineElement.h
>+++ b/Source/WebCore/svg/SVGLineElement.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
>@@ -20,10 +21,10 @@
> 
> #pragma once
> 
>-#include "SVGAnimatedBoolean.h"
> #include "SVGAnimatedLength.h"
> #include "SVGExternalResourcesRequired.h"
> #include "SVGGeometryElement.h"
>+#include "SVGNames.h"
> 
> namespace WebCore {
> 
>@@ -32,26 +33,37 @@ class SVGLineElement final : public SVGGeometryElement, public SVGExternalResour
> public:
>     static Ref<SVGLineElement> create(const QualifiedName&, Document&);
> 
>+    const SVGLengthValue& x1() const { return m_x1.currentValue(); }
>+    const SVGLengthValue& y1() const { return m_y1.currentValue(); }
>+    const SVGLengthValue& x2() const { return m_x2.currentValue(); }
>+    const SVGLengthValue& y2() const { return m_y2.currentValue(); }
>+
>+    RefPtr<SVGAnimatedLength> x1Animated() { return m_x1.animatedProperty(); }
>+    RefPtr<SVGAnimatedLength> y1Animated() { return m_y1.animatedProperty(); }
>+    RefPtr<SVGAnimatedLength> x2Animated() { return m_x2.animatedProperty(); }
>+    RefPtr<SVGAnimatedLength> y2Animated() { return m_y2.animatedProperty(); }
>+
> private:
>     SVGLineElement(const QualifiedName&, Document&);
>-    
>-    bool isValid() const final { return SVGTests::isValid(); }
> 
>-    static bool isSupportedAttribute(const QualifiedName&);
>+    using AttributeOwnerProxy = SVGAttributeOwnerProxyImpl<SVGLineElement, SVGGeometryElement, SVGExternalResourcesRequired>;
>+    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&) final;
>     void svgAttributeChanged(const QualifiedName&) final;
> 
>+    bool isValid() const final { return SVGTests::isValid(); }
>     bool supportsMarkers() const final { return true; }
>-
>     bool selfHasRelativeLengths() const final;
> 
>-    BEGIN_DECLARE_ANIMATED_PROPERTIES(SVGLineElement)
>-        DECLARE_ANIMATED_LENGTH(X1, x1)
>-        DECLARE_ANIMATED_LENGTH(Y1, y1)
>-        DECLARE_ANIMATED_LENGTH(X2, x2)
>-        DECLARE_ANIMATED_LENGTH(Y2, y2)
>-        DECLARE_ANIMATED_BOOLEAN_OVERRIDE(ExternalResourcesRequired, externalResourcesRequired)
>-    END_DECLARE_ANIMATED_PROPERTIES
>+    AttributeOwnerProxy m_attributeOwnerProxy { *this };
>+    SVGAnimatedLengthAttribute m_x1 { m_attributeOwnerProxy, LengthModeWidth };
>+    SVGAnimatedLengthAttribute m_y1 { m_attributeOwnerProxy, LengthModeHeight };
>+    SVGAnimatedLengthAttribute m_x2 { m_attributeOwnerProxy, LengthModeWidth };
>+    SVGAnimatedLengthAttribute m_y2 { 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