Replace WTF_MAKE_NONCOPYABLE with DISALLOW_COPY_AND_ASSIGN in core/input
This change is for files in the path
//third_party/WebKit/Source/core/input/.
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
Change-Id: Iddee9a764141bd1960aac757dd5b1a0b9987f48e
Reviewed-on: https://chromium-review.googlesource.com/813554
Reviewed-by: Sasha Morrissey <sashab@chromium.org>
Commit-Queue: Eve Martin-Jones <evem@chromium.org>
Cr-Commit-Position: refs/heads/master@{#522684}
diff --git a/third_party/WebKit/Source/core/input/EventHandler.h b/third_party/WebKit/Source/core/input/EventHandler.h
index 7cec4ea..ad9f3b46 100644
--- a/third_party/WebKit/Source/core/input/EventHandler.h
+++ b/third_party/WebKit/Source/core/input/EventHandler.h
@@ -26,6 +26,7 @@
#ifndef EventHandler_h
#define EventHandler_h
+#include "base/macros.h"
#include "base/memory/scoped_refptr.h"
#include "core/CoreExport.h"
#include "core/dom/UserGestureIndicator.h"
@@ -78,8 +79,6 @@
class CORE_EXPORT EventHandler final
: public GarbageCollectedFinalized<EventHandler> {
- WTF_MAKE_NONCOPYABLE(EventHandler);
-
public:
explicit EventHandler(LocalFrame&);
void Trace(blink::Visitor*);
@@ -438,6 +437,8 @@
EditableAnchorTextCanStartSelection);
FRIEND_TEST_ALL_PREFIXES(EventHandlerTest,
ReadOnlyInputDoesNotInheritUserSelect);
+
+ DISALLOW_COPY_AND_ASSIGN(EventHandler);
};
} // namespace blink
diff --git a/third_party/WebKit/Source/core/input/GestureManager.h b/third_party/WebKit/Source/core/input/GestureManager.h
index a58c206..b4f5b84 100644
--- a/third_party/WebKit/Source/core/input/GestureManager.h
+++ b/third_party/WebKit/Source/core/input/GestureManager.h
@@ -5,6 +5,7 @@
#ifndef GestureManager_h
#define GestureManager_h
+#include "base/macros.h"
#include "core/CoreExport.h"
#include "core/frame/LocalFrame.h"
#include "core/layout/HitTestRequest.h"
@@ -24,8 +25,6 @@
// gesture to the responsible class.
class CORE_EXPORT GestureManager
: public GarbageCollectedFinalized<GestureManager> {
- WTF_MAKE_NONCOPYABLE(GestureManager);
-
public:
GestureManager(LocalFrame&,
ScrollManager&,
@@ -80,6 +79,7 @@
const Member<SelectionController> selection_controller_;
WTF::Optional<WTF::TimeTicks> last_show_press_timestamp_;
+ DISALLOW_COPY_AND_ASSIGN(GestureManager);
};
} // namespace blink
diff --git a/third_party/WebKit/Source/core/input/MouseEventManager.h b/third_party/WebKit/Source/core/input/MouseEventManager.h
index 1134707..02a005d 100644
--- a/third_party/WebKit/Source/core/input/MouseEventManager.h
+++ b/third_party/WebKit/Source/core/input/MouseEventManager.h
@@ -5,6 +5,7 @@
#ifndef MouseEventManager_h
#define MouseEventManager_h
+#include "base/macros.h"
#include "core/CoreExport.h"
#include "core/dom/SynchronousMutationObserver.h"
#include "core/input/BoundaryEventDispatcher.h"
@@ -35,7 +36,6 @@
class CORE_EXPORT MouseEventManager final
: public GarbageCollectedFinalized<MouseEventManager>,
public SynchronousMutationObserver {
- WTF_MAKE_NONCOPYABLE(MouseEventManager);
USING_GARBAGE_COLLECTED_MIXIN(MouseEventManager);
public:
@@ -154,8 +154,6 @@
private:
class MouseEventBoundaryEventDispatcher : public BoundaryEventDispatcher {
- WTF_MAKE_NONCOPYABLE(MouseEventBoundaryEventDispatcher);
-
public:
MouseEventBoundaryEventDispatcher(MouseEventManager*,
const WebMouseEvent*,
@@ -185,6 +183,7 @@
const WebMouseEvent* web_mouse_event_;
Member<EventTarget> exited_target_;
String canvas_region_id_;
+ DISALLOW_COPY_AND_ASSIGN(MouseEventBoundaryEventDispatcher);
};
// If the given element is a shadow host and its root has delegatesFocus=false
@@ -246,6 +245,8 @@
LayoutPoint drag_start_pos_;
TaskRunnerTimer<MouseEventManager> fake_mouse_move_event_timer_;
+
+ DISALLOW_COPY_AND_ASSIGN(MouseEventManager);
};
} // namespace blink
diff --git a/third_party/WebKit/Source/core/input/PointerEventManager.h b/third_party/WebKit/Source/core/input/PointerEventManager.h
index 68a09a69..5cd4178 100644
--- a/third_party/WebKit/Source/core/input/PointerEventManager.h
+++ b/third_party/WebKit/Source/core/input/PointerEventManager.h
@@ -5,6 +5,7 @@
#ifndef PointerEventManager_h
#define PointerEventManager_h
+#include "base/macros.h"
#include "core/CoreExport.h"
#include "core/events/PointerEvent.h"
#include "core/events/PointerEventFactory.h"
@@ -24,8 +25,6 @@
// properties of active pointer events.
class CORE_EXPORT PointerEventManager
: public GarbageCollectedFinalized<PointerEventManager> {
- WTF_MAKE_NONCOPYABLE(PointerEventManager);
-
public:
PointerEventManager(LocalFrame&, MouseEventManager&);
void Trace(blink::Visitor*);
@@ -116,8 +115,6 @@
};
class PointerEventBoundaryEventDispatcher : public BoundaryEventDispatcher {
- WTF_MAKE_NONCOPYABLE(PointerEventBoundaryEventDispatcher);
-
public:
PointerEventBoundaryEventDispatcher(PointerEventManager*, PointerEvent*);
@@ -140,6 +137,7 @@
bool check_for_listener);
Member<PointerEventManager> pointer_event_manager_;
Member<PointerEvent> pointer_event_;
+ DISALLOW_COPY_AND_ASSIGN(PointerEventBoundaryEventDispatcher);
};
// Sends pointercancels for existing PointerEvents that are interrupted.
@@ -246,6 +244,8 @@
// The pointerId of the PointerEvent currently being dispatched within this
// frame or 0 if none.
int dispatching_pointer_id_;
+
+ DISALLOW_COPY_AND_ASSIGN(PointerEventManager);
};
} // namespace blink
diff --git a/third_party/WebKit/Source/core/input/TouchEventManager.h b/third_party/WebKit/Source/core/input/TouchEventManager.h
index c473625..6a08fdb3 100644
--- a/third_party/WebKit/Source/core/input/TouchEventManager.h
+++ b/third_party/WebKit/Source/core/input/TouchEventManager.h
@@ -5,6 +5,7 @@
#ifndef TouchEventManager_h
#define TouchEventManager_h
+#include "base/macros.h"
#include "core/CoreExport.h"
#include "core/events/PointerEventFactory.h"
#include "core/input/EventHandlingUtil.h"
@@ -26,8 +27,6 @@
// maintaining related states.
class CORE_EXPORT TouchEventManager
: public GarbageCollectedFinalized<TouchEventManager> {
- WTF_MAKE_NONCOPYABLE(TouchEventManager);
-
public:
explicit TouchEventManager(LocalFrame&);
@@ -111,6 +110,8 @@
// The current touch action, computed on each touch start and is
// a union of all touches. Reset when all touches are released.
TouchAction current_touch_action_;
+
+ DISALLOW_COPY_AND_ASSIGN(TouchEventManager);
};
} // namespace blink