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

Side by Side Diff: webkit/compositor_bindings/web_to_ccinput_handler_adapter.cc

Issue 11365238: cc: Return whether any layer was scrolled from InputHandlerClient::scrollBy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 1 month 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
« no previous file with comments | « cc/layer_tree_host_impl_unittest.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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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 "web_to_ccinput_handler_adapter.h" 5 #include "web_to_ccinput_handler_adapter.h"
6 6
7 #include "third_party/WebKit/Source/Platform/chromium/public/WebInputHandlerClie nt.h" 7 #include "third_party/WebKit/Source/Platform/chromium/public/WebInputHandlerClie nt.h"
8 8
9 #define COMPILE_ASSERT_MATCHING_ENUM(webkit_name, cc_name) \ 9 #define COMPILE_ASSERT_MATCHING_ENUM(webkit_name, cc_name) \
10 COMPILE_ASSERT(int(WebKit::webkit_name) == int(cc::cc_name), mismatching_enu ms) 10 COMPILE_ASSERT(int(WebKit::webkit_name) == int(cc::cc_name), mismatching_enu ms)
(...skipping 29 matching lines...) Expand all
40 40
41 virtual ~ClientAdapter() 41 virtual ~ClientAdapter()
42 { 42 {
43 } 43 }
44 44
45 virtual ScrollStatus scrollBegin(WebPoint point, ScrollInputType type) OVERR IDE 45 virtual ScrollStatus scrollBegin(WebPoint point, ScrollInputType type) OVERR IDE
46 { 46 {
47 return static_cast<WebInputHandlerClient::ScrollStatus>(m_client->scroll Begin(point, static_cast<cc::InputHandlerClient::ScrollInputType>(type))); 47 return static_cast<WebInputHandlerClient::ScrollStatus>(m_client->scroll Begin(point, static_cast<cc::InputHandlerClient::ScrollInputType>(type)));
48 } 48 }
49 49
50 virtual void scrollBy(WebPoint point, WebSize offset) OVERRIDE 50 virtual void scrollBy(WebPoint point, WebSize offset)
51 { 51 {
52 m_client->scrollBy(point, offset); 52 scrollByIfPossible(point, offset);
53 }
54
55 virtual bool scrollByIfPossible(WebPoint point, WebSize offset)
56 {
57 return m_client->scrollBy(point, offset);
53 } 58 }
54 59
55 virtual void scrollEnd() OVERRIDE 60 virtual void scrollEnd() OVERRIDE
56 { 61 {
57 m_client->scrollEnd(); 62 m_client->scrollEnd();
58 } 63 }
59 64
60 virtual void pinchGestureBegin() OVERRIDE 65 virtual void pinchGestureBegin() OVERRIDE
61 { 66 {
62 m_client->pinchGestureBegin(); 67 m_client->pinchGestureBegin();
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 m_handler->bindToClient(m_clientAdapter.get()); 104 m_handler->bindToClient(m_clientAdapter.get());
100 } 105 }
101 106
102 void WebToCCInputHandlerAdapter::animate(base::TimeTicks time) 107 void WebToCCInputHandlerAdapter::animate(base::TimeTicks time)
103 { 108 {
104 double monotonicTimeSeconds = (time - base::TimeTicks()).InSecondsF(); 109 double monotonicTimeSeconds = (time - base::TimeTicks()).InSecondsF();
105 m_handler->animate(monotonicTimeSeconds); 110 m_handler->animate(monotonicTimeSeconds);
106 } 111 }
107 112
108 } // namespace WebKit 113 } // namespace WebKit
OLDNEW
« no previous file with comments | « cc/layer_tree_host_impl_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698