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

Side by Side Diff: content/renderer/input/input_handler_proxy_unittest.cc

Issue 206793003: cc: Split animating and drawing into separate actions (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed comments and rebased. Created 6 years, 8 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/input/input_handler_proxy.h" 5 #include "content/renderer/input/input_handler_proxy.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "cc/base/swap_promise_monitor.h" 9 #include "cc/base/swap_promise_monitor.h"
10 #include "content/common/input/did_overscroll_params.h" 10 #include "content/common/input/did_overscroll_params.h"
(...skipping 25 matching lines...) Expand all
36 class MockInputHandler : public cc::InputHandler { 36 class MockInputHandler : public cc::InputHandler {
37 public: 37 public:
38 MockInputHandler() {} 38 MockInputHandler() {}
39 virtual ~MockInputHandler() {} 39 virtual ~MockInputHandler() {}
40 40
41 MOCK_METHOD0(PinchGestureBegin, void()); 41 MOCK_METHOD0(PinchGestureBegin, void());
42 MOCK_METHOD2(PinchGestureUpdate, 42 MOCK_METHOD2(PinchGestureUpdate,
43 void(float magnify_delta, const gfx::Point& anchor)); 43 void(float magnify_delta, const gfx::Point& anchor));
44 MOCK_METHOD0(PinchGestureEnd, void()); 44 MOCK_METHOD0(PinchGestureEnd, void());
45 45
46 MOCK_METHOD0(ScheduleAnimation, void()); 46 MOCK_METHOD0(SetNeedsAnimate, void());
47 47
48 MOCK_METHOD2(ScrollBegin, 48 MOCK_METHOD2(ScrollBegin,
49 ScrollStatus(const gfx::Point& viewport_point, 49 ScrollStatus(const gfx::Point& viewport_point,
50 cc::InputHandler::ScrollInputType type)); 50 cc::InputHandler::ScrollInputType type));
51 MOCK_METHOD2(ScrollBy, 51 MOCK_METHOD2(ScrollBy,
52 bool(const gfx::Point& viewport_point, 52 bool(const gfx::Point& viewport_point,
53 const gfx::Vector2dF& scroll_delta)); 53 const gfx::Vector2dF& scroll_delta));
54 MOCK_METHOD2(ScrollVerticallyByPage, 54 MOCK_METHOD2(ScrollVerticallyByPage,
55 bool(const gfx::Point& viewport_point, 55 bool(const gfx::Point& viewport_point,
56 cc::ScrollDirection direction)); 56 cc::ScrollDirection direction));
(...skipping 1393 matching lines...) Expand 10 before | Expand all | Expand 10 after
1450 1450
1451 testing::Mock::VerifyAndClearExpectations(&mock_input_handler_); 1451 testing::Mock::VerifyAndClearExpectations(&mock_input_handler_);
1452 1452
1453 EXPECT_CALL(mock_input_handler_, ScrollEnd()); 1453 EXPECT_CALL(mock_input_handler_, ScrollEnd());
1454 gesture_.type = WebInputEvent::GestureFlingCancel; 1454 gesture_.type = WebInputEvent::GestureFlingCancel;
1455 EXPECT_EQ(expected_disposition_, input_handler_->HandleInputEvent(gesture_)); 1455 EXPECT_EQ(expected_disposition_, input_handler_->HandleInputEvent(gesture_));
1456 } 1456 }
1457 1457
1458 } // namespace 1458 } // namespace
1459 } // namespace content 1459 } // namespace content
OLDNEW
« cc/scheduler/scheduler_state_machine.cc ('K') | « content/renderer/input/input_handler_proxy.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698