Move WebMouseEvent into its own header file.

No changes other than modifying includes and appropriately forward
declaring the class.

BUG=625684
TBR=girard@chromium.org, clamy@chromium.org, jochen@chromium.org

Review-Url: https://codereview.chromium.org/2590273002
Cr-Commit-Position: refs/heads/master@{#441940}

chrome/browser/DEPS

@@ -99,6 +99,7 @@ include_rules = [
   "+third_party/WebKit/public/platform/WebLoadingBehaviorFlag.h",
   "+third_party/WebKit/public/platform/WebGestureEvent.h",
   "+third_party/WebKit/public/platform/WebInputEvent.h",
+  "+third_party/WebKit/public/platform/WebMouseEvent.h",
   "+third_party/WebKit/public/platform/WebMouseWheelEvent.h",
   "+third_party/WebKit/public/platform/WebReferrerPolicy.h",
   "+third_party/WebKit/public/platform/WebSecurityStyle.h",

chrome/browser/android/vr_shell/vr_input_manager.h

@@ -9,6 +9,7 @@
 #include "base/memory/weak_ptr.h"
 #include "third_party/WebKit/public/platform/WebGestureEvent.h"
 #include "third_party/WebKit/public/platform/WebInputEvent.h"
+#include "third_party/WebKit/public/platform/WebMouseEvent.h"
 
 namespace content {
 class WebContents;

chrome/browser/page_load_metrics/observers/core_page_load_metrics_observer_unittest.cc

@@ -10,6 +10,7 @@
 #include "chrome/test/base/testing_browser_process.h"
 #include "components/rappor/public/rappor_utils.h"
 #include "components/rappor/test_rappor_service.h"
+#include "third_party/WebKit/public/platform/WebMouseEvent.h"
 
 namespace {
 

chrome/browser/page_load_metrics/observers/from_gws_page_load_metrics_observer_unittest.cc

@@ -8,6 +8,7 @@
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/page_load_metrics/observers/page_load_metrics_observer_test_harness.h"
 #include "chrome/browser/page_load_metrics/page_load_metrics_util.h"
+#include "third_party/WebKit/public/platform/WebMouseEvent.h"
 
 namespace {
 const char kExampleUrl[] = "http://www.example.com/";

chrome/renderer/plugins/chrome_plugin_placeholder.cc

@@ -31,6 +31,7 @@
 #include "gin/object_template_builder.h"
 #include "third_party/WebKit/public/platform/URLConversion.h"
 #include "third_party/WebKit/public/platform/WebInputEvent.h"
+#include "third_party/WebKit/public/platform/WebMouseEvent.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
 #include "third_party/WebKit/public/web/WebScriptSource.h"

components/autofill/content/renderer/page_click_tracker.cc

@@ -10,7 +10,6 @@
 #include "components/autofill/core/common/autofill_util.h"
 #include "content/public/renderer/render_frame.h"
 #include "content/public/renderer/render_view.h"
-#include "third_party/WebKit/public/platform/WebInputEvent.h"
 #include "third_party/WebKit/public/platform/WebPoint.h"
 #include "third_party/WebKit/public/platform/WebSize.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
@@ -25,8 +24,6 @@ using blink::WebElement;
 using blink::WebFormControlElement;
 using blink::WebGestureEvent;
 using blink::WebInputElement;
-using blink::WebInputEvent;
-using blink::WebMouseEvent;
 using blink::WebNode;
 using blink::WebPoint;
 using blink::WebSize;

components/printing/test/print_web_view_helper_browsertest.cc

@@ -25,6 +25,7 @@
 #include "printing/features/features.h"
 #include "printing/print_job_constants.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "third_party/WebKit/public/platform/WebMouseEvent.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
 #include "third_party/WebKit/public/web/WebRange.h"

components/test_runner/test_plugin.cc

@@ -24,6 +24,7 @@
 #include "third_party/WebKit/public/platform/WebGestureEvent.h"
 #include "third_party/WebKit/public/platform/WebGraphicsContext3DProvider.h"
 #include "third_party/WebKit/public/platform/WebInputEvent.h"
+#include "third_party/WebKit/public/platform/WebMouseEvent.h"
 #include "third_party/WebKit/public/platform/WebThread.h"
 #include "third_party/WebKit/public/platform/WebTouchPoint.h"
 #include "third_party/WebKit/public/platform/WebTraceLocation.h"

content/browser/DEPS

@@ -67,6 +67,7 @@ include_rules = [
   "+third_party/WebKit/public/platform/WebGestureEvent.h",
   "+third_party/WebKit/public/platform/WebInputEvent.h",
   "+third_party/WebKit/public/platform/WebInsecureRequestPolicy.h",
+  "+third_party/WebKit/public/platform/WebMouseEvent.h",
   "+third_party/WebKit/public/platform/WebMouseWheelEvent.h",
   "+third_party/WebKit/public/platform/WebNavigationHintType.h",
   "+third_party/WebKit/public/platform/WebPageVisibilityState.h",

content/browser/renderer_host/input/touch_emulator.cc

@@ -11,6 +11,7 @@
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_switches.h"
 #include "third_party/WebKit/public/platform/WebCursorInfo.h"
+#include "third_party/WebKit/public/platform/WebMouseEvent.h"
 #include "ui/events/base_event_utils.h"
 #include "ui/events/blink/blink_event_util.h"
 #include "ui/events/gesture_detection/gesture_provider_config_helper.h"

content/browser/renderer_host/input/touch_emulator.h

@@ -17,6 +17,7 @@
 #include "ui/gfx/geometry/size_f.h"
 
 namespace blink {
+class WebMouseEvent;
 class WebMouseWheelEvent;
 }
 

content/public/test/browser_test_utils.h

@@ -28,6 +28,7 @@
 #include "ipc/message_filter.h"
 #include "storage/common/fileapi/file_system_types.h"
 #include "third_party/WebKit/public/platform/WebInputEvent.h"
+#include "third_party/WebKit/public/platform/WebMouseEvent.h"
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/accessibility/ax_tree_update.h"
 #include "ui/events/keycodes/dom/dom_code.h"

content/public/test/render_view_test.cc

@@ -41,6 +41,7 @@
 #include "content/test/test_render_frame.h"
 #include "third_party/WebKit/public/platform/WebGestureEvent.h"
 #include "third_party/WebKit/public/platform/WebInputEvent.h"
+#include "third_party/WebKit/public/platform/WebMouseEvent.h"
 #include "third_party/WebKit/public/platform/WebURLRequest.h"
 #include "third_party/WebKit/public/platform/scheduler/renderer/renderer_scheduler.h"
 #include "third_party/WebKit/public/web/WebDocument.h"

content/public/test/render_view_test.h

@@ -34,6 +34,7 @@ namespace scheduler {
 class RendererScheduler;
 }
 class WebInputElement;
+class WebMouseEvent;
 class WebWidget;
 }
 

content/renderer/gpu/gpu_benchmarking_extension.cc

@@ -35,6 +35,7 @@
 #include "gin/handle.h"
 #include "gin/object_template_builder.h"
 #include "gpu/ipc/common/gpu_messages.h"
+#include "third_party/WebKit/public/platform/WebMouseEvent.h"
 #include "third_party/WebKit/public/web/WebImageCache.h"
 #include "third_party/WebKit/public/web/WebKit.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"

content/renderer/mouse_lock_dispatcher_browsertest.cc

@@ -10,6 +10,7 @@
 #include "content/renderer/render_view_impl.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "third_party/WebKit/public/platform/WebMouseEvent.h"
 
 using ::testing::_;
 

content/renderer/pepper/pepper_plugin_instance_impl.cc

@@ -100,6 +100,7 @@
 #include "third_party/WebKit/public/platform/WebFloatRect.h"
 #include "third_party/WebKit/public/platform/WebGamepads.h"
 #include "third_party/WebKit/public/platform/WebInputEvent.h"
+#include "third_party/WebKit/public/platform/WebMouseEvent.h"
 #include "third_party/WebKit/public/platform/WebRect.h"
 #include "third_party/WebKit/public/platform/WebSecurityOrigin.h"
 #include "third_party/WebKit/public/platform/WebString.h"

content/renderer/pepper/plugin_instance_throttler_impl_unittest.cc

@@ -15,6 +15,7 @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/public/platform/WebInputEvent.h"
+#include "third_party/WebKit/public/platform/WebMouseEvent.h"
 #include "third_party/WebKit/public/web/WebPluginParams.h"
 #include "ui/events/base_event_utils.h"
 #include "ui/gfx/canvas.h"

content/renderer/render_widget.cc

@@ -65,6 +65,7 @@
 #include "third_party/WebKit/public/platform/WebCursorInfo.h"
 #include "third_party/WebKit/public/platform/WebDragData.h"
 #include "third_party/WebKit/public/platform/WebDragOperation.h"
+#include "third_party/WebKit/public/platform/WebMouseEvent.h"
 #include "third_party/WebKit/public/platform/WebPoint.h"
 #include "third_party/WebKit/public/platform/WebRect.h"
 #include "third_party/WebKit/public/platform/WebSize.h"

third_party/WebKit/Source/core/events/MouseEvent.h

@@ -29,6 +29,7 @@
 #include "core/events/MouseEventInit.h"
 #include "core/events/UIEventWithKeyState.h"
 #include "platform/PlatformMouseEvent.h"
+#include "public/platform/WebMouseEvent.h"
 
 namespace blink {
 class DataTransfer;

third_party/WebKit/Source/platform/WebMouseEvent.cpp

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "public/platform/WebInputEvent.h"
+#include "public/platform/WebMouseEvent.h"
 
 namespace blink {
 

third_party/WebKit/Source/web/ExternalPopupMenu.cpp

@@ -44,6 +44,7 @@
 #include "platform/geometry/FloatQuad.h"
 #include "platform/geometry/IntPoint.h"
 #include "platform/text/TextDirection.h"
+#include "public/platform/WebMouseEvent.h"
 #include "public/platform/WebVector.h"
 #include "public/web/WebExternalPopupMenu.h"
 #include "public/web/WebFrameClient.h"

third_party/WebKit/Source/web/tests/FrameTestHelpers.h

@@ -34,6 +34,7 @@
 #include "core/frame/Settings.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/scroll/ScrollbarTheme.h"
+#include "public/platform/WebMouseEvent.h"
 #include "public/platform/WebString.h"
 #include "public/platform/WebURLRequest.h"
 #include "public/web/WebFrameClient.h"

third_party/WebKit/public/platform/WebInputEvent.h

@@ -400,53 +400,6 @@ class WebKeyboardEvent : public WebInputEvent {
   }
 };
 
-// WebMouseEvent --------------------------------------------------------------
-
-class WebMouseEvent : public WebInputEvent, public WebPointerProperties {
- public:
-  // Renderer coordinates. Similar to viewport coordinates but without
-  // DevTools emulation transform or overscroll applied. i.e. the coordinates
-  // in Chromium's RenderView bounds.
-  int x;
-  int y;
-
-  // DEPRECATED (crbug.com/507787)
-  int windowX;
-  int windowY;
-
-  // Screen coordinate
-  int globalX;
-  int globalY;
-
-  int movementX;
-  int movementY;
-  int clickCount;
-
-  WebMouseEvent(Type type, int modifiers, double timeStampSeconds)
-      : WebInputEvent(sizeof(WebMouseEvent), type, modifiers, timeStampSeconds),
-        WebPointerProperties() {}
-
-  WebMouseEvent()
-      : WebInputEvent(sizeof(WebMouseEvent)), WebPointerProperties() {}
-
-#if INSIDE_BLINK
-  BLINK_PLATFORM_EXPORT WebFloatPoint movementInRootFrame() const;
-  BLINK_PLATFORM_EXPORT WebFloatPoint positionInRootFrame() const;
-#endif
-
- protected:
-  explicit WebMouseEvent(unsigned sizeParam)
-      : WebInputEvent(sizeParam), WebPointerProperties() {}
-
-  WebMouseEvent(unsigned sizeParam,
-                Type type,
-                int modifiers,
-                double timeStampSeconds)
-      : WebInputEvent(sizeParam, type, modifiers, timeStampSeconds),
-        WebPointerProperties() {}
-  void flattenTransformSelf();
-};
-
 // WebTouchEvent --------------------------------------------------------------
 
 // TODO(e_hakkinen): Replace with WebPointerEvent. crbug.com/508283

third_party/WebKit/public/platform/WebMouseEvent.h

+// Copyright 2016 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.
+
+#ifndef WebMouseEvent_h
+#define WebMouseEvent_h
+
+#include "WebInputEvent.h"
+
+namespace blink {
+
+// See WebInputEvent.h for details why this pack is here.
+#pragma pack(push, 4)
+
+// WebMouseEvent --------------------------------------------------------------
+
+class WebMouseEvent : public WebInputEvent, public WebPointerProperties {
+ public:
+  // Renderer coordinates. Similar to viewport coordinates but without
+  // DevTools emulation transform or overscroll applied. i.e. the coordinates
+  // in Chromium's RenderView bounds.
+  int x;
+  int y;
+
+  // DEPRECATED (crbug.com/507787)
+  int windowX;
+  int windowY;
+
+  // Screen coordinate
+  int globalX;
+  int globalY;
+
+  int movementX;
+  int movementY;
+  int clickCount;
+
+  WebMouseEvent(Type type, int modifiers, double timeStampSeconds)
+      : WebInputEvent(sizeof(WebMouseEvent), type, modifiers, timeStampSeconds),
+        WebPointerProperties() {}
+
+  WebMouseEvent()
+      : WebInputEvent(sizeof(WebMouseEvent)), WebPointerProperties() {}
+
+#if INSIDE_BLINK
+  BLINK_PLATFORM_EXPORT WebFloatPoint movementInRootFrame() const;
+  BLINK_PLATFORM_EXPORT WebFloatPoint positionInRootFrame() const;
+#endif
+
+ protected:
+  explicit WebMouseEvent(unsigned sizeParam)
+      : WebInputEvent(sizeParam), WebPointerProperties() {}
+
+  WebMouseEvent(unsigned sizeParam,
+                Type type,
+                int modifiers,
+                double timeStampSeconds)
+      : WebInputEvent(sizeParam, type, modifiers, timeStampSeconds),
+        WebPointerProperties() {}
+
+  void flattenTransformSelf();
+};
+
+#pragma pack(pop)
+
+}  // namespace blink
+
+#endif  // WebMouseEvent_h

third_party/WebKit/public/platform/WebMouseWheelEvent.h

@@ -5,7 +5,7 @@
 #ifndef WebMouseWheelEvent_h
 #define WebMouseWheelEvent_h
 
-#include "WebInputEvent.h"
+#include "WebMouseEvent.h"
 
 namespace blink {