Replace WTF_MAKE_NONCOPYABLE with DISALLOW_COPY_AND_ASSIGN in core/svg/*

This change is for files in the path
//third_party/WebKit/Source/core/svg/.

Added the include for base/macros.h where needed and moved the macro to the
end of the class as per the code guidelines enforced by lint.

This CL introduces no logic changes.

Bug: 565932
Cq-Include-Trybots: master.tryserver.chromium.linux:linux_layout_tests_slimming_paint_v2
Change-Id: I675071e07aaf9d5f6ad5ef06e1def1a4b796e6bb
Reviewed-on: https://chromium-review.googlesource.com/816234Reviewed-by: Chris Watkins <watk@chromium.org>
Reviewed-by: Sasha Morrissey <sashab@chromium.org>
Commit-Queue: Eve Martin-Jones <evem@chromium.org>
Cr-Commit-Position: refs/heads/master@{#523345}

third_party/WebKit/Source/core/svg/SVGDocumentExtensions.h

@@ -21,6 +21,7 @@
 #ifndef SVGDocumentExtensions_h
 #define SVGDocumentExtensions_h
 
+#include "base/macros.h"
 #include "core/layout/svg/SVGResourcesCache.h"
 #include "platform/geometry/FloatPoint.h"
 #include "platform/heap/Handle.h"
@@ -36,8 +37,6 @@ class SubtreeLayoutScope;
 
 class SVGDocumentExtensions
     : public GarbageCollectedFinalized<SVGDocumentExtensions> {
-  WTF_MAKE_NONCOPYABLE(SVGDocumentExtensions);
-
  public:
   explicit SVGDocumentExtensions(Document*);
   ~SVGDocumentExtensions();
@@ -86,6 +85,7 @@ class SVGDocumentExtensions
 #if DCHECK_IS_ON()
   bool in_relative_length_svg_roots_invalidation_ = false;
 #endif
+  DISALLOW_COPY_AND_ASSIGN(SVGDocumentExtensions);
 };
 
 }  // namespace blink

third_party/WebKit/Source/core/svg/SVGElement.h

@@ -22,6 +22,7 @@
 #ifndef SVGElement_h
 #define SVGElement_h
 
+#include "base/macros.h"
 #include "core/CoreExport.h"
 #include "core/dom/Element.h"
 #include "core/svg/SVGParsingError.h"
@@ -181,7 +182,6 @@ class CORE_EXPORT SVGElement : public Element {
 
   class InvalidationGuard {
     STACK_ALLOCATED();
-    WTF_MAKE_NONCOPYABLE(InvalidationGuard);
 
    public:
     InvalidationGuard(SVGElement* element) : element_(element) {}
@@ -189,11 +189,11 @@ class CORE_EXPORT SVGElement : public Element {
 
    private:
     Member<SVGElement> element_;
+    DISALLOW_COPY_AND_ASSIGN(InvalidationGuard);
   };
 
   class InstanceUpdateBlocker {
     STACK_ALLOCATED();
-    WTF_MAKE_NONCOPYABLE(InstanceUpdateBlocker);
 
    public:
     InstanceUpdateBlocker(SVGElement* target_element);
@@ -201,6 +201,7 @@ class CORE_EXPORT SVGElement : public Element {
 
    private:
     Member<SVGElement> target_element_;
+    DISALLOW_COPY_AND_ASSIGN(InstanceUpdateBlocker);
   };
 
   void InvalidateInstances();

third_party/WebKit/Source/core/svg/SVGElementRareData.h

@@ -20,12 +20,12 @@
 #ifndef SVGElementRareData_h
 #define SVGElementRareData_h
 
+#include "base/macros.h"
 #include "core/style/ComputedStyle.h"
 #include "core/svg/SVGElement.h"
 #include "platform/heap/Handle.h"
 #include "platform/transforms/AffineTransform.h"
 #include "platform/wtf/HashSet.h"
-#include "platform/wtf/Noncopyable.h"
 
 namespace blink {
 
@@ -33,8 +33,6 @@ class SVGElementProxySet;
 
 class SVGElementRareData
     : public GarbageCollectedFinalized<SVGElementRareData> {
-  WTF_MAKE_NONCOPYABLE(SVGElementRareData);
-
  public:
   SVGElementRareData(SVGElement* owner)
       : owner_(owner),
@@ -120,6 +118,7 @@ class SVGElementRareData
   scoped_refptr<ComputedStyle> override_computed_style_;
   // Used by <animateMotion>
   AffineTransform animate_motion_transform_;
+  DISALLOW_COPY_AND_ASSIGN(SVGElementRareData);
 };
 
 }  // namespace blink

third_party/WebKit/Source/core/svg/SVGPathBlender.h

@@ -20,8 +20,8 @@
 #ifndef SVGPathBlender_h
 #define SVGPathBlender_h
 
+#include "base/macros.h"
 #include "platform/heap/Handle.h"
-#include "platform/wtf/Noncopyable.h"
 
 namespace blink {
 
@@ -29,7 +29,6 @@ class SVGPathConsumer;
 class SVGPathByteStreamSource;
 
 class SVGPathBlender final {
-  WTF_MAKE_NONCOPYABLE(SVGPathBlender);
   STACK_ALLOCATED();
 
  public:
@@ -47,6 +46,7 @@ class SVGPathBlender final {
   SVGPathByteStreamSource* from_source_;
   SVGPathByteStreamSource* to_source_;
   SVGPathConsumer* consumer_;
+  DISALLOW_COPY_AND_ASSIGN(SVGPathBlender);
 };
 
 }  // namespace blink

third_party/WebKit/Source/core/svg/SVGPathByteStream.h

@@ -21,7 +21,6 @@
 #define SVGPathByteStream_h
 
 #include <memory>
-#include "platform/wtf/Noncopyable.h"
 #include "platform/wtf/PtrUtil.h"
 #include "platform/wtf/Vector.h"
 

third_party/WebKit/Source/core/svg/SVGPathByteStreamSource.h

@@ -20,6 +20,7 @@
 #ifndef SVGPathByteStreamSource_h
 #define SVGPathByteStreamSource_h
 
+#include "base/macros.h"
 #include "build/build_config.h"
 #include "core/svg/SVGPathByteStream.h"
 #include "core/svg/SVGPathData.h"
@@ -28,7 +29,6 @@
 namespace blink {
 
 class SVGPathByteStreamSource {
-  WTF_MAKE_NONCOPYABLE(SVGPathByteStreamSource);
   STACK_ALLOCATED();
 
  public:
@@ -63,6 +63,7 @@ class SVGPathByteStreamSource {
 
   SVGPathByteStream::DataIterator stream_current_;
   SVGPathByteStream::DataIterator stream_end_;
+  DISALLOW_COPY_AND_ASSIGN(SVGPathByteStreamSource);
 };
 
 }  // namespace blink

third_party/WebKit/Source/core/svg/SVGPathConsumer.h

@@ -24,16 +24,15 @@
 #ifndef SVGPathConsumer_h
 #define SVGPathConsumer_h
 
+#include "base/macros.h"
 #include "core/CoreExport.h"
 #include "platform/heap/Handle.h"
-#include "platform/wtf/Noncopyable.h"
 
 namespace blink {
 
 struct PathSegmentData;
 
 class CORE_EXPORT SVGPathConsumer {
-  WTF_MAKE_NONCOPYABLE(SVGPathConsumer);
   STACK_ALLOCATED();
 
  public:
@@ -41,6 +40,9 @@ class CORE_EXPORT SVGPathConsumer {
   virtual ~SVGPathConsumer() {}
 
   virtual void EmitSegment(const PathSegmentData&) = 0;
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(SVGPathConsumer);
 };
 
 }  // namespace blink

third_party/WebKit/Source/core/svg/graphics/SVGImage.h

@@ -27,6 +27,7 @@
 #ifndef SVGImage_h
 #define SVGImage_h
 
+#include "base/macros.h"
 #include "core/CoreExport.h"
 #include "platform/graphics/Image.h"
 #include "platform/graphics/paint/PaintRecord.h"
@@ -239,7 +240,6 @@ DEFINE_IMAGE_TYPE_CASTS(SVGImage);
 
 class ImageObserverDisabler {
   STACK_ALLOCATED();
-  WTF_MAKE_NONCOPYABLE(ImageObserverDisabler);
 
  public:
   ImageObserverDisabler(Image* image) : image_(image) {
@@ -250,6 +250,7 @@ class ImageObserverDisabler {
 
  private:
   Image* image_;
+  DISALLOW_COPY_AND_ASSIGN(ImageObserverDisabler);
 };
 
 }  // namespace blink

third_party/WebKit/Source/core/svg/properties/SVGAnimatedProperty.h

@@ -31,11 +31,11 @@ G*     * Redistributions in binary form must reproduce the above
 #ifndef SVGAnimatedProperty_h
 #define SVGAnimatedProperty_h
 
+#include "base/macros.h"
 #include "core/svg/SVGParsingError.h"
 #include "core/svg/properties/SVGPropertyInfo.h"
 #include "core/svg/properties/SVGPropertyTearOff.h"
 #include "platform/heap/Handle.h"
-#include "platform/wtf/Noncopyable.h"
 
 namespace blink {
 
@@ -43,8 +43,6 @@ class ExceptionState;
 class SVGElement;
 
 class SVGAnimatedPropertyBase : public GarbageCollectedMixin {
-  WTF_MAKE_NONCOPYABLE(SVGAnimatedPropertyBase);
-
  public:
   virtual ~SVGAnimatedPropertyBase();
 
@@ -105,6 +103,7 @@ class SVGAnimatedPropertyBase : public GarbageCollectedMixin {
   UntracedMember<SVGElement> context_element_;
 
   const QualifiedName& attribute_name_;
+  DISALLOW_COPY_AND_ASSIGN(SVGAnimatedPropertyBase);
 };
 
 template <typename Property>

third_party/WebKit/Source/core/svg/properties/SVGProperty.h

@@ -31,9 +31,9 @@
 #ifndef SVGProperty_h
 #define SVGProperty_h
 
+#include "base/macros.h"
 #include "core/svg/properties/SVGPropertyInfo.h"
 #include "platform/heap/Handle.h"
-#include "platform/wtf/Noncopyable.h"
 #include "platform/wtf/text/WTFString.h"
 
 namespace blink {
@@ -42,8 +42,6 @@ class SVGElement;
 class SVGAnimationElement;
 
 class SVGPropertyBase : public GarbageCollectedFinalized<SVGPropertyBase> {
-  WTF_MAKE_NONCOPYABLE(SVGPropertyBase);
-
  public:
   // Properties do not have a primitive type by default
   typedef void PrimitiveType;
@@ -92,6 +90,7 @@ class SVGPropertyBase : public GarbageCollectedFinalized<SVGPropertyBase> {
   // hierarchy.  Not tracing it is safe, albeit an undesirable state of affairs.
   // See http://crbug.com/528275 for the detail.
   UntracedMember<SVGPropertyBase> owner_list_;
+  DISALLOW_COPY_AND_ASSIGN(SVGPropertyBase);
 };
 
 #define DEFINE_SVG_PROPERTY_TYPE_CASTS(thisType)               \