Attachment 346525 Details for Bug 186751 – Remove SVG macros from SVGImageElement

[patch] Remove SVG macros from SVGImageElement

186751-74.patch (text/plain), 13.31 KB, created by Said Abou-Hallawa on 2018-08-03 12:40:01 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Said Abou-Hallawa

Created: 2018-08-03 12:40:01 PDT

Size: 13.31 KB

patch

obsolete

>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 6584cdcbbcd..eff86160f1d 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,21 @@
>+2018-08-02  Said Abou-Hallawa  <sabouhallawa@apple.com>
>+
>+        [74] Remove the SVG elements' attributes macros
>+        https://bugs.webkit.org/show_bug.cgi?id=186751
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Remove SVG macros from SVGImageElement.
>+
>+        * svg/SVGImageElement.cpp:
>+        (WebCore::SVGImageElement::SVGImageElement):
>+        (WebCore::SVGImageElement::registerAttributes):
>+        (WebCore::SVGImageElement::parseAttribute):
>+        (WebCore::SVGImageElement::svgAttributeChanged):
>+        (WebCore::SVGImageElement::haveLoadedRequiredResources):
>+        (WebCore::SVGImageElement::isSupportedAttribute): Deleted.
>+        * svg/SVGImageElement.h:
>+
> 2018-08-02  Said Abou-Hallawa  <sabouhallawa@apple.com>
> 
>         [73] Remove the SVG elements' attributes macros
>diff --git a/Source/WebCore/svg/SVGImageElement.cpp b/Source/WebCore/svg/SVGImageElement.cpp
>index d15748c7a57..580ae997bac 100644
>--- a/Source/WebCore/svg/SVGImageElement.cpp
>+++ b/Source/WebCore/svg/SVGImageElement.cpp
>@@ -3,6 +3,7 @@
>  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Rob Buis <buis@kde.org>
>  * Copyright (C) 2006 Alexander Kellett <lypanov@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
>@@ -36,35 +37,13 @@ namespace WebCore {
> 
> WTF_MAKE_ISO_ALLOCATED_IMPL(SVGImageElement);
> 
>-// Animated property definitions
>-DEFINE_ANIMATED_LENGTH(SVGImageElement, SVGNames::xAttr, X, x)
>-DEFINE_ANIMATED_LENGTH(SVGImageElement, SVGNames::yAttr, Y, y)
>-DEFINE_ANIMATED_LENGTH(SVGImageElement, SVGNames::widthAttr, Width, width)
>-DEFINE_ANIMATED_LENGTH(SVGImageElement, SVGNames::heightAttr, Height, height)
>-DEFINE_ANIMATED_PRESERVEASPECTRATIO(SVGImageElement, SVGNames::preserveAspectRatioAttr, PreserveAspectRatio, preserveAspectRatio)
>-DEFINE_ANIMATED_STRING(SVGImageElement, XLinkNames::hrefAttr, Href, href)
>-DEFINE_ANIMATED_BOOLEAN(SVGImageElement, SVGNames::externalResourcesRequiredAttr, ExternalResourcesRequired, externalResourcesRequired)
>-
>-BEGIN_REGISTER_ANIMATED_PROPERTIES(SVGImageElement)
>-    REGISTER_LOCAL_ANIMATED_PROPERTY(x)
>-    REGISTER_LOCAL_ANIMATED_PROPERTY(y)
>-    REGISTER_LOCAL_ANIMATED_PROPERTY(width)
>-    REGISTER_LOCAL_ANIMATED_PROPERTY(height)
>-    REGISTER_LOCAL_ANIMATED_PROPERTY(preserveAspectRatio)
>-    REGISTER_LOCAL_ANIMATED_PROPERTY(href)
>-    REGISTER_LOCAL_ANIMATED_PROPERTY(externalResourcesRequired)
>-    REGISTER_PARENT_ANIMATED_PROPERTIES(SVGGraphicsElement)
>-END_REGISTER_ANIMATED_PROPERTIES
>-
> inline SVGImageElement::SVGImageElement(const QualifiedName& tagName, Document& document)
>     : SVGGraphicsElement(tagName, document)
>-    , m_x(LengthModeWidth)
>-    , m_y(LengthModeHeight)
>-    , m_width(LengthModeWidth)
>-    , m_height(LengthModeHeight)
>+    , SVGExternalResourcesRequired(*this)
>+    , SVGURIReference(*this)
>     , m_imageLoader(*this)
> {
>-    registerAnimatedPropertiesForSVGImageElement();
>+    registerAttributes();
> }
> 
> Ref<SVGImageElement> SVGImageElement::create(const QualifiedName& tagName, Document& document)
>@@ -81,17 +60,16 @@ bool SVGImageElement::hasSingleSecurityOrigin() const
>     return !image || image->hasSingleSecurityOrigin();
> }
> 
>-bool SVGImageElement::isSupportedAttribute(const QualifiedName& attrName)
>+void SVGImageElement::registerAttributes()
> {
>-    static const auto supportedAttributes = makeNeverDestroyed([] {
>-        HashSet<QualifiedName> set;
>-        SVGLangSpace::addSupportedAttributes(set);
>-        SVGExternalResourcesRequired::addSupportedAttributes(set);
>-        SVGURIReference::addSupportedAttributes(set);
>-        set.add({ SVGNames::xAttr.get(), SVGNames::yAttr.get(), SVGNames::widthAttr.get(), SVGNames::heightAttr.get(), SVGNames::preserveAspectRatioAttr.get() });
>-        return set;
>-    }());
>-    return supportedAttributes.get().contains<SVGAttributeHashTranslator>(attrName);
>+    auto& registry = attributeRegistry();
>+    if (!registry.isEmpty())
>+        return;
>+    registry.registerAttribute<SVGNames::xAttr, &SVGImageElement::m_x>();
>+    registry.registerAttribute<SVGNames::yAttr, &SVGImageElement::m_y>();
>+    registry.registerAttribute<SVGNames::widthAttr, &SVGImageElement::m_width>();
>+    registry.registerAttribute<SVGNames::heightAttr, &SVGImageElement::m_height>();
>+    registry.registerAttribute<SVGNames::preserveAspectRatioAttr, &SVGImageElement::m_preserveAspectRatio>();
> }
> 
> void SVGImageElement::parseAttribute(const QualifiedName& name, const AtomicString& value)
>@@ -99,20 +77,20 @@ void SVGImageElement::parseAttribute(const QualifiedName& name, const AtomicStri
>     if (name == SVGNames::preserveAspectRatioAttr) {
>         SVGPreserveAspectRatioValue preserveAspectRatio;
>         preserveAspectRatio.parse(value);
>-        setPreserveAspectRatioBaseValue(preserveAspectRatio);
>+        m_preserveAspectRatio.setValue(preserveAspectRatio);
>         return;
>     }
> 
>     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::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);
> 
>@@ -123,50 +101,36 @@ void SVGImageElement::parseAttribute(const QualifiedName& name, const AtomicStri
> 
> void SVGImageElement::svgAttributeChanged(const QualifiedName& attrName)
> {
>-    if (!isSupportedAttribute(attrName)) {
>-        SVGGraphicsElement::svgAttributeChanged(attrName);
>-        return;
>-    }
>-
>-    InstanceInvalidationGuard guard(*this);
>-
>-    if (attrName == SVGNames::widthAttr
>-        || attrName == SVGNames::heightAttr) {
>-        invalidateSVGPresentationAttributeStyle();
>-        return;
>-    }
>-
>-    bool isLengthAttribute = attrName == SVGNames::xAttr
>-                          || attrName == SVGNames::yAttr
>-                          || attrName == SVGNames::widthAttr
>-                          || attrName == SVGNames::heightAttr;
>-
>-    if (isLengthAttribute)
>+    if (attrName == SVGNames::xAttr || attrName == SVGNames::yAttr) {
>+        InstanceInvalidationGuard guard(*this);
>         updateRelativeLengthsInformation();
> 
>-    if (SVGURIReference::isKnownAttribute(attrName)) {
>-        m_imageLoader.updateFromElementIgnoringPreviousError();
>+        if (auto* renderer = this->renderer()) {
>+            if (downcast<RenderSVGImage>(*renderer).updateImageViewport())
>+                RenderSVGResource::markForLayoutAndParentResourceInvalidation(*renderer);
>+        }
>         return;
>     }
> 
>-    auto* renderer = this->renderer();
>-    if (!renderer)
>+    if (attrName == SVGNames::widthAttr || attrName == SVGNames::heightAttr) {
>+        InstanceInvalidationGuard guard(*this);
>+        invalidateSVGPresentationAttributeStyle();
>         return;
>+    }
> 
>-    if (isLengthAttribute) {
>-        if (downcast<RenderSVGImage>(*renderer).updateImageViewport())
>-            RenderSVGResource::markForLayoutAndParentResourceInvalidation(*renderer);
>+    if (attrName == SVGNames::preserveAspectRatioAttr) {
>+        InstanceInvalidationGuard guard(*this);
>+        RenderSVGResource::markForLayoutAndParentResourceInvalidation(*renderer);
>         return;
>     }
> 
>-    if (attrName == SVGNames::preserveAspectRatioAttr
>-        || SVGLangSpace::isKnownAttribute(attrName)
>-        || SVGExternalResourcesRequired::isKnownAttribute(attrName)) {
>-        RenderSVGResource::markForLayoutAndParentResourceInvalidation(*renderer);
>+    if (SVGURIReference::isKnownAttribute(attrName)) {
>+        m_imageLoader.updateFromElementIgnoringPreviousError();
>         return;
>     }
> 
>-    ASSERT_NOT_REACHED();
>+    SVGGraphicsElement::svgAttributeChanged(attrName);
>+    SVGExternalResourcesRequired::svgAttributeChanged(attrName);
> }
> 
> RenderPtr<RenderElement> SVGImageElement::createElementRenderer(RenderStyle&& style, const RenderTreePosition&)
>@@ -176,7 +140,7 @@ RenderPtr<RenderElement> SVGImageElement::createElementRenderer(RenderStyle&& st
> 
> bool SVGImageElement::haveLoadedRequiredResources()
> {
>-    return !externalResourcesRequiredBaseValue() || !m_imageLoader.hasPendingActivity();
>+    return !externalResourcesRequired() || !m_imageLoader.hasPendingActivity();
> }
> 
> void SVGImageElement::didAttachRenderers()
>diff --git a/Source/WebCore/svg/SVGImageElement.h b/Source/WebCore/svg/SVGImageElement.h
>index 0e85e4cccd2..5a8d5a1e8a4 100644
>--- a/Source/WebCore/svg/SVGImageElement.h
>+++ b/Source/WebCore/svg/SVGImageElement.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,7 +21,6 @@
> 
> #pragma once
> 
>-#include "SVGAnimatedBoolean.h"
> #include "SVGAnimatedLength.h"
> #include "SVGAnimatedPreserveAspectRatio.h"
> #include "SVGExternalResourcesRequired.h"
>@@ -38,37 +38,47 @@ public:
>     bool hasSingleSecurityOrigin() const;
>     const AtomicString& imageSourceURL() const final;
> 
>+    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 SVGPreserveAspectRatioValue& preserveAspectRatio() const { return m_preserveAspectRatio.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<SVGAnimatedPreserveAspectRatio> preserveAspectRatioAnimated() { return m_preserveAspectRatio.animatedProperty(); }
>+
> private:
>     SVGImageElement(const QualifiedName&, Document&);
>     
>-    bool isValid() const final { return SVGTests::isValid(); }
>+    using AttributeOwnerProxy = SVGAttributeOwnerProxyImpl<SVGImageElement, SVGGraphicsElement, SVGExternalResourcesRequired, SVGURIReference>;
>+    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 didAttachRenderers() final;
>     InsertedIntoAncestorResult insertedIntoAncestor(InsertionType, ContainerNode&) final;
>-
>     RenderPtr<RenderElement> createElementRenderer(RenderStyle&&, const RenderTreePosition&) final;
> 
>     void addSubresourceAttributeURLs(ListHashSet<URL>&) const final;
>-
>     bool haveLoadedRequiredResources() final;
> 
>+    bool isValid() const final { return SVGTests::isValid(); }
>     bool selfHasRelativeLengths() const final { return true; }
>     void didMoveToNewDocument(Document& oldDocument, Document& newDocument) final;
> 
>-    BEGIN_DECLARE_ANIMATED_PROPERTIES(SVGImageElement)
>-        DECLARE_ANIMATED_LENGTH(X, x)
>-        DECLARE_ANIMATED_LENGTH(Y, y)
>-        DECLARE_ANIMATED_LENGTH(Width, width)
>-        DECLARE_ANIMATED_LENGTH(Height, height)
>-        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 };
>+    SVGAnimatedLengthAttribute m_x { m_attributeOwnerProxy, LengthModeWidth };
>+    SVGAnimatedLengthAttribute m_y { m_attributeOwnerProxy, LengthModeHeight };
>+    SVGAnimatedLengthAttribute m_width { m_attributeOwnerProxy, LengthModeWidth };
>+    SVGAnimatedLengthAttribute m_height { m_attributeOwnerProxy, LengthModeHeight };
>+    SVGAnimatedPreserveAspectRatioAttribute m_preserveAspectRatio { m_attributeOwnerProxy };
>     SVGImageLoader m_imageLoader;
> };
>

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