Attachment 346188 Details for Bug 186751 – Delete SVG macros for SVGAnimatedNumber

[patch] Delete SVG macros for SVGAnimatedNumber

186751-10.patch (text/plain), 5.14 KB, created by Said Abou-Hallawa on 2018-07-31 12:12:32 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Said Abou-Hallawa

Created: 2018-07-31 12:12:32 PDT

Size: 5.14 KB

patch

obsolete

>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index a3d0c06c1ea..288cbbb0b4b 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,29 @@
>+2018-07-31  Said Abou-Hallawa  <sabouhallawa@apple.com>
>+
>+        [10] Remove the SVG elements' attributes macros
>+        https://bugs.webkit.org/show_bug.cgi?id=186751
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Remove SVG macros for SVGAnimatedNumber.
>+
>+        1. Define SVGAnimatedNumberAttribute, SVGAnimatedNumberAttributeAccessor
>+           and SVGAnimatedOptionalNumberAttributeAccessor.
>+        2. Add template functions in SVGAttributeRegistry for registering
>+           attributes of type SVGAnimatedNumberAttribute.
>+
>+        An example of registering SVGAnimatedNumberAttribute:
>+            registry.registerAttribute<SVGNames::divisorAttr, &SVGFEConvolveMatrixElement::m_divisor>();
>+
>+        An example of registering optional SVGAnimatedNumberAttributes:
>+            registry.registerAttribute<SVGNames::kernelUnitLengthAttr,
>+                &SVGFEConvolveMatrixElement::kernelUnitLengthXIdentifier, &SVGFEConvolveMatrixElement::m_kernelUnitLengthX,
>+                &SVGFEConvolveMatrixElement::kernelUnitLengthYIdentifier, &SVGFEConvolveMatrixElement::m_kernelUnitLengthY>();
>+
>+        * svg/SVGAnimatedNumber.h:
>+        * svg/properties/SVGAttributeRegistry.h:
>+        (WebCore::SVGAttributeRegistry::registerAttribute):
>+
> 2018-07-31  Said Abou-Hallawa  <sabouhallawa@apple.com>
> 
>         [9] Remove the SVG elements' attributes macros
>diff --git a/Source/WebCore/svg/SVGAnimatedNumber.h b/Source/WebCore/svg/SVGAnimatedNumber.h
>index 0e19d4d3e66..da3d96b4034 100644
>--- a/Source/WebCore/svg/SVGAnimatedNumber.h
>+++ b/Source/WebCore/svg/SVGAnimatedNumber.h
>@@ -1,5 +1,6 @@
> /*
>  * Copyright (C) Research In Motion Limited 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
>@@ -19,25 +20,22 @@
> 
> #pragma once
> 
>-#include "SVGAnimatedPropertyMacros.h"
> #include "SVGAnimatedStaticPropertyTearOff.h"
> #include "SVGAnimatedTypeAnimator.h"
>+#include "SVGAttributeAccessor.h"
> 
> namespace WebCore {
> 
>-typedef SVGAnimatedStaticPropertyTearOff<float> SVGAnimatedNumber;
>-
>-// Helper macros to declare/define a SVGAnimatedNumber object
>-#define DECLARE_ANIMATED_NUMBER(UpperProperty, LowerProperty) \
>-DECLARE_ANIMATED_PROPERTY(SVGAnimatedNumber, float, UpperProperty, LowerProperty, )
>+class SVGAnimationElement;
> 
>-#define DEFINE_ANIMATED_NUMBER(OwnerType, DOMAttribute, UpperProperty, LowerProperty) \
>-DEFINE_ANIMATED_PROPERTY(AnimatedNumber, OwnerType, DOMAttribute, DOMAttribute->localName(), UpperProperty, LowerProperty)
>+using SVGAnimatedNumber = SVGAnimatedStaticPropertyTearOff<float>;
>+using SVGAnimatedNumberAttribute = SVGAnimatedAttribute<SVGAnimatedNumber>;
> 
>-#define DEFINE_ANIMATED_NUMBER_MULTIPLE_WRAPPERS(OwnerType, DOMAttribute, SVGDOMAttributeIdentifier, UpperProperty, LowerProperty) \
>-DEFINE_ANIMATED_PROPERTY(AnimatedNumberOptionalNumber, OwnerType, DOMAttribute, SVGDOMAttributeIdentifier, UpperProperty, LowerProperty)
>+template<typename OwnerType>
>+using SVGAnimatedNumberAttributeAccessor = SVGAnimatedAttributeAccessor<OwnerType, SVGAnimatedNumberAttribute, AnimatedNumber>;
> 
>-class SVGAnimationElement;
>+template<typename OwnerType>
>+using SVGAnimatedOptionalNumberAttributeAccessor = SVGAnimatedOptionalAttributeAccessor<OwnerType, SVGAnimatedNumberAttribute, AnimatedNumberOptionalNumber>;
> 
> class SVGAnimatedNumberAnimator final : public SVGAnimatedTypeAnimator {
> public:
>diff --git a/Source/WebCore/svg/properties/SVGAttributeRegistry.h b/Source/WebCore/svg/properties/SVGAttributeRegistry.h
>index f30cbee4202..39e444214dc 100644
>--- a/Source/WebCore/svg/properties/SVGAttributeRegistry.h
>+++ b/Source/WebCore/svg/properties/SVGAttributeRegistry.h
>@@ -29,6 +29,7 @@
> #include "SVGAnimatedInteger.h"
> #include "SVGAnimatedLength.h"
> #include "SVGAnimatedLengthList.h"
>+#include "SVGAnimatedNumber.h"
> #include <wtf/HashMap.h>
> 
> namespace WebCore {
>@@ -74,6 +75,20 @@ public:
>         registerAttribute(SVGAnimatedLengthListAttributeAccessor<OwnerType>::template singleton<attributeName, attribute>());
>     }
> 
>+    template<const LazyNeverDestroyed<const QualifiedName>& attributeName, SVGAnimatedNumberAttribute OwnerType::*attribute>
>+    void registerAttribute()
>+    {
>+        registerAttribute(SVGAnimatedNumberAttributeAccessor<OwnerType>::template singleton<attributeName, attribute>());
>+    }
>+
>+    template<const LazyNeverDestroyed<const QualifiedName>& attributeName,
>+        const AtomicString& (*identifier)(), SVGAnimatedNumberAttribute OwnerType::*attribute,
>+        const AtomicString& (*optionalIdentifier)(), SVGAnimatedNumberAttribute OwnerType::*optionalAttribute>
>+    void registerAttribute()
>+    {
>+        registerAttribute(SVGAnimatedOptionalNumberAttributeAccessor<OwnerType>::template singleton<attributeName, identifier, attribute, optionalIdentifier, optionalAttribute>());
>+    }
>+
>     bool isEmpty() const { return m_map.isEmpty(); }
> 
>     bool isKnownAttribute(const QualifiedName& attributeName) const

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