Changeset 118611 in webkit

Timestamp:

May 26, 2012, 10:14:05 AM (13 years ago)

Author:

mitz@apple.com

Message:

<rdar://problem/11439771> WebProcess sends many synchronous messages to the UI process while scrolling beneath ScrollView::contentsToScreen()
​https://bugs.webkit.org/show_bug.cgi?id=87571

Reviewed by Anders Carlsson.

fakeMouseEventTimerFired() uses the last known mouse position for the fake mouse event, but
calls contentsToScreen() to compute a corresponding position in screen coordinates. Avoid
this by also recording the last known mouse position in screen coordinates, and using that
value.

• page/EventHandler.cpp:

(WebCore::EventHandler::clear): Added resetting m_currentMouseGlobalPosition.
(WebCore::EventHandler::handleMousePressEvent): Added updating m_currentMouseGlobalPosition
when updating m_currentMousePosition.
(WebCore::EventHandler::handleMouseDoubleClickEvent): Ditto.
(WebCore::EventHandler::handleMouseMoveEvent): Ditto.
(WebCore::EventHandler::handleMouseReleaseEvent): Ditto.
(WebCore::EventHandler::fakeMouseMoveEventTimerFired): Changed to use m_currentMouseGlobalPosition
in the fake event instead of calling contentsToScreen().

• page/EventHandler.h: Added m_currentMouseGlobalPosition data member.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/EventHandler.cpp (modified) (6 diffs)
• page/EventHandler.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-25  Dan Bernstein  <mitz@apple.com>
+
+        <rdar://problem/11439771> WebProcess sends many synchronous messages to the UI process while scrolling beneath ScrollView::contentsToScreen()
+        https://bugs.webkit.org/show_bug.cgi?id=87571
+
+        Reviewed by Anders Carlsson.
+
+        fakeMouseEventTimerFired() uses the last known mouse position for the fake mouse event, but
+        calls contentsToScreen() to compute a corresponding position in screen coordinates. Avoid
+        this by also recording the last known mouse position in screen coordinates, and using that
+        value.
+
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::clear): Added resetting m_currentMouseGlobalPosition.
+        (WebCore::EventHandler::handleMousePressEvent): Added updating m_currentMouseGlobalPosition
+        when updating m_currentMousePosition.
+        (WebCore::EventHandler::handleMouseDoubleClickEvent): Ditto.
+        (WebCore::EventHandler::handleMouseMoveEvent): Ditto.
+        (WebCore::EventHandler::handleMouseReleaseEvent): Ditto.
+        (WebCore::EventHandler::fakeMouseMoveEventTimerFired): Changed to use m_currentMouseGlobalPosition
+        in the fake event instead of calling contentsToScreen().
+        * page/EventHandler.h: Added m_currentMouseGlobalPosition data member.
+
 2012-05-25  Philippe Normand  <pnormand@igalia.com>
 

trunk/Source/WebCore/page/EventHandler.cpp

@@ -358 +358 @@
 #endif
     m_currentMousePosition = IntPoint();
+    m_currentMouseGlobalPosition = IntPoint();
     m_mousePressNode = 0;
     m_mousePressed = false;
@@ -1499 +1500 @@
     m_capturesDragging = true;
     m_currentMousePosition = mouseEvent.position();
+    m_currentMouseGlobalPosition = mouseEvent.globalPosition();
     m_mouseDownTimestamp = mouseEvent.timestamp();
 #if ENABLE(DRAG_SUPPORT)
@@ -1632 +1634 @@
     m_mousePressed = false;
     m_currentMousePosition = mouseEvent.position();
+    m_currentMouseGlobalPosition = mouseEvent.globalPosition();
 
     HitTestRequest request(HitTestRequest::Active);
@@ -1726 +1729 @@
     RefPtr<FrameView> protector(m_frame->view());
     m_currentMousePosition = mouseEvent.position();
+    m_currentMouseGlobalPosition = mouseEvent.globalPosition();
 
     if (m_hoverTimer.isActive())
@@ -1849 +1853 @@
     m_mousePressed = false;
     m_currentMousePosition = mouseEvent.position();
+    m_currentMouseGlobalPosition = mouseEvent.globalPosition();
 
 #if ENABLE(SVG)
@@ -2669 +2674 @@
     bool metaKey;
     PlatformKeyboardEvent::getCurrentModifierState(shiftKey, ctrlKey, altKey, metaKey);
-    IntPoint globalPoint = view->contentsToScreen(IntRect(view->windowToContents(m_currentMousePosition), IntSize())).location();
-    PlatformMouseEvent fakeMouseMoveEvent(m_currentMousePosition, globalPoint, NoButton, PlatformEvent::MouseMoved, 0, shiftKey, ctrlKey, altKey, metaKey, currentTime());
+    PlatformMouseEvent fakeMouseMoveEvent(m_currentMousePosition, m_currentMouseGlobalPosition, NoButton, PlatformEvent::MouseMoved, 0, shiftKey, ctrlKey, altKey, metaKey, currentTime());
     mouseMoved(fakeMouseMoveEvent);
 }

trunk/Source/WebCore/page/EventHandler.h

@@ -426 +426 @@
     
     IntPoint m_currentMousePosition;
+    IntPoint m_currentMouseGlobalPosition;
     IntPoint m_mouseDownPos; // In our view's coords.
     double m_mouseDownTimestamp;