Changeset 99014 in webkit

Timestamp:

Nov 1, 2011 5:08:04 PM (12 years ago)

Author:

eae@chromium.org

Message:

Use IntPoint for screen coordinates in MouseEvent
​https://bugs.webkit.org/show_bug.cgi?id=71327

Reviewed by Darin Adler.

Change mouse events to use int/IntPoint for screen/window coordinates and
LayoutUnit/LayoutPoint for coordinates adjusted for zooming.

No new tests.

• dom/MouseRelatedEvent.cpp:

(WebCore::MouseRelatedEvent::MouseRelatedEvent):
(WebCore::MouseRelatedEvent::computeRelativePosition):

• dom/MouseRelatedEvent.h:

(WebCore::MouseRelatedEvent::screenLocation):
Revert screenLocation and windowLocation back to int.

• page/DragController.cpp:

(WebCore::elementUnderMouse):
Change elementUnderMouse to use a LayoutPoint for hit testing.

• page/EventHandler.cpp:

(WebCore::EventHandler::clear):
(WebCore::EventHandler::currentMousePosition):
(WebCore::documentPointForWindowPoint):
(WebCore::EventHandler::fakeMouseMoveEventTimerFired):

• page/EventHandler.h:

Revert m_currentMousePosition to IntPoint as it represents a
screen coordinate.

• platform/PlatformMouseEvent.h:

(WebCore::PlatformMouseEvent::PlatformMouseEvent):
(WebCore::PlatformMouseEvent::pos):
(WebCore::PlatformMouseEvent::x):
(WebCore::PlatformMouseEvent::y):
(WebCore::PlatformMouseEvent::globalX):
(WebCore::PlatformMouseEvent::globalY):

• platform/mac/PlatformMouseEventMac.mm:

(WebCore::globalPoint):
(WebCore::pointForEvent):
(WebCore::globalPointForEvent):
Revert PlatformMouseEvent to int/IntPoint as it represents a screen
coordinate.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/MouseRelatedEvent.cpp (modified) (3 diffs)
• dom/MouseRelatedEvent.h (modified) (3 diffs)
• page/DragController.cpp (modified) (1 diff)
• page/EventHandler.cpp (modified) (4 diffs)
• page/EventHandler.h (modified) (2 diffs)
• platform/PlatformMouseEvent.h (modified) (5 diffs)
• platform/mac/PlatformMouseEventMac.mm (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-11-01  Emil A Eklund  <eae@chromium.org>
+
+        Use IntPoint for screen coordinates in MouseEvent
+        https://bugs.webkit.org/show_bug.cgi?id=71327
+
+        Reviewed by Darin Adler.
+
+        Change mouse events to use int/IntPoint for screen/window coordinates and
+        LayoutUnit/LayoutPoint for coordinates adjusted for zooming.
+
+        No new tests.
+
+        * dom/MouseRelatedEvent.cpp:
+        (WebCore::MouseRelatedEvent::MouseRelatedEvent):
+        (WebCore::MouseRelatedEvent::computeRelativePosition):
+        * dom/MouseRelatedEvent.h:
+        (WebCore::MouseRelatedEvent::screenLocation):
+        Revert screenLocation and windowLocation back to int.
+
+        * page/DragController.cpp:
+        (WebCore::elementUnderMouse):
+        Change elementUnderMouse to use a LayoutPoint for hit testing.
+
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::clear):
+        (WebCore::EventHandler::currentMousePosition):
+        (WebCore::documentPointForWindowPoint):
+        (WebCore::EventHandler::fakeMouseMoveEventTimerFired):
+        * page/EventHandler.h:
+        Revert m_currentMousePosition to IntPoint as it represents a
+        screen coordinate.
+
+        * platform/PlatformMouseEvent.h:
+        (WebCore::PlatformMouseEvent::PlatformMouseEvent):
+        (WebCore::PlatformMouseEvent::pos):
+        (WebCore::PlatformMouseEvent::x):
+        (WebCore::PlatformMouseEvent::y):
+        (WebCore::PlatformMouseEvent::globalX):
+        (WebCore::PlatformMouseEvent::globalY):
+        * platform/mac/PlatformMouseEventMac.mm:
+        (WebCore::globalPoint):
+        (WebCore::pointForEvent):
+        (WebCore::globalPointForEvent):
+        Revert PlatformMouseEvent to int/IntPoint as it represents a screen
+        coordinate.
+
 2011-11-01  Tony Chang  <tony@chromium.org>
 

trunk/Source/WebCore/dom/MouseRelatedEvent.cpp

@@ -54 +54 @@
 
 MouseRelatedEvent::MouseRelatedEvent(const AtomicString& eventType, bool canBubble, bool cancelable, PassRefPtr<AbstractView> abstractView,
-                                     int detail, const LayoutPoint& screenLocation, const LayoutPoint& windowLocation,
+                                     int detail, const IntPoint& screenLocation, const IntPoint& windowLocation,
                                      bool ctrlKey, bool altKey, bool shiftKey, bool metaKey, bool isSimulated)
     : UIEventWithKeyState(eventType, canBubble, cancelable, abstractView, detail, ctrlKey, altKey, shiftKey, metaKey)
@@ -81 +81 @@
     }
 
-    m_clientLocation = adjustedPageLocation - toSize(scrollPosition);
+    m_clientLocation = adjustedPageLocation - toLayoutSize(scrollPosition);
     m_pageLocation = adjustedPageLocation;
 
@@ -182 +182 @@
         layer->updateLayerPosition();
         for (; layer; layer = layer->parent()) {
-            m_layerLocation -= toSize(layer->location());
+            m_layerLocation -= toLayoutSize(layer->location());
         }
     }

trunk/Source/WebCore/dom/MouseRelatedEvent.h

@@ -37 +37 @@
         int screenX() const { return m_screenLocation.x(); }
         int screenY() const { return m_screenLocation.y(); }
-        const LayoutPoint& screenLocation() const { return m_screenLocation; }
+        const IntPoint& screenLocation() const { return m_screenLocation; }
         int clientX() const { return m_clientLocation.x(); }
         int clientY() const { return m_clientLocation.y(); }
@@ -60 +60 @@
         MouseRelatedEvent();
         MouseRelatedEvent(const AtomicString& type, bool canBubble, bool cancelable, PassRefPtr<AbstractView>,
-                          int detail, const LayoutPoint& screenLocation, const LayoutPoint& windowLocation,
+                          int detail, const IntPoint& screenLocation, const IntPoint& windowLocation,
                           bool ctrlKey, bool altKey, bool shiftKey, bool metaKey, bool isSimulated = false);
 
@@ -71 +71 @@
         
         // Expose these so MouseEvent::initMouseEvent can set them.
-        LayoutPoint m_screenLocation;
+        IntPoint m_screenLocation;
         LayoutPoint m_clientLocation;
 

trunk/Source/WebCore/page/DragController.cpp

@@ -270 +270 @@
     Frame* frame = documentUnderMouse->frame();
     float zoomFactor = frame ? frame->pageZoomFactor() : 1;
-    IntPoint point = roundedIntPoint(FloatPoint(p.x() * zoomFactor, p.y() * zoomFactor));
+    LayoutPoint point = roundedLayoutPoint(FloatPoint(p.x() * zoomFactor, p.y() * zoomFactor));
 
     HitTestRequest request(HitTestRequest::ReadOnly | HitTestRequest::Active);

trunk/Source/WebCore/page/EventHandler.cpp

@@ -258 +258 @@
     m_shouldOnlyFireDragOverEvent = false;
 #endif
-    m_currentMousePosition = LayoutPoint();
+    m_currentMousePosition = IntPoint();
     m_mousePressNode = 0;
     m_mousePressed = false;
@@ -1127 +1127 @@
 }
 
-LayoutPoint EventHandler::currentMousePosition() const
+IntPoint EventHandler::currentMousePosition() const
 {
     return m_currentMousePosition;
@@ -1335 +1335 @@
 }
     
-static LayoutPoint documentPointForWindowPoint(Frame* frame, const LayoutPoint& windowPoint)
+static LayoutPoint documentPointForWindowPoint(Frame* frame, const IntPoint& windowPoint)
 {
     FrameView* view = frame->view();
@@ -2407 +2407 @@
     bool metaKey;
     PlatformKeyboardEvent::getCurrentModifierState(shiftKey, ctrlKey, altKey, metaKey);
-    LayoutPoint globalPoint = view->contentsToScreen(LayoutRect(view->windowToContents(m_currentMousePosition), LayoutSize())).location();
+    IntPoint globalPoint = view->contentsToScreen(IntRect(view->windowToContents(m_currentMousePosition), IntSize())).location();
     PlatformMouseEvent fakeMouseMoveEvent(m_currentMousePosition, globalPoint, NoButton, MouseEventMoved, 0, shiftKey, ctrlKey, altKey, metaKey, currentTime());
     mouseMoved(fakeMouseMoveEvent);

trunk/Source/WebCore/page/EventHandler.h

@@ -137 +137 @@
     void resizeLayerDestroyed();
 
-    LayoutPoint currentMousePosition() const;
+    IntPoint currentMousePosition() const;
 
     static Frame* subframeForTargetNode(Node*);
@@ -401 +401 @@
     LayoutSize m_offsetFromResizeCorner; // In the coords of m_resizeLayer.
     
-    LayoutPoint m_currentMousePosition;
+    IntPoint m_currentMousePosition;
     LayoutPoint m_mouseDownPos; // In our view's coords.
     double m_mouseDownTimestamp;

trunk/Source/WebCore/platform/PlatformMouseEvent.h

@@ -27 +27 @@
 #define PlatformMouseEvent_h
 
-#include "LayoutTypes.h"
+#include "IntPoint.h"
 
 #if PLATFORM(GTK)
@@ -84 +84 @@
         }
 
-        PlatformMouseEvent(const LayoutPoint& position, const LayoutPoint& globalPosition, MouseButton button, MouseEventType eventType,
+        PlatformMouseEvent(const IntPoint& position, const IntPoint& globalPosition, MouseButton button, MouseEventType eventType,
                            int clickCount, bool shift, bool ctrl, bool alt, bool meta, double timestamp)
             : m_position(position)
@@ -105 +105 @@
         }
 
-        const LayoutPoint& pos() const { return m_position; }
-        LayoutUnit x() const { return m_position.x(); }
-        LayoutUnit y() const { return m_position.y(); }
-        LayoutUnit globalX() const { return m_globalPosition.x(); }
-        LayoutUnit globalY() const { return m_globalPosition.y(); }
+        const IntPoint& pos() const { return m_position; }
+        int x() const { return m_position.x(); }
+        int y() const { return m_position.y(); }
+        int globalX() const { return m_globalPosition.x(); }
+        int globalY() const { return m_globalPosition.y(); }
         MouseButton button() const { return m_button; }
         MouseEventType eventType() const { return m_eventType; }
@@ -161 +161 @@
 
     protected:
-        LayoutPoint m_position;
-        LayoutPoint m_globalPosition;
+        IntPoint m_position;
+        IntPoint m_globalPosition;
         MouseButton m_button;
         MouseEventType m_eventType;
@@ -181 +181 @@
 
 #if PLATFORM(MAC) && defined(__OBJC__)
-    LayoutPoint globalPoint(const NSPoint& windowPoint, NSWindow *);
-    LayoutPoint pointForEvent(NSEvent *, NSView *windowView);
-    LayoutPoint globalPointForEvent(NSEvent *);
+    IntPoint globalPoint(const NSPoint& windowPoint, NSWindow *);
+    IntPoint pointForEvent(NSEvent *, NSView *windowView);
+    IntPoint globalPointForEvent(NSEvent *);
 #endif
 

trunk/Source/WebCore/platform/mac/PlatformMouseEventMac.mm

@@ -69 +69 @@
 }
 
-LayoutPoint globalPoint(const NSPoint& windowPoint, NSWindow *window)
+IntPoint globalPoint(const NSPoint& windowPoint, NSWindow *window)
 {
-    return LayoutPoint(flipScreenPoint([window convertBaseToScreen:windowPoint], screenForWindow(window)));
+    return IntPoint(flipScreenPoint([window convertBaseToScreen:windowPoint], screenForWindow(window)));
 }
 
-LayoutPoint pointForEvent(NSEvent *event, NSView *windowView)
+IntPoint pointForEvent(NSEvent *event, NSView *windowView)
 {
     switch ([event type]) {
@@ -93 +93 @@
             if (windowView)
                 location = [windowView convertPoint:location fromView:nil];
-            return LayoutPoint(location);
+            return IntPoint(location);
         }
         default:
-            return LayoutPoint();
+            return IntPoint();
     }
 }
 
-LayoutPoint globalPointForEvent(NSEvent *event)
+IntPoint globalPointForEvent(NSEvent *event)
 {
     switch ([event type]) {
@@ -116 +116 @@
             return globalPoint([event locationInWindow], [event window]);
         default:
-            return LayoutPoint();
+            return IntPoint();
     }
 }