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

Side by Side Diff: content/renderer/render_widget.cc

Issue 2048023005: Remove ObserveWheelEventAndResult callbacks since they are now gesture based. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@can_scroll_2
Patch Set: Rebase Created 4 years, 6 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 | « content/renderer/render_widget.h ('k') | ui/events/blink/input_handler_proxy.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 "content/renderer/render_widget.h" 5 #include "content/renderer/render_widget.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 946 matching lines...) Expand 10 before | Expand all | Expand 10 after
957 owner_delegate_->RenderWidgetFocusChangeComplete(); 957 owner_delegate_->RenderWidgetFocusChangeComplete();
958 } 958 }
959 959
960 bool RenderWidget::HasTouchEventHandlersAt(const gfx::Point& point) const { 960 bool RenderWidget::HasTouchEventHandlersAt(const gfx::Point& point) const {
961 if (owner_delegate_) 961 if (owner_delegate_)
962 return owner_delegate_->DoesRenderWidgetHaveTouchEventHandlersAt(point); 962 return owner_delegate_->DoesRenderWidgetHaveTouchEventHandlersAt(point);
963 963
964 return true; 964 return true;
965 } 965 }
966 966
967 void RenderWidget::ObserveWheelEventAndResult(
968 const blink::WebMouseWheelEvent& wheel_event,
969 const gfx::Vector2dF& wheel_unused_delta,
970 bool event_processed) {
971 if (!compositor_deps_->IsElasticOverscrollEnabled())
972 return;
973
974 cc::InputHandlerScrollResult scroll_result;
975 scroll_result.did_scroll = event_processed;
976 scroll_result.did_overscroll_root = !wheel_unused_delta.IsZero();
977 scroll_result.unused_scroll_delta = wheel_unused_delta;
978
979 RenderThreadImpl* render_thread = RenderThreadImpl::current();
980 InputHandlerManager* input_handler_manager =
981 render_thread ? render_thread->input_handler_manager() : NULL;
982 if (input_handler_manager) {
983 input_handler_manager->ObserveWheelEventAndResultOnMainThread(
984 routing_id_, wheel_event, scroll_result);
985 }
986 }
987
988 void RenderWidget::ObserveGestureEventAndResult( 967 void RenderWidget::ObserveGestureEventAndResult(
989 const blink::WebGestureEvent& gesture_event, 968 const blink::WebGestureEvent& gesture_event,
990 const gfx::Vector2dF& unused_delta, 969 const gfx::Vector2dF& unused_delta,
991 bool event_processed) { 970 bool event_processed) {
992 if (!compositor_deps_->IsElasticOverscrollEnabled()) 971 if (!compositor_deps_->IsElasticOverscrollEnabled())
993 return; 972 return;
994 973
995 cc::InputHandlerScrollResult scroll_result; 974 cc::InputHandlerScrollResult scroll_result;
996 scroll_result.did_scroll = event_processed; 975 scroll_result.did_scroll = event_processed;
997 scroll_result.did_overscroll_root = !unused_delta.IsZero(); 976 scroll_result.did_overscroll_root = !unused_delta.IsZero();
(...skipping 1134 matching lines...) Expand 10 before | Expand all | Expand 10 after
2132 void RenderWidget::requestPointerUnlock() { 2111 void RenderWidget::requestPointerUnlock() {
2133 mouse_lock_dispatcher_->UnlockMouse(webwidget_mouse_lock_target_.get()); 2112 mouse_lock_dispatcher_->UnlockMouse(webwidget_mouse_lock_target_.get());
2134 } 2113 }
2135 2114
2136 bool RenderWidget::isPointerLocked() { 2115 bool RenderWidget::isPointerLocked() {
2137 return mouse_lock_dispatcher_->IsMouseLockedTo( 2116 return mouse_lock_dispatcher_->IsMouseLockedTo(
2138 webwidget_mouse_lock_target_.get()); 2117 webwidget_mouse_lock_target_.get());
2139 } 2118 }
2140 2119
2141 } // namespace content 2120 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_widget.h ('k') | ui/events/blink/input_handler_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698