Attachment 346530 Details for Bug 186751 – Remove SVG macros from SVGViewElement

[patch] Remove SVG macros from SVGViewElement

186751-79.patch (text/plain), 5.01 KB, created by Said Abou-Hallawa on 2018-08-03 12:42:48 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Said Abou-Hallawa

Created: 2018-08-03 12:42:48 PDT

Size: 5.01 KB

patch

obsolete

>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 2b26bac6dc2..a092a83ae18 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,17 @@
>+2018-08-02  Said Abou-Hallawa  <sabouhallawa@apple.com>
>+
>+        [79] Remove the SVG elements' attributes macros
>+        https://bugs.webkit.org/show_bug.cgi?id=186751
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Remove SVG macros from SVGViewElement.
>+
>+        * svg/SVGViewElement.cpp:
>+        (WebCore::SVGViewElement::SVGViewElement):
>+        (WebCore::SVGViewElement::parseAttribute):
>+        * svg/SVGViewElement.h:
>+
> 2018-08-02  Said Abou-Hallawa  <sabouhallawa@apple.com>
> 
>         [78] Remove the SVG elements' attributes macros
>diff --git a/Source/WebCore/svg/SVGViewElement.cpp b/Source/WebCore/svg/SVGViewElement.cpp
>index a93f51a23c7..30eed4b1283 100644
>--- a/Source/WebCore/svg/SVGViewElement.cpp
>+++ b/Source/WebCore/svg/SVGViewElement.cpp
>@@ -1,6 +1,7 @@
> /*
>  * Copyright (C) 2004, 2005, 2008 Nikolas Zimmermann <zimmermann@kde.org>
>  * Copyright (C) 2004, 2005, 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
>@@ -29,21 +30,11 @@ namespace WebCore {
> 
> WTF_MAKE_ISO_ALLOCATED_IMPL(SVGViewElement);
> 
>-// Animated property definitions
>-DEFINE_ANIMATED_BOOLEAN(SVGViewElement, SVGNames::externalResourcesRequiredAttr, ExternalResourcesRequired, externalResourcesRequired)
>-DEFINE_ANIMATED_RECT(SVGViewElement, SVGNames::viewBoxAttr, ViewBox, viewBox)
>-DEFINE_ANIMATED_PRESERVEASPECTRATIO(SVGViewElement, SVGNames::preserveAspectRatioAttr, PreserveAspectRatio, preserveAspectRatio)
>-
>-BEGIN_REGISTER_ANIMATED_PROPERTIES(SVGViewElement)
>-    REGISTER_LOCAL_ANIMATED_PROPERTY(externalResourcesRequired)
>-    REGISTER_LOCAL_ANIMATED_PROPERTY(viewBox)
>-    REGISTER_LOCAL_ANIMATED_PROPERTY(preserveAspectRatio)
>-    REGISTER_PARENT_ANIMATED_PROPERTIES(SVGElement)
>-END_REGISTER_ANIMATED_PROPERTIES
>-
> inline SVGViewElement::SVGViewElement(const QualifiedName& tagName, Document& document)
>     : SVGElement(tagName, document)
>-    , m_zoomAndPan(SVGZoomAndPanMagnify)
>+    , SVGExternalResourcesRequired(*this)
>+    , SVGFitToViewBox(*this)
>+    , SVGZoomAndPan(*this)
>     , m_viewTarget(SVGNames::viewTargetAttr)
> {
>     ASSERT(hasTagName(SVGNames::viewTag));
>@@ -65,10 +56,10 @@ void SVGViewElement::parseAttribute(const QualifiedName& name, const AtomicStrin
>     if (name == SVGNames::viewTargetAttr)
>         m_viewTarget.reset(value);
> 
>-    SVGExternalResourcesRequired::parseAttribute(name, value);
>-    SVGFitToViewBox::parseAttribute(this, name, value);
>-    SVGZoomAndPan::parseAttribute(*this, name, value);
>     SVGElement::parseAttribute(name, value);
>+    SVGExternalResourcesRequired::parseAttribute(name, value);
>+    SVGFitToViewBox::parseAttribute(name, value);
>+    SVGZoomAndPan::parseAttribute(name, value);
> }
> 
> }
>diff --git a/Source/WebCore/svg/SVGViewElement.h b/Source/WebCore/svg/SVGViewElement.h
>index 0e6090f6e86..d65399e6670 100644
>--- a/Source/WebCore/svg/SVGViewElement.h
>+++ b/Source/WebCore/svg/SVGViewElement.h
>@@ -1,6 +1,7 @@
> /*
>  * Copyright (C) 2004, 2005, 2008 Nikolas Zimmermann <zimmermann@kde.org>
>  * Copyright (C) 2004, 2005, 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
>@@ -20,13 +21,9 @@
> 
> #pragma once
> 
>-#include "SVGAnimatedBoolean.h"
>-#include "SVGAnimatedPreserveAspectRatio.h"
>-#include "SVGAnimatedRect.h"
> #include "SVGElement.h"
> #include "SVGExternalResourcesRequired.h"
> #include "SVGFitToViewBox.h"
>-#include "SVGStringListValues.h"
> #include "SVGZoomAndPan.h"
> 
> namespace WebCore {
>@@ -42,24 +39,18 @@ public:
>     using SVGElement::deref;
> 
>     Ref<SVGStringList> viewTarget();
>-    SVGZoomAndPanType zoomAndPan() const { return m_zoomAndPan; }
>-    void setZoomAndPan(unsigned short zoomAndPan) { m_zoomAndPan = SVGZoomAndPan::parseFromNumber(zoomAndPan); }
> 
> private:
>     SVGViewElement(const QualifiedName&, Document&);
> 
>     // FIXME: svgAttributeChanged missing.
>+    using AttributeOwnerProxy = SVGAttributeOwnerProxyImpl<SVGViewElement, SVGElement, SVGExternalResourcesRequired, SVGFitToViewBox, SVGZoomAndPan>;
>+    void parseAttribute(const QualifiedName&, const AtomicString&) final;
>     void parseAttribute(const QualifiedName&, const AtomicString&) final;
> 
>     bool rendererIsNeeded(const RenderStyle&) final { return false; }
> 
>-    BEGIN_DECLARE_ANIMATED_PROPERTIES(SVGViewElement)
>-        DECLARE_ANIMATED_BOOLEAN_OVERRIDE(ExternalResourcesRequired, externalResourcesRequired)
>-        DECLARE_ANIMATED_RECT(ViewBox, viewBox)
>-        DECLARE_ANIMATED_PRESERVEASPECTRATIO(PreserveAspectRatio, preserveAspectRatio)
>-    END_DECLARE_ANIMATED_PROPERTIES
>-
>-    SVGZoomAndPanType m_zoomAndPan;
>+    AttributeOwnerProxy m_attributeOwnerProxy { *this };
>     SVGStringListValues m_viewTarget;
> };
>

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