Changeset 49551 in webkit

Timestamp:

Oct 13, 2009 8:16:03 PM (15 years ago)

Author:

weinig@apple.com

Message:

WebCore: Fix issue where clientX and clientY on MouseEvents were wrong when
the page was zoomed and scrolled.

Reviewed by David Hyatt.

Test: fast/events/clientXY-in-zoom-and-scroll.html

• dom/MouseRelatedEvent.cpp:

(WebCore::contentsX): Take page zoom into account.
(WebCore::contentsY): Ditto.

LayoutTests: Test issue where clientX and clientY on MouseEvents were wrong when
the page was zoomed and scrolled.

Reviewed by David Hyatt.

• fast/events/clientXY-in-zoom-and-scroll-expected.txt: Added.
• fast/events/clientXY-in-zoom-and-scroll.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/events/clientXY-in-zoom-and-scroll-expected.txt (added)
• LayoutTests/fast/events/clientXY-in-zoom-and-scroll.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/dom/MouseRelatedEvent.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2009-10-13  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by David Hyatt.
+
+        Test issue where clientX and clientY on MouseEvents were wrong when
+        the page was zoomed and scrolled.
+
+        * fast/events/clientXY-in-zoom-and-scroll-expected.txt: Added.
+        * fast/events/clientXY-in-zoom-and-scroll.html: Added.
+
 2009-10-13  Dmitry Titov  <dimich@chromium.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-10-13  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by David Hyatt.
+
+        Fix issue where clientX and clientY on MouseEvents were wrong when
+        the page was zoomed and scrolled.
+
+        Test: fast/events/clientXY-in-zoom-and-scroll.html
+
+        * dom/MouseRelatedEvent.cpp:
+        (WebCore::contentsX): Take page zoom into account.
+        (WebCore::contentsY): Ditto.
+
 2009-10-13  Dave Hyatt  <hyatt@apple.com>
 

trunk/WebCore/dom/MouseRelatedEvent.cpp

@@ -58 +58 @@
     if (!frameView)
         return 0;
-    return frameView->scrollX();
+    return frameView->scrollX() / frame->pageZoomFactor();
 }
 
@@ -71 +71 @@
     if (!frameView)
         return 0;
-    return frameView->scrollY();
+    return frameView->scrollY() / frame->pageZoomFactor();
 }