Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1056)

Unified Diff: ui/events/test/mock_motion_event.cc

Issue 502993004: Remove abstract Clone and Cancel methods from MotionEvent (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Nasty bug fix Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/events/test/mock_motion_event.h ('k') | ui/events/test/motion_event_test_utils.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/test/mock_motion_event.cc
diff --git a/ui/events/test/mock_motion_event.cc b/ui/events/test/mock_motion_event.cc
deleted file mode 100644
index f3de1ddceee8408c8d96a0a43824e0537316f7f0..0000000000000000000000000000000000000000
--- a/ui/events/test/mock_motion_event.cc
+++ /dev/null
@@ -1,177 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "ui/events/test/mock_motion_event.h"
-
-#include "base/logging.h"
-
-using base::TimeTicks;
-
-namespace ui {
-namespace test {
-namespace {
-
-PointerProperties CreatePointer() {
- PointerProperties pointer;
- pointer.touch_major = MockMotionEvent::TOUCH_MAJOR;
- return pointer;
-}
-
-PointerProperties CreatePointer(float x, float y, int id) {
- PointerProperties pointer(x, y);
- pointer.touch_major = MockMotionEvent::TOUCH_MAJOR;
- pointer.id = id;
- return pointer;
-}
-
-
-} // namespace
-
-MockMotionEvent::MockMotionEvent()
- : MotionEventGeneric(ACTION_CANCEL, base::TimeTicks(), CreatePointer()) {
-}
-
-MockMotionEvent::MockMotionEvent(Action action)
- : MotionEventGeneric(action, base::TimeTicks(), CreatePointer()) {
-}
-
-MockMotionEvent::MockMotionEvent(Action action,
- TimeTicks time,
- float x0,
- float y0)
- : MotionEventGeneric(action, time, CreatePointer(x0, y0, 0)) {
-}
-
-MockMotionEvent::MockMotionEvent(Action action,
- TimeTicks time,
- float x0,
- float y0,
- float x1,
- float y1)
- : MotionEventGeneric(action, time, CreatePointer(x0, y0, 0)) {
- PushPointer(x1, y1);
- if (action == ACTION_POINTER_UP || action == ACTION_POINTER_DOWN)
- set_action_index(1);
-}
-
-MockMotionEvent::MockMotionEvent(Action action,
- TimeTicks time,
- float x0,
- float y0,
- float x1,
- float y1,
- float x2,
- float y2)
- : MotionEventGeneric(action, time, CreatePointer(x0, y0, 0)) {
- PushPointer(x1, y1);
- PushPointer(x2, y2);
- if (action == ACTION_POINTER_UP || action == ACTION_POINTER_DOWN)
- set_action_index(2);
-}
-
-MockMotionEvent::MockMotionEvent(Action action,
- base::TimeTicks time,
- const std::vector<gfx::PointF>& positions) {
- set_action(action);
- set_event_time(time);
- if (action == ACTION_POINTER_UP || action == ACTION_POINTER_DOWN)
- set_action_index(static_cast<int>(positions.size()) - 1);
- for (size_t i = 0; i < positions.size(); ++i)
- PushPointer(positions[i].x(), positions[i].y());
-}
-
-MockMotionEvent::MockMotionEvent(const MockMotionEvent& other)
- : MotionEventGeneric(other) {
-}
-
-MockMotionEvent::~MockMotionEvent() {}
-
-scoped_ptr<MotionEvent> MockMotionEvent::Clone() const {
- return scoped_ptr<MotionEvent>(new MockMotionEvent(*this));
-}
-
-scoped_ptr<MotionEvent> MockMotionEvent::Cancel() const {
- scoped_ptr<MockMotionEvent> event(new MockMotionEvent(*this));
- event->set_action(MotionEvent::ACTION_CANCEL);
- return event.Pass();
-}
-
-void MockMotionEvent::PressPoint(float x, float y) {
- ResolvePointers();
- PushPointer(x, y);
- if (GetPointerCount() > 1) {
- set_action_index(static_cast<int>(GetPointerCount()) - 1);
- set_action(ACTION_POINTER_DOWN);
- } else {
- set_action(ACTION_DOWN);
- }
-}
-
-void MockMotionEvent::MovePoint(size_t index, float x, float y) {
- ResolvePointers();
- DCHECK_LT(index, GetPointerCount());
- PointerProperties& p = pointer(index);
- float dx = x - p.x;
- float dy = x - p.y;
- p.x = x;
- p.y = y;
- p.raw_x += dx;
- p.raw_y += dy;
- set_action(ACTION_MOVE);
-}
-
-void MockMotionEvent::ReleasePoint() {
- ResolvePointers();
- DCHECK_GT(GetPointerCount(), 0U);
- if (GetPointerCount() > 1) {
- set_action_index(static_cast<int>(GetPointerCount()) - 1);
- set_action(ACTION_POINTER_UP);
- } else {
- set_action(ACTION_UP);
- }
-}
-
-void MockMotionEvent::CancelPoint() {
- ResolvePointers();
- DCHECK_GT(GetPointerCount(), 0U);
- set_action(ACTION_CANCEL);
-}
-
-void MockMotionEvent::SetTouchMajor(float new_touch_major) {
- for (size_t i = 0; i < GetPointerCount(); ++i)
- pointer(i).touch_major = new_touch_major;
-}
-
-void MockMotionEvent::SetRawOffset(float raw_offset_x, float raw_offset_y) {
- for (size_t i = 0; i < GetPointerCount(); ++i) {
- pointer(i).raw_x = pointer(i).x + raw_offset_x;
- pointer(i).raw_y = pointer(i).y + raw_offset_y;
- }
-}
-
-void MockMotionEvent::SetToolType(size_t pointer_index, ToolType tool_type) {
- DCHECK_LT(pointer_index, GetPointerCount());
- pointer(pointer_index).tool_type = tool_type;
-}
-
-void MockMotionEvent::PushPointer(float x, float y) {
- MotionEventGeneric::PushPointer(
- CreatePointer(x, y, static_cast<int>(GetPointerCount())));
-}
-
-void MockMotionEvent::ResolvePointers() {
- set_action_index(-1);
- switch (GetAction()) {
- case ACTION_UP:
- case ACTION_POINTER_UP:
- case ACTION_CANCEL:
- PopPointer();
- return;
- default:
- break;
- }
-}
-
-} // namespace test
-} // namespace ui
« no previous file with comments | « ui/events/test/mock_motion_event.h ('k') | ui/events/test/motion_event_test_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698