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

Side by Side Diff: content/browser/renderer_host/input/mouse_wheel_event_queue.cc

Issue 1833013002: Fix scrolling rails on Mac OSX. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
« no previous file with comments | « no previous file | content/browser/renderer_host/input/mouse_wheel_event_queue_unittest.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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/browser/renderer_host/input/mouse_wheel_event_queue.h" 5 #include "content/browser/renderer_host/input/mouse_wheel_event_queue.h"
6 6
7 #include "base/metrics/histogram_macros.h" 7 #include "base/metrics/histogram_macros.h"
8 #include "base/stl_util.h" 8 #include "base/stl_util.h"
9 #include "base/trace_event/trace_event.h" 9 #include "base/trace_event/trace_event.h"
10 10
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 scroll_update.event.data.scrollUpdate.deltaX = 115 scroll_update.event.data.scrollUpdate.deltaX =
116 scroll_update.event.data.scrollUpdate.deltaX > 0 ? 1 : -1; 116 scroll_update.event.data.scrollUpdate.deltaX > 0 ? 1 : -1;
117 if (scroll_update.event.data.scrollUpdate.deltaY) 117 if (scroll_update.event.data.scrollUpdate.deltaY)
118 scroll_update.event.data.scrollUpdate.deltaY = 118 scroll_update.event.data.scrollUpdate.deltaY =
119 scroll_update.event.data.scrollUpdate.deltaY > 0 ? 1 : -1; 119 scroll_update.event.data.scrollUpdate.deltaY > 0 ? 1 : -1;
120 } else { 120 } else {
121 scroll_update.event.data.scrollUpdate.deltaUnits = 121 scroll_update.event.data.scrollUpdate.deltaUnits =
122 event_sent_for_gesture_ack_->event.hasPreciseScrollingDeltas 122 event_sent_for_gesture_ack_->event.hasPreciseScrollingDeltas
123 ? blink::WebGestureEvent::PrecisePixels 123 ? blink::WebGestureEvent::PrecisePixels
124 : blink::WebGestureEvent::Pixels; 124 : blink::WebGestureEvent::Pixels;
125
126 if (event_sent_for_gesture_ack_->event.railsMode ==
127 WebInputEvent::RailsModeVertical)
128 scroll_update.event.data.scrollUpdate.deltaX = 0;
129 if (event_sent_for_gesture_ack_->event.railsMode ==
130 WebInputEvent::RailsModeHorizontal)
131 scroll_update.event.data.scrollUpdate.deltaY = 0;
125 } 132 }
126 133
127 bool current_phase_ended = false; 134 bool current_phase_ended = false;
128 bool has_phase_info = false; 135 bool has_phase_info = false;
129 136
130 if (event_sent_for_gesture_ack_->event.phase != 137 if (event_sent_for_gesture_ack_->event.phase !=
131 blink::WebMouseWheelEvent::PhaseNone || 138 blink::WebMouseWheelEvent::PhaseNone ||
132 event_sent_for_gesture_ack_->event.momentumPhase != 139 event_sent_for_gesture_ack_->event.momentumPhase !=
133 blink::WebMouseWheelEvent::PhaseNone) { 140 blink::WebMouseWheelEvent::PhaseNone) {
134 has_phase_info = true; 141 has_phase_info = true;
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
269 scroll_begin.event.data.scrollBegin.targetViewport = false; 276 scroll_begin.event.data.scrollBegin.targetViewport = false;
270 scroll_begin.event.data.scrollBegin.deltaHintUnits = 277 scroll_begin.event.data.scrollBegin.deltaHintUnits =
271 gesture_update.event.data.scrollUpdate.deltaUnits; 278 gesture_update.event.data.scrollUpdate.deltaUnits;
272 279
273 needs_scroll_begin_ = false; 280 needs_scroll_begin_ = false;
274 needs_scroll_end_ = true; 281 needs_scroll_end_ = true;
275 client_->SendGestureEvent(scroll_begin); 282 client_->SendGestureEvent(scroll_begin);
276 } 283 }
277 284
278 } // namespace content 285 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/browser/renderer_host/input/mouse_wheel_event_queue_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698