Attachment 346324 Details for Bug 186751 – Remove SVG macros from SVGClipPathElement

[patch] Remove SVG macros from SVGClipPathElement

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

(hide)

Description:

Filename:

MIME Type:

Creator: Said Abou-Hallawa

Created: 2018-08-01 17:45:41 PDT

Size: 7.68 KB

patch

obsolete

>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index ca7fbb1adc0..ef25d488b0f 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,20 @@
>+2018-08-01  Said Abou-Hallawa  <sabouhallawa@apple.com>
>+
>+        [40] Remove the SVG elements' attributes macros
>+        https://bugs.webkit.org/show_bug.cgi?id=186751
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Remove SVG macros from SVGClipPathElement.
>+
>+        * svg/SVGClipPathElement.cpp:
>+        (WebCore::SVGClipPathElement::SVGClipPathElement):
>+        (WebCore::SVGClipPathElement::registerAttributes):
>+        (WebCore::SVGClipPathElement::parseAttribute):
>+        (WebCore::SVGClipPathElement::svgAttributeChanged):
>+        (WebCore::SVGClipPathElement::isSupportedAttribute): Deleted.
>+        * svg/SVGClipPathElement.h:
>+
> 2018-08-01  Said Abou-Hallawa  <sabouhallawa@apple.com>
> 
>         [39] Remove the SVG elements' attributes macros
>diff --git a/Source/WebCore/svg/SVGClipPathElement.cpp b/Source/WebCore/svg/SVGClipPathElement.cpp
>index 0fa276a63e7..5bfd575f1fb 100644
>--- a/Source/WebCore/svg/SVGClipPathElement.cpp
>+++ b/Source/WebCore/svg/SVGClipPathElement.cpp
>@@ -2,6 +2,7 @@
>  * Copyright (C) 2004, 2005, 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org>
>  * Copyright (C) 2004, 2005, 2006, 2007, 2008 Rob Buis <buis@kde.org>
>  * Copyright (C) Research In Motion Limited 2009-2010. 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
>@@ -33,22 +34,12 @@ namespace WebCore {
> 
> WTF_MAKE_ISO_ALLOCATED_IMPL(SVGClipPathElement);
> 
>-// Animated property definitions
>-DEFINE_ANIMATED_ENUMERATION(SVGClipPathElement, SVGNames::clipPathUnitsAttr, ClipPathUnits, clipPathUnits, SVGUnitTypes::SVGUnitType)
>-DEFINE_ANIMATED_BOOLEAN(SVGClipPathElement, SVGNames::externalResourcesRequiredAttr, ExternalResourcesRequired, externalResourcesRequired)
>-
>-BEGIN_REGISTER_ANIMATED_PROPERTIES(SVGClipPathElement)
>-    REGISTER_LOCAL_ANIMATED_PROPERTY(clipPathUnits)
>-    REGISTER_LOCAL_ANIMATED_PROPERTY(externalResourcesRequired)
>-    REGISTER_PARENT_ANIMATED_PROPERTIES(SVGGraphicsElement)
>-END_REGISTER_ANIMATED_PROPERTIES
>-
> inline SVGClipPathElement::SVGClipPathElement(const QualifiedName& tagName, Document& document)
>     : SVGGraphicsElement(tagName, document)
>-    , m_clipPathUnits(SVGUnitTypes::SVG_UNIT_TYPE_USERSPACEONUSE)
>+    , SVGExternalResourcesRequired(*this)
> {
>     ASSERT(hasTagName(SVGNames::clipPathTag));
>-    registerAnimatedPropertiesForSVGClipPathElement();
>+    registerAttributes();
> }
> 
> Ref<SVGClipPathElement> SVGClipPathElement::create(const QualifiedName& tagName, Document& document)
>@@ -56,16 +47,12 @@ Ref<SVGClipPathElement> SVGClipPathElement::create(const QualifiedName& tagName,
>     return adoptRef(*new SVGClipPathElement(tagName, document));
> }
> 
>-bool SVGClipPathElement::isSupportedAttribute(const QualifiedName& attrName)
>+void SVGClipPathElement::registerAttributes()
> {
>-    static const auto supportedAttributes = makeNeverDestroyed([] {
>-        HashSet<QualifiedName> set;
>-        SVGLangSpace::addSupportedAttributes(set);
>-        SVGExternalResourcesRequired::addSupportedAttributes(set);
>-        set.add(SVGNames::clipPathUnitsAttr);
>-        return set;
>-    }());
>-    return supportedAttributes.get().contains<SVGAttributeHashTranslator>(attrName);
>+    auto& registry = attributeRegistry();
>+    if (!registry.isEmpty())
>+        return;
>+    registry.registerAttribute<SVGNames::clipPathUnitsAttr, SVGUnitTypes::SVGUnitType, &SVGClipPathElement::m_clipPathUnits>();
> }
> 
> void SVGClipPathElement::parseAttribute(const QualifiedName& name, const AtomicString& value)
>@@ -73,7 +60,7 @@ void SVGClipPathElement::parseAttribute(const QualifiedName& name, const AtomicS
>     if (name == SVGNames::clipPathUnitsAttr) {
>         auto propertyValue = SVGPropertyTraits<SVGUnitTypes::SVGUnitType>::fromString(value);
>         if (propertyValue > 0)
>-            setClipPathUnitsBaseValue(propertyValue);
>+            m_clipPathUnits.setValue(propertyValue);
>         return;
>     }
> 
>@@ -83,15 +70,16 @@ void SVGClipPathElement::parseAttribute(const QualifiedName& name, const AtomicS
> 
> void SVGClipPathElement::svgAttributeChanged(const QualifiedName& attrName)
> {
>-    if (!isSupportedAttribute(attrName)) {
>-        SVGGraphicsElement::svgAttributeChanged(attrName);
>+    if (isKnownAttribute(attrName)) {
>+        InstanceInvalidationGuard guard(*this);
>+
>+        if (RenderObject* object = renderer())
>+            object->setNeedsLayout();
>         return;
>     }
> 
>-    InstanceInvalidationGuard guard(*this);
>-
>-    if (RenderObject* object = renderer())
>-        object->setNeedsLayout();
>+    SVGGraphicsElement::svgAttributeChanged(attrName);
>+    SVGExternalResourcesRequired::svgAttributeChanged(attrName);
> }
> 
> void SVGClipPathElement::childrenChanged(const ChildChange& change)
>diff --git a/Source/WebCore/svg/SVGClipPathElement.h b/Source/WebCore/svg/SVGClipPathElement.h
>index a11c49f42ff..704a436f599 100644
>--- a/Source/WebCore/svg/SVGClipPathElement.h
>+++ b/Source/WebCore/svg/SVGClipPathElement.h
>@@ -1,6 +1,7 @@
> /*
>  * Copyright (C) 2004, 2005, 2007, 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
>@@ -35,24 +36,30 @@ class SVGClipPathElement final : public SVGGraphicsElement, public SVGExternalRe
> public:
>     static Ref<SVGClipPathElement> create(const QualifiedName&, Document&);
> 
>+    const SVGUnitTypes::SVGUnitType& clipPathUnits() const { return m_clipPathUnits.currentValue(); }
>+    RefPtr<SVGAnimatedEnumeration> clipPathUnitsAnimated() { return m_clipPathUnits.animatedProperty(); }
>+
> private:
>     SVGClipPathElement(const QualifiedName&, Document&);
> 
>-    bool isValid() const final { return SVGTests::isValid(); }
>-    bool supportsFocus() const final { return false; }
>-    bool needsPendingResourceHandling() const final { return false; }
>+    using AttributeOwnerProxy = SVGAttributeOwnerProxyImpl<SVGClipPathElement, SVGGraphicsElement, SVGExternalResourcesRequired>;
>+    static AttributeOwnerProxy::AttributeRegistry& attributeRegistry() { return AttributeOwnerProxy::attributeRegistry(); }
>+    static bool isKnownAttribute(const QualifiedName& attributeName) { return AttributeOwnerProxy::isKnownAttribute(attributeName); }
>+    static void registerAttributes();
> 
>-    static bool isSupportedAttribute(const QualifiedName&);
>+    const SVGAttributeOwnerProxy& attributeOwnerProxy() const final { return m_attributeOwnerProxy; }
>     void parseAttribute(const QualifiedName&, const AtomicString&) final;
>     void svgAttributeChanged(const QualifiedName&) final;
>     void childrenChanged(const ChildChange&) final;
> 
>+    bool isValid() const final { return SVGTests::isValid(); }
>+    bool supportsFocus() const final { return false; }
>+    bool needsPendingResourceHandling() const final { return false; }
>+
>     RenderPtr<RenderElement> createElementRenderer(RenderStyle&&, const RenderTreePosition&) final;
> 
>-    BEGIN_DECLARE_ANIMATED_PROPERTIES(SVGClipPathElement)
>-        DECLARE_ANIMATED_ENUMERATION(ClipPathUnits, clipPathUnits, SVGUnitTypes::SVGUnitType)
>-        DECLARE_ANIMATED_BOOLEAN_OVERRIDE(ExternalResourcesRequired, externalResourcesRequired)
>-    END_DECLARE_ANIMATED_PROPERTIES
>+    AttributeOwnerProxy m_attributeOwnerProxy { *this };
>+    SVGAnimatedEnumerationAttribute<SVGUnitTypes::SVGUnitType> m_clipPathUnits { m_attributeOwnerProxy, SVGUnitTypes::SVG_UNIT_TYPE_USERSPACEONUSE };
> };
> 
> } // 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