| Index: content/browser/renderer_host/input/web_input_event_builders_mac.mm
|
| diff --git a/content/browser/renderer_host/input/web_input_event_builders_mac.mm b/content/browser/renderer_host/input/web_input_event_builders_mac.mm
|
| index 2522fc9ac5b3f747c056218ae47f5325c10848be..4b11acbea4bfbedc6f4f84c6fcb0a529bf2105c0 100644
|
| --- a/content/browser/renderer_host/input/web_input_event_builders_mac.mm
|
| +++ b/content/browser/renderer_host/input/web_input_event_builders_mac.mm
|
| @@ -40,7 +40,6 @@
|
| #include "content/browser/renderer_host/input/web_input_event_util.h"
|
| #include "third_party/WebKit/public/web/WebInputEvent.h"
|
| #include "ui/base/cocoa/cocoa_base_utils.h"
|
| -#import "ui/events/cocoa/cocoa_event_utils.h"
|
| #include "ui/events/keycodes/keyboard_code_conversion.h"
|
| #include "ui/events/keycodes/keyboard_code_conversion_mac.h"
|
|
|
| @@ -548,17 +547,20 @@
|
| // the point delta data instead, since we cannot distinguish trackpad data
|
| // from data from any other continuous device.
|
|
|
| + // Conversion between wheel delta amounts and number of pixels to scroll.
|
| + static const double kScrollbarPixelsPerCocoaTick = 40.0;
|
| +
|
| if (CGEventGetIntegerValueField(cg_event, kCGScrollWheelEventIsContinuous)) {
|
| result.deltaX = CGEventGetIntegerValueField(
|
| cg_event, kCGScrollWheelEventPointDeltaAxis2);
|
| result.deltaY = CGEventGetIntegerValueField(
|
| cg_event, kCGScrollWheelEventPointDeltaAxis1);
|
| - result.wheelTicksX = result.deltaX / ui::kScrollbarPixelsPerCocoaTick;
|
| - result.wheelTicksY = result.deltaY / ui::kScrollbarPixelsPerCocoaTick;
|
| + result.wheelTicksX = result.deltaX / kScrollbarPixelsPerCocoaTick;
|
| + result.wheelTicksY = result.deltaY / kScrollbarPixelsPerCocoaTick;
|
| result.hasPreciseScrollingDeltas = true;
|
| } else {
|
| - result.deltaX = [event deltaX] * ui::kScrollbarPixelsPerCocoaTick;
|
| - result.deltaY = [event deltaY] * ui::kScrollbarPixelsPerCocoaTick;
|
| + result.deltaX = [event deltaX] * kScrollbarPixelsPerCocoaTick;
|
| + result.deltaY = [event deltaY] * kScrollbarPixelsPerCocoaTick;
|
| result.wheelTicksY =
|
| CGEventGetIntegerValueField(cg_event, kCGScrollWheelEventDeltaAxis1);
|
| result.wheelTicksX =
|
|
|