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

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

Issue 1749343004: Implement Wheel Gesture Scrolling on OSX. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix non mac builds Created 4 years, 9 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
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 <utility> 7 #include <utility>
8 8
9 #include "base/auto_reset.h" 9 #include "base/auto_reset.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 930 matching lines...) Expand 10 before | Expand all | Expand 10 after
941 941
942 RenderThreadImpl* render_thread = RenderThreadImpl::current(); 942 RenderThreadImpl* render_thread = RenderThreadImpl::current();
943 InputHandlerManager* input_handler_manager = 943 InputHandlerManager* input_handler_manager =
944 render_thread ? render_thread->input_handler_manager() : NULL; 944 render_thread ? render_thread->input_handler_manager() : NULL;
945 if (input_handler_manager) { 945 if (input_handler_manager) {
946 input_handler_manager->ObserveWheelEventAndResultOnMainThread( 946 input_handler_manager->ObserveWheelEventAndResultOnMainThread(
947 routing_id_, wheel_event, scroll_result); 947 routing_id_, wheel_event, scroll_result);
948 } 948 }
949 } 949 }
950 950
951 void RenderWidget::ObserveGestureEventAndResult(
952 const blink::WebGestureEvent& gesture_event,
953 const gfx::Vector2dF& unused_delta,
954 bool event_processed) {
955 if (!compositor_deps_->IsElasticOverscrollEnabled())
956 return;
957
958 cc::InputHandlerScrollResult scroll_result;
959 scroll_result.did_scroll = event_processed;
960 scroll_result.did_overscroll_root = !unused_delta.IsZero();
961 scroll_result.unused_scroll_delta = unused_delta;
962
963 RenderThreadImpl* render_thread = RenderThreadImpl::current();
964 InputHandlerManager* input_handler_manager =
965 render_thread ? render_thread->input_handler_manager() : NULL;
966 if (input_handler_manager) {
967 input_handler_manager->ObserveGestureEventAndResultOnMainThread(
968 routing_id_, gesture_event, scroll_result);
969 }
970 }
971
951 void RenderWidget::OnDidHandleKeyEvent() {} 972 void RenderWidget::OnDidHandleKeyEvent() {}
952 973
953 void RenderWidget::OnDidOverscroll(const DidOverscrollParams& params) { 974 void RenderWidget::OnDidOverscroll(const DidOverscrollParams& params) {
954 Send(new InputHostMsg_DidOverscroll(routing_id_, params)); 975 Send(new InputHostMsg_DidOverscroll(routing_id_, params));
955 } 976 }
956 977
957 void RenderWidget::OnInputEventAck(scoped_ptr<InputEventAck> input_event_ack) { 978 void RenderWidget::OnInputEventAck(scoped_ptr<InputEventAck> input_event_ack) {
958 Send(new InputHostMsg_HandleInputEvent_ACK(routing_id_, *input_event_ack)); 979 Send(new InputHostMsg_HandleInputEvent_ACK(routing_id_, *input_event_ack));
959 } 980 }
960 981
(...skipping 1152 matching lines...) Expand 10 before | Expand all | Expand 10 after
2113 video_hole_frames_.RemoveObserver(frame); 2134 video_hole_frames_.RemoveObserver(frame);
2114 } 2135 }
2115 #endif // defined(VIDEO_HOLE) 2136 #endif // defined(VIDEO_HOLE)
2116 2137
2117 void RenderWidget::OnWaitNextFrameForTests(int routing_id) { 2138 void RenderWidget::OnWaitNextFrameForTests(int routing_id) {
2118 QueueMessage(new ViewHostMsg_WaitForNextFrameForTests_ACK(routing_id), 2139 QueueMessage(new ViewHostMsg_WaitForNextFrameForTests_ACK(routing_id),
2119 MESSAGE_DELIVERY_POLICY_WITH_VISUAL_STATE); 2140 MESSAGE_DELIVERY_POLICY_WITH_VISUAL_STATE);
2120 } 2141 }
2121 2142
2122 } // namespace content 2143 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698