Revert of Mac: Share kScrollbarPixelsPerCocoaTick between ui:: and blink:: events

content/browser/renderer_host/input/web_input_event_builders_mac.mm

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /*
  * Copyright (C) 2004, 2006, 2007 Apple Inc. All rights reserved.
  * Copyright (C) 2006-2009 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ skipping 22 matching lines @@
 #import <ApplicationServices/ApplicationServices.h>
 #import <Cocoa/Cocoa.h>
 
 #include <stdint.h>
 
 #include "base/mac/sdk_forward_declarations.h"
 #include "base/strings/string_util.h"
 #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"
 
 namespace content {
 
 namespace {
 
 // Return true if the target modifier key is up. OS X has an "official" flag
 // to test whether either left or right versions of a modifier key are held,
 // and "unofficial" flags for the left and right versions independently. This
@@ skipping 487 matching lines @@
   DCHECK(cg_event);
 
   // Wheel ticks are supposed to be raw, unaccelerated values, one per physical
   // mouse wheel notch. The delta event is perfect for this (being a good
   // "specific edge case" as mentioned above). Trackpads, unfortunately, do
   // event chunking, and sending mousewheel events with 0 ticks causes some
   // websites to malfunction. Therefore, for all continuous input devices we use
   // 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 =
         CGEventGetIntegerValueField(cg_event, kCGScrollWheelEventDeltaAxis2);
   }
 
   result.timeStampSeconds = [event timestamp];
 
   result.phase = PhaseForEvent(event);
   result.momentumPhase = MomentumPhaseForEvent(event);
@@ skipping 40 matching lines @@
       break;
     default:
       NOTIMPLEMENTED();
       result.type = blink::WebInputEvent::Undefined;
   }
 
   return result;
 }
 
 }  // namespace content