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

Side by Side Diff: ui/events/blink/web_input_event.cc

Issue 2359463002: Send the WebMouseWheelEvents unconverted if Shift is down. (Closed)
Patch Set: Add comemnt Created 4 years, 3 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 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 "ui/events/blink/web_input_event.h" 5 #include "ui/events/blink/web_input_event.h"
6 6
7 #include "ui/events/base_event_utils.h" 7 #include "ui/events/base_event_utils.h"
8 #include "ui/events/blink/blink_event_util.h" 8 #include "ui/events/blink/blink_event_util.h"
9 #include "ui/events/event.h" 9 #include "ui/events/event.h"
10 #include "ui/events/event_utils.h" 10 #include "ui/events/event_utils.h"
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 blink::WebMouseWheelEvent MakeWebMouseWheelEventFromUiEvent( 129 blink::WebMouseWheelEvent MakeWebMouseWheelEventFromUiEvent(
130 const ScrollEvent& event) { 130 const ScrollEvent& event) {
131 blink::WebMouseWheelEvent webkit_event; 131 blink::WebMouseWheelEvent webkit_event;
132 132
133 webkit_event.type = blink::WebInputEvent::MouseWheel; 133 webkit_event.type = blink::WebInputEvent::MouseWheel;
134 webkit_event.button = blink::WebMouseEvent::Button::NoButton; 134 webkit_event.button = blink::WebMouseEvent::Button::NoButton;
135 webkit_event.modifiers = EventFlagsToWebEventModifiers(event.flags()); 135 webkit_event.modifiers = EventFlagsToWebEventModifiers(event.flags());
136 webkit_event.timeStampSeconds = EventTimeStampToSeconds(event.time_stamp()); 136 webkit_event.timeStampSeconds = EventTimeStampToSeconds(event.time_stamp());
137 webkit_event.hasPreciseScrollingDeltas = true; 137 webkit_event.hasPreciseScrollingDeltas = true;
138 138
139 float offset_ordinal_x = 0.f; 139 float offset_ordinal_x = event.x_offset_ordinal();
140 float offset_ordinal_y = 0.f; 140 float offset_ordinal_y = event.y_offset_ordinal();
141 if ((event.flags() & EF_SHIFT_DOWN) != 0 && event.x_offset() == 0) { 141 webkit_event.deltaX = event.x_offset();
142 webkit_event.deltaX = event.y_offset(); 142 webkit_event.deltaY = event.y_offset();
143 webkit_event.deltaY = 0;
144 offset_ordinal_x = event.y_offset_ordinal();
145 offset_ordinal_y = event.x_offset_ordinal();
146 } else {
147 webkit_event.deltaX = event.x_offset();
148 webkit_event.deltaY = event.y_offset();
149 offset_ordinal_x = event.x_offset_ordinal();
150 offset_ordinal_y = event.y_offset_ordinal();
151 }
152 143
153 if (offset_ordinal_x != 0.f && webkit_event.deltaX != 0.f) 144 if (offset_ordinal_x != 0.f && webkit_event.deltaX != 0.f)
154 webkit_event.accelerationRatioX = offset_ordinal_x / webkit_event.deltaX; 145 webkit_event.accelerationRatioX = offset_ordinal_x / webkit_event.deltaX;
155 webkit_event.wheelTicksX = webkit_event.deltaX / MouseWheelEvent::kWheelDelta; 146 webkit_event.wheelTicksX = webkit_event.deltaX / MouseWheelEvent::kWheelDelta;
156 webkit_event.wheelTicksY = webkit_event.deltaY / MouseWheelEvent::kWheelDelta; 147 webkit_event.wheelTicksY = webkit_event.deltaY / MouseWheelEvent::kWheelDelta;
157 if (offset_ordinal_y != 0.f && webkit_event.deltaY != 0.f) 148 if (offset_ordinal_y != 0.f && webkit_event.deltaY != 0.f)
158 webkit_event.accelerationRatioY = offset_ordinal_y / webkit_event.deltaY; 149 webkit_event.accelerationRatioY = offset_ordinal_y / webkit_event.deltaY;
159 150
160 webkit_event.pointerType = 151 webkit_event.pointerType =
161 EventPointerTypeToWebPointerType(event.pointer_details().pointer_type); 152 EventPointerTypeToWebPointerType(event.pointer_details().pointer_type);
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after
430 421
431 blink::WebMouseWheelEvent MakeWebMouseWheelEventFromUiEvent( 422 blink::WebMouseWheelEvent MakeWebMouseWheelEventFromUiEvent(
432 const MouseWheelEvent& event) { 423 const MouseWheelEvent& event) {
433 blink::WebMouseWheelEvent webkit_event; 424 blink::WebMouseWheelEvent webkit_event;
434 425
435 webkit_event.type = blink::WebInputEvent::MouseWheel; 426 webkit_event.type = blink::WebInputEvent::MouseWheel;
436 webkit_event.button = blink::WebMouseEvent::Button::NoButton; 427 webkit_event.button = blink::WebMouseEvent::Button::NoButton;
437 webkit_event.modifiers = EventFlagsToWebEventModifiers(event.flags()); 428 webkit_event.modifiers = EventFlagsToWebEventModifiers(event.flags());
438 webkit_event.timeStampSeconds = EventTimeStampToSeconds(event.time_stamp()); 429 webkit_event.timeStampSeconds = EventTimeStampToSeconds(event.time_stamp());
439 430
440 if ((event.flags() & EF_SHIFT_DOWN) != 0 && event.x_offset() == 0) { 431 webkit_event.deltaX = event.x_offset();
441 webkit_event.deltaX = event.y_offset(); 432 webkit_event.deltaY = event.y_offset();
442 webkit_event.deltaY = 0;
443 } else {
444 webkit_event.deltaX = event.x_offset();
445 webkit_event.deltaY = event.y_offset();
446 }
447 433
448 webkit_event.wheelTicksX = webkit_event.deltaX / MouseWheelEvent::kWheelDelta; 434 webkit_event.wheelTicksX = webkit_event.deltaX / MouseWheelEvent::kWheelDelta;
449 webkit_event.wheelTicksY = webkit_event.deltaY / MouseWheelEvent::kWheelDelta; 435 webkit_event.wheelTicksY = webkit_event.deltaY / MouseWheelEvent::kWheelDelta;
450 436
451 webkit_event.tiltX = roundf(event.pointer_details().tilt_x); 437 webkit_event.tiltX = roundf(event.pointer_details().tilt_x);
452 webkit_event.tiltY = roundf(event.pointer_details().tilt_y); 438 webkit_event.tiltY = roundf(event.pointer_details().tilt_y);
453 webkit_event.force = event.pointer_details().force; 439 webkit_event.force = event.pointer_details().force;
454 webkit_event.pointerType = 440 webkit_event.pointerType =
455 EventPointerTypeToWebPointerType(event.pointer_details().pointer_type); 441 EventPointerTypeToWebPointerType(event.pointer_details().pointer_type);
456 442
457 return webkit_event; 443 return webkit_event;
458 } 444 }
459 445
460 } // namespace ui 446 } // namespace ui
OLDNEW
« no previous file with comments | « content/browser/renderer_host/input/mouse_wheel_event_queue.cc ('k') | ui/events/blink/web_input_event_builders_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698