Attachment 346335 Details for Bug 186751 – Remove SVG macros from SVGFEImageElement

[patch] Remove SVG macros from SVGFEImageElement

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

(hide)

Description:

Filename:

MIME Type:

Creator: Said Abou-Hallawa

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

Size: 6.08 KB

patch

obsolete

>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 93d3920de2f..b59b2925f92 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,18 @@
>+2018-08-01  Said Abou-Hallawa  <sabouhallawa@apple.com>
>+
>+        [51] Remove the SVG elements' attributes macros
>+        https://bugs.webkit.org/show_bug.cgi?id=186751
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Remove SVG macros from SVGFEImageElement.
>+
>+        * svg/SVGFEImageElement.cpp:
>+        (WebCore::SVGFEImageElement::SVGFEImageElement):
>+        (WebCore::SVGFEImageElement::registerAttributes):
>+        (WebCore::SVGFEImageElement::parseAttribute):
>+        * svg/SVGFEImageElement.h:
>+
> 2018-08-01  Said Abou-Hallawa  <sabouhallawa@apple.com>
> 
>         [50] Remove the SVG elements' attributes macros
>diff --git a/Source/WebCore/svg/SVGFEImageElement.cpp b/Source/WebCore/svg/SVGFEImageElement.cpp
>index 0cd3d9be70e..bc36886d0ff 100644
>--- a/Source/WebCore/svg/SVGFEImageElement.cpp
>+++ b/Source/WebCore/svg/SVGFEImageElement.cpp
>@@ -2,6 +2,7 @@
>  * Copyright (C) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org>
>  * Copyright (C) 2004, 2005 Rob Buis <buis@kde.org>
>  * Copyright (C) 2010 Dirk Schulze <krit@webkit.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
>@@ -38,23 +39,13 @@ namespace WebCore {
> 
> WTF_MAKE_ISO_ALLOCATED_IMPL(SVGFEImageElement);
> 
>-// Animated property definitions
>-DEFINE_ANIMATED_PRESERVEASPECTRATIO(SVGFEImageElement, SVGNames::preserveAspectRatioAttr, PreserveAspectRatio, preserveAspectRatio)
>-DEFINE_ANIMATED_STRING(SVGFEImageElement, XLinkNames::hrefAttr, Href, href)
>-DEFINE_ANIMATED_BOOLEAN(SVGFEImageElement, SVGNames::externalResourcesRequiredAttr, ExternalResourcesRequired, externalResourcesRequired)
>-
>-BEGIN_REGISTER_ANIMATED_PROPERTIES(SVGFEImageElement)
>-    REGISTER_LOCAL_ANIMATED_PROPERTY(preserveAspectRatio)
>-    REGISTER_LOCAL_ANIMATED_PROPERTY(href)
>-    REGISTER_LOCAL_ANIMATED_PROPERTY(externalResourcesRequired)
>-    REGISTER_PARENT_ANIMATED_PROPERTIES(SVGFilterPrimitiveStandardAttributes)
>-END_REGISTER_ANIMATED_PROPERTIES
>-
> inline SVGFEImageElement::SVGFEImageElement(const QualifiedName& tagName, Document& document)
>     : SVGFilterPrimitiveStandardAttributes(tagName, document)
>+    , SVGURIReference(*this)
>+    , SVGExternalResourcesRequired(*this)
> {
>     ASSERT(hasTagName(SVGNames::feImageTag));
>-    registerAnimatedPropertiesForSVGFEImageElement();
>+    registerAttributes();
> }
> 
> Ref<SVGFEImageElement> SVGFEImageElement::create(const QualifiedName& tagName, Document& document)
>@@ -122,12 +113,20 @@ void SVGFEImageElement::buildPendingResource()
>     invalidate();
> }
> 
>+void SVGFEImageElement::registerAttributes()
>+{
>+    auto& registry = attributeRegistry();
>+    if (!registry.isEmpty())
>+        return;
>+    registry.registerAttribute<SVGNames::preserveAspectRatioAttr, &SVGFEImageElement::m_preserveAspectRatio>();
>+}
>+
> void SVGFEImageElement::parseAttribute(const QualifiedName& name, const AtomicString& value)
> {
>     if (name == SVGNames::preserveAspectRatioAttr) {
>         SVGPreserveAspectRatioValue preserveAspectRatio;
>         preserveAspectRatio.parse(value);
>-        setPreserveAspectRatioBaseValue(preserveAspectRatio);
>+        m_preserveAspectRatio.setValue(preserveAspectRatio);
>         return;
>     }
> 
>diff --git a/Source/WebCore/svg/SVGFEImageElement.h b/Source/WebCore/svg/SVGFEImageElement.h
>index 2249a855d7d..b31ade4e8e7 100644
>--- a/Source/WebCore/svg/SVGFEImageElement.h
>+++ b/Source/WebCore/svg/SVGFEImageElement.h
>@@ -1,6 +1,7 @@
> /*
>  * Copyright (C) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org>
>  * Copyright (C) 2004, 2005 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
>@@ -40,16 +41,26 @@ public:
> 
>     bool hasSingleSecurityOrigin() const;
> 
>+    const SVGPreserveAspectRatio& preserveAspectRatio() const { return m_preserveAspectRatio.currentValue(); }
>+    RefPtr<SVGPreserveAspectRatio> preserveAspectRatioAnimated() { return m_preserveAspectRatio.animatedProperty(); }
>+
> private:
>     SVGFEImageElement(const QualifiedName&, Document&);
> 
>-    void didFinishInsertingNode() override;
>+    using AttributeOwnerProxy = SVGAttributeOwnerProxyImpl<SVGFEImageElement, SVGFilterPrimitiveStandardAttributes, SVGURIReference, 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&) override;
>     void svgAttributeChanged(const QualifiedName&) override;
>-    void notifyFinished(CachedResource&) final;
> 
>+    void notifyFinished(CachedResource&) final;
>     void addSubresourceAttributeURLs(ListHashSet<URL>&) const override;
>+
>+    void didFinishInsertingNode() override;
>+
>     RefPtr<FilterEffect> build(SVGFilterBuilder*, Filter&) override;
> 
>     void clearResourceReferences();
>@@ -59,12 +70,8 @@ private:
>     InsertedIntoAncestorResult insertedIntoAncestor(InsertionType, ContainerNode&) override;
>     void removedFromAncestor(RemovalType, ContainerNode&) override;
> 
>-    BEGIN_DECLARE_ANIMATED_PROPERTIES(SVGFEImageElement)
>-        DECLARE_ANIMATED_PRESERVEASPECTRATIO(PreserveAspectRatio, preserveAspectRatio)
>-        DECLARE_ANIMATED_STRING_OVERRIDE(Href, href)
>-        DECLARE_ANIMATED_BOOLEAN_OVERRIDE(ExternalResourcesRequired, externalResourcesRequired)
>-    END_DECLARE_ANIMATED_PROPERTIES
>-
>+    AttributeOwnerProxy m_attributeOwnerProxy { *this };
>+    SVGAnimatedPreserveAspectRatioAttribute m_preserveAspectRatio { m_attributeOwnerProxy };
>     CachedResourceHandle<CachedImage> m_cachedImage;
> };
>

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