1 files changed, 60 insertions, 55 deletions
diff --git a/Source/WebCore/dom/MouseRelatedEvent.h b/Source/WebCore/dom/MouseRelatedEvent.h
index 8079061e4..5f8dc0320 100644
--- a/Source/WebCore/dom/MouseRelatedEvent.h
+++ b/Source/WebCore/dom/MouseRelatedEvent.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2001 Peter Kelly (pmk@post.com)
  * Copyright (C) 2001 Tobias Anton (anton@stud.fbi.fh-darmstadt.de)
  * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
- * Copyright (C) 2003, 2004, 2005, 2006, 2013 Apple Computer, Inc.
+ * Copyright (C) 2003, 2004, 2005, 2006, 2013 Apple Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -21,77 +21,82 @@
  *
  */
 
-#ifndef MouseRelatedEvent_h
-#define MouseRelatedEvent_h
+#pragma once
 
 #include "LayoutPoint.h"
 #include "UIEventWithKeyState.h"
 
 namespace WebCore {
 
-    // Internal only: Helper class for what's common between mouse and wheel events.
-    class MouseRelatedEvent : public UIEventWithKeyState {
-    public:
-        // Note that these values are adjusted to counter the effects of zoom, so that values
-        // exposed via DOM APIs are invariant under zooming.
-        int screenX() const { return m_screenLocation.x(); }
-        int screenY() const { return m_screenLocation.y(); }
-        const IntPoint& screenLocation() const { return m_screenLocation; }
-        int clientX() const { return m_clientLocation.x(); }
-        int clientY() const { return m_clientLocation.y(); }
+struct MouseRelatedEventInit : public EventModifierInit {
+    int screenX { 0 };
+    int screenY { 0 };
+};
+
+// Internal only: Helper class for what's common between mouse and wheel events.
+class MouseRelatedEvent : public UIEventWithKeyState {
+public:
+    // Note that these values are adjusted to counter the effects of zoom, so that values
+    // exposed via DOM APIs are invariant under zooming.
+    int screenX() const { return m_screenLocation.x(); }
+    int screenY() const { return m_screenLocation.y(); }
+    const IntPoint& screenLocation() const { return m_screenLocation; }
+    int clientX() const { return m_clientLocation.x(); }
+    int clientY() const { return m_clientLocation.y(); }
 #if ENABLE(POINTER_LOCK)
-        int webkitMovementX() const { return m_movementDelta.x(); }
-        int webkitMovementY() const { return m_movementDelta.y(); }
+    int movementX() const { return m_movementDelta.x(); }
+    int movementY() const { return m_movementDelta.y(); }
 #endif
-        const LayoutPoint& clientLocation() const { return m_clientLocation; }
-        int layerX() override;
-        int layerY() override;
-        int offsetX();
-        int offsetY();
-        bool isSimulated() const { return m_isSimulated; }
-        virtual int pageX() const override;
-        virtual int pageY() const override;
-        virtual const LayoutPoint& pageLocation() const;
-        int x() const;
-        int y() const;
+    const LayoutPoint& clientLocation() const { return m_clientLocation; }
+    int layerX() override;
+    int layerY() override;
+    WEBCORE_EXPORT int offsetX();
+    WEBCORE_EXPORT int offsetY();
+    bool isSimulated() const { return m_isSimulated; }
+    int pageX() const final;
+    int pageY() const final;
+    virtual const LayoutPoint& pageLocation() const;
+    WEBCORE_EXPORT int x() const;
+    WEBCORE_EXPORT int y() const;
 
-        // Page point in "absolute" coordinates (i.e. post-zoomed, page-relative coords,
-        // usable with RenderObject::absoluteToLocal).
-        const LayoutPoint& absoluteLocation() const { return m_absoluteLocation; }
-        void setAbsoluteLocation(const LayoutPoint& p) { m_absoluteLocation = p; }
+    // Page point in "absolute" coordinates (i.e. post-zoomed, page-relative coords,
+    // usable with RenderObject::absoluteToLocal).
+    const LayoutPoint& absoluteLocation() const { return m_absoluteLocation; }
+    void setAbsoluteLocation(const LayoutPoint& p) { m_absoluteLocation = p; }
 
-    protected:
-        MouseRelatedEvent();
-        MouseRelatedEvent(const AtomicString& type, bool canBubble, bool cancelable, double timestamp, PassRefPtr<AbstractView>,
-                          int detail, const IntPoint& screenLocation, const IntPoint& windowLocation,
+protected:
+    MouseRelatedEvent();
+    MouseRelatedEvent(const AtomicString& type, bool canBubble, bool cancelable, double timestamp, DOMWindow*,
+        int detail, const IntPoint& screenLocation, const IntPoint& windowLocation,
 #if ENABLE(POINTER_LOCK)
-                          const IntPoint& movementDelta,
+        const IntPoint& movementDelta,
 #endif
-                          bool ctrlKey, bool altKey, bool shiftKey, bool metaKey, bool isSimulated = false);
+        bool ctrlKey, bool altKey, bool shiftKey, bool metaKey, bool isSimulated = false);
+    MouseRelatedEvent(const AtomicString& type, const MouseRelatedEventInit&, IsTrusted = IsTrusted::No);
 
-        void initCoordinates();
-        void initCoordinates(const LayoutPoint& clientLocation);
-        virtual void receivedTarget() override;
+    void initCoordinates();
+    void initCoordinates(const LayoutPoint& clientLocation);
+    void receivedTarget() final;
 
-        void computePageLocation();
-        void computeRelativePosition();
+    void computePageLocation();
+    void computeRelativePosition();
 
-        // Expose these so MouseEvent::initMouseEvent can set them.
-        IntPoint m_screenLocation;
-        LayoutPoint m_clientLocation;
+    // Expose these so MouseEvent::initMouseEvent can set them.
+    IntPoint m_screenLocation;
+    LayoutPoint m_clientLocation;
 #if ENABLE(POINTER_LOCK)
-        LayoutPoint m_movementDelta;
+    LayoutPoint m_movementDelta;
 #endif
 
-    private:
-        LayoutPoint m_pageLocation;
-        LayoutPoint m_layerLocation;
-        LayoutPoint m_offsetLocation;
-        LayoutPoint m_absoluteLocation;
-        bool m_isSimulated;
-        bool m_hasCachedRelativePosition;
-    };
+private:
+    void init(bool isSimulated, const IntPoint&);
 
-} // namespace WebCore
+    LayoutPoint m_pageLocation;
+    LayoutPoint m_layerLocation;
+    LayoutPoint m_offsetLocation;
+    LayoutPoint m_absoluteLocation;
+    bool m_isSimulated;
+    bool m_hasCachedRelativePosition;
+};
 
-#endif // MouseRelatedEvent_h
+} // namespace WebCore