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

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

Issue 615953005: Move page scale animation from LayerTreeHostImpl to LayerTreeImpl (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added CC_EXPORT to PageScaleAnimation 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 unified diff | Download patch
« no previous file with comments | « cc/trees/layer_tree_impl.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 MOCK_METHOD0(ScrollEnd, void()); 98 MOCK_METHOD0(ScrollEnd, void());
99 MOCK_METHOD0(FlingScrollBegin, cc::InputHandler::ScrollStatus()); 99 MOCK_METHOD0(FlingScrollBegin, cc::InputHandler::ScrollStatus());
100 100
101 virtual scoped_ptr<cc::SwapPromiseMonitor> 101 virtual scoped_ptr<cc::SwapPromiseMonitor>
102 CreateLatencyInfoSwapPromiseMonitor(ui::LatencyInfo* latency) OVERRIDE { 102 CreateLatencyInfoSwapPromiseMonitor(ui::LatencyInfo* latency) OVERRIDE {
103 return scoped_ptr<cc::SwapPromiseMonitor>(); 103 return scoped_ptr<cc::SwapPromiseMonitor>();
104 } 104 }
105 105
106 virtual void BindToClient(cc::InputHandlerClient* client) OVERRIDE {} 106 virtual void BindToClient(cc::InputHandlerClient* client) OVERRIDE {}
107 107
108 virtual void StartPageScaleAnimation(const gfx::Vector2d& target_offset,
109 bool anchor_point,
110 float page_scale,
111 base::TimeDelta duration) OVERRIDE {}
112
113 virtual void MouseMoveAt(const gfx::Point& mouse_position) OVERRIDE {} 108 virtual void MouseMoveAt(const gfx::Point& mouse_position) OVERRIDE {}
114 109
115 MOCK_METHOD2(IsCurrentlyScrollingLayerAt, 110 MOCK_METHOD2(IsCurrentlyScrollingLayerAt,
116 bool(const gfx::Point& point, 111 bool(const gfx::Point& point,
117 cc::InputHandler::ScrollInputType type)); 112 cc::InputHandler::ScrollInputType type));
118 113
119 MOCK_METHOD1(HaveTouchEventHandlersAt, bool(const gfx::Point& point)); 114 MOCK_METHOD1(HaveTouchEventHandlersAt, bool(const gfx::Point& point));
120 115
121 virtual void SetRootLayerScrollOffsetDelegate( 116 virtual void SetRootLayerScrollOffsetDelegate(
122 cc::LayerScrollOffsetDelegate* root_layer_scroll_offset_delegate) 117 cc::LayerScrollOffsetDelegate* root_layer_scroll_offset_delegate)
(...skipping 1879 matching lines...) Expand 10 before | Expand all | Expand 10 after
2002 wheel.scrollByPage = true; 1997 wheel.scrollByPage = true;
2003 1998
2004 EXPECT_CALL(mock_client, DidReceiveInputEvent()); 1999 EXPECT_CALL(mock_client, DidReceiveInputEvent());
2005 2000
2006 input_handler_->HandleInputEvent(wheel); 2001 input_handler_->HandleInputEvent(wheel);
2007 testing::Mock::VerifyAndClearExpectations(&mock_client); 2002 testing::Mock::VerifyAndClearExpectations(&mock_client);
2008 } 2003 }
2009 2004
2010 } // namespace 2005 } // namespace
2011 } // namespace content 2006 } // namespace content
OLDNEW
« no previous file with comments | « cc/trees/layer_tree_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698