Changeset 82584 in webkit

Timestamp:

Mar 31, 2011 9:01:13 AM (13 years ago)

Author:

Dimitri Glazkov

Message:

2011-03-31 Dimitri Glazkov <Dimitri Glazkov>

Reviewed by Darin Adler.

Move coordinate-computing logic into MouseRelatedEvent.
​https://bugs.webkit.org/show_bug.cgi?id=57521

Refactoring, covered by existing tests.

• dom/EventDispatcher.cpp: (WebCore::EventDispatcher::dispatchWheelEvent): Yank calculation of

coordinates out.

(WebCore::EventDispatcher::dispatchMouseEvent): Ditto.

• dom/MouseEvent.cpp: (WebCore::MouseEvent::create): Add coordinate-computing logic.
• dom/MouseEvent.h: Adjust decl to reflect new meaning of params.
• dom/MouseRelatedEvent.cpp: (WebCore::MouseRelatedEvent::MouseRelatedEvent): Ditto.
• page/EventHandler.cpp: (WebCore::EventHandler::dispatchDragEvent): Ditto.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/EventDispatcher.cpp (modified) (3 diffs)
• dom/MouseEvent.cpp (modified) (1 diff)
• dom/MouseEvent.h (modified) (1 diff)
• dom/MouseRelatedEvent.cpp (modified) (1 diff)
• page/EventHandler.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-03-31  Dimitri Glazkov  <dglazkov@chromium.org>
+
+        Reviewed by Darin Adler.
+
+        Move coordinate-computing logic into MouseRelatedEvent.
+        https://bugs.webkit.org/show_bug.cgi?id=57521
+
+        Refactoring, covered by existing tests.
+
+        * dom/EventDispatcher.cpp:
+        (WebCore::EventDispatcher::dispatchWheelEvent): Yank calculation of
+            coordinates out.
+        (WebCore::EventDispatcher::dispatchMouseEvent): Ditto.
+        * dom/MouseEvent.cpp:
+        (WebCore::MouseEvent::create): Add coordinate-computing logic.
+        * dom/MouseEvent.h: Adjust decl to reflect new meaning of params.
+        * dom/MouseRelatedEvent.cpp:
+        (WebCore::MouseRelatedEvent::MouseRelatedEvent): Ditto.
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::dispatchDragEvent): Ditto.
+
 2011-03-30  Alexander Pavlov  <apavlov@chromium.org>
 

trunk/Source/WebCore/dom/EventDispatcher.cpp

@@ -138 +138 @@
     EventDispatcher dispatcher(node);
 
-    if (!dispatcher.m_view)
-        return;
-
-    IntPoint position = dispatcher.m_view->windowToContents(event.pos());
-
-    int adjustedPageX = position.x();
-    int adjustedPageY = position.y();
-    if (Frame* frame = node->document()->frame()) {
-        float pageZoom = frame->pageZoomFactor();
-        if (pageZoom != 1.0f) {
-            adjustedPageX = lroundf(position.x() / pageZoom);
-            adjustedPageY = lroundf(position.y() / pageZoom);
-        }
-    }
-
     RefPtr<WheelEvent> wheelEvent = WheelEvent::create(event.wheelTicksX(), event.wheelTicksY(), event.deltaX(), event.deltaY(), granularity(event),
-        node->document()->defaultView(), event.globalX(), event.globalY(), adjustedPageX, adjustedPageY,
+        node->document()->defaultView(), event.globalX(), event.globalY(), event.x(), event.y(),
         event.ctrlKey(), event.altKey(), event.shiftKey(), event.metaKey());
-
-    wheelEvent->setAbsoluteLocation(position);
 
     if (!dispatcher.dispatchEvent(wheelEvent) || wheelEvent->defaultHandled())
@@ -327 +310 @@
     RefPtr<Node> relatedTarget = pullOutOfShadow(relatedTargetArg);
 
-    IntPoint contentsPosition;
-    if (FrameView* view = node->document()->view())
-        contentsPosition = view->windowToContents(event.pos());
-
-    IntPoint adjustedPagePosition = contentsPosition;
-    if (Frame* frame = node->document()->frame()) {
-        float pageZoom = frame->pageZoomFactor();
-        if (pageZoom != 1.0f) {
-            // Adjust our pageX and pageY to account for the page zoom.
-            adjustedPagePosition.setX(lroundf(contentsPosition.x() / pageZoom));
-            adjustedPagePosition.setY(lroundf(contentsPosition.y() / pageZoom));
-        }
-    }
-
-    RefPtr<MouseEvent> mouseEvent = MouseEvent::create(eventType, node->document()->defaultView(), event, adjustedPagePosition, detail, relatedTarget);
-    mouseEvent->setAbsoluteLocation(contentsPosition);
+    RefPtr<MouseEvent> mouseEvent = MouseEvent::create(eventType, node->document()->defaultView(), event, detail, relatedTarget);
 
     bool swallowEvent = false;
@@ -356 +324 @@
     // as a separate event in other DOM-compliant browsers like Firefox, and so we do the same.
     if (eventType == eventNames().clickEvent && detail == 2) {
-        RefPtr<Event> doubleClickEvent = MouseEvent::create(eventNames().dblclickEvent, node->document()->defaultView(), event, adjustedPagePosition, detail, relatedTarget);
+        RefPtr<Event> doubleClickEvent = MouseEvent::create(eventNames().dblclickEvent, node->document()->defaultView(), event, detail, relatedTarget);
         if (defaultHandled)
             doubleClickEvent->setDefaultHandled();

trunk/Source/WebCore/dom/MouseEvent.cpp

@@ -31 +31 @@
 namespace WebCore {
 
-PassRefPtr<MouseEvent> MouseEvent::create(const AtomicString& eventType, PassRefPtr<AbstractView> view, const PlatformMouseEvent& event, const IntPoint& position, int detail, PassRefPtr<Node> relatedTarget)
+PassRefPtr<MouseEvent> MouseEvent::create(const AtomicString& eventType, PassRefPtr<AbstractView> view, const PlatformMouseEvent& event, int detail, PassRefPtr<Node> relatedTarget)
 {
     bool isCancelable = eventType != eventNames().mousemoveEvent;
 
     return MouseEvent::create(eventType, true, isCancelable, view,
-        detail, event.globalX(), event.globalY(), position.x(), position.y(),
+        detail, event.globalX(), event.globalY(), event.x(), event.y(),
         event.ctrlKey(), event.altKey(), event.shiftKey(), event.metaKey(), event.button(),
         relatedTarget, 0, false);

trunk/Source/WebCore/dom/MouseEvent.h

@@ -47 +47 @@
                 ctrlKey, altKey, shiftKey, metaKey, button, relatedTarget, clipboard, isSimulated));
         }
-        static PassRefPtr<MouseEvent> create(const AtomicString& eventType, PassRefPtr<AbstractView>, const PlatformMouseEvent&, const IntPoint&, int detail, PassRefPtr<Node> relatedTarget);
+        static PassRefPtr<MouseEvent> create(const AtomicString& eventType, PassRefPtr<AbstractView>, const PlatformMouseEvent&, int detail, PassRefPtr<Node> relatedTarget);
 
         virtual ~MouseEvent();

trunk/Source/WebCore/dom/MouseRelatedEvent.cpp

@@ -75 +75 @@
 }
 
-MouseRelatedEvent::MouseRelatedEvent(const AtomicString& eventType, bool canBubble, bool cancelable, PassRefPtr<AbstractView> viewArg,
-                                     int detail, int screenX, int screenY, int pageX, int pageY,
+MouseRelatedEvent::MouseRelatedEvent(const AtomicString& eventType, bool canBubble, bool cancelable, PassRefPtr<AbstractView> abstractView,
+                                     int detail, int screenX, int screenY, int windowX, int windowY,
                                      bool ctrlKey, bool altKey, bool shiftKey, bool metaKey, bool isSimulated)
-    : UIEventWithKeyState(eventType, canBubble, cancelable, viewArg, detail, ctrlKey, altKey, shiftKey, metaKey)
+    : UIEventWithKeyState(eventType, canBubble, cancelable, abstractView, detail, ctrlKey, altKey, shiftKey, metaKey)
     , m_screenX(screenX)
     , m_screenY(screenY)
-    , m_clientX(pageX - contentsX(view()))
-    , m_clientY(pageY - contentsY(view()))
-    , m_pageX(pageX)
-    , m_pageY(pageY)
+    , m_clientX(0)
+    , m_clientY(0)
+    , m_pageX(0)
+    , m_pageY(0)
     , m_isSimulated(isSimulated)
 {
+    IntPoint adjustedPageLocation;
+    IntPoint scrollPosition;
+
+    Frame* frame = view() ? view()->frame() : 0;
+    if (frame && !isSimulated) {
+        if (FrameView* frameView = frame->view()) {
+            scrollPosition = frameView->scrollPosition();
+            adjustedPageLocation = frameView->windowToContents(IntPoint(windowX, windowY));
+            float pageZoom = frame->pageZoomFactor();
+            if (pageZoom != 1.0f) {
+                // Adjust our pageX and pageY to account for the page zoom.
+                adjustedPageLocation.setX(lroundf(adjustedPageLocation.x() / pageZoom));
+                adjustedPageLocation.setY(lroundf(adjustedPageLocation.y() / pageZoom));
+                scrollPosition.setX(scrollPosition.x() / pageZoom);
+                scrollPosition.setY(scrollPosition.y() / pageZoom);
+            }
+        }
+    }
+
+    IntPoint clientLocation(adjustedPageLocation - scrollPosition);
+    m_clientX = clientLocation.x();
+    m_clientY = clientLocation.y();
+    m_pageX = adjustedPageLocation.x();
+    m_pageY = adjustedPageLocation.y();
+
     initCoordinates();
 }

trunk/Source/WebCore/page/EventHandler.cpp

@@ -1689 +1689 @@
 
     view->resetDeferredRepaintDelay();
-    IntPoint contentsPos = view->windowToContents(event.pos());
-
     RefPtr<MouseEvent> me = MouseEvent::create(eventType,
         true, true, m_frame->document()->defaultView(),
-        0, event.globalX(), event.globalY(), contentsPos.x(), contentsPos.y(),
+        0, event.globalX(), event.globalY(), event.x(), event.y(),
         event.ctrlKey(), event.altKey(), event.shiftKey(), event.metaKey(),
         0, 0, clipboard);