Changeset 48334 in webkit

Timestamp:

Sep 12, 2009 12:11:55 PM (15 years ago)

Author:

weinig@apple.com

Message:

WebCore: Fix for ​https://bugs.webkit.org/show_bug.cgi?id=29219
Document.elementFromPoint() should take page scroll into consideration

Reviewed by Anders Carlsson.

Test: fast/dom/elementFromPoint-relative-to-viewport.html

• dom/Document.cpp:

(WebCore::Document::elementFromPoint):
(WebCore::Document::caretRangeFromPoint):

LayoutTests: Test for ​https://bugs.webkit.org/show_bug.cgi?id=29219
Document.elementFromPoint() should take page scroll into consideration

Reviewed by Anders Carlsson.

• fast/dom/elementFromPoint-relative-to-viewport-expected.txt: Added.
• fast/dom/elementFromPoint-relative-to-viewport.html: Added.
• fast/events/offsetX-offsetY.html: Change to use clientX/Y instead of pageX/Y.
• fast/forms/slider-transformed.html: Ditto.
• fast/forms/slider-zoomed.html: Ditto.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dom/elementFromPoint-relative-to-viewport-expected.txt (added)
• LayoutTests/fast/dom/elementFromPoint-relative-to-viewport.html (added)
• LayoutTests/fast/events/offsetX-offsetY.html (modified) (1 diff)
• LayoutTests/fast/forms/slider-transformed.html (modified) (1 diff)
• LayoutTests/fast/forms/slider-zoomed.html (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/dom/Document.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2009-09-12  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Anders Carlsson.
+
+        Test for https://bugs.webkit.org/show_bug.cgi?id=29219
+        Document.elementFromPoint() should take page scroll into consideration
+
+        * fast/dom/elementFromPoint-relative-to-viewport-expected.txt: Added.
+        * fast/dom/elementFromPoint-relative-to-viewport.html: Added.
+        * fast/events/offsetX-offsetY.html: Change to use clientX/Y instead of pageX/Y.
+        * fast/forms/slider-transformed.html: Ditto.
+        * fast/forms/slider-zoomed.html: Ditto.
+
 2009-09-12  Sam Weinig  <sam@webkit.org>
 

trunk/LayoutTests/fast/events/offsetX-offsetY.html

@@ -53 +53 @@
       ev.expectedOffsetX = expectedOffsetX;
       ev.expectedOffsetY = expectedOffsetY;
-      var target = document.elementFromPoint(ev.pageX, ev.pageY);
+      var target = document.elementFromPoint(ev.clientX, ev.clientY);
       target.dispatchEvent(ev);
     }

trunk/LayoutTests/fast/forms/slider-transformed.html

@@ -22 +22 @@
       var ev = document.createEvent("MouseEvent");
       ev.initMouseEvent(eventType, true, true, window, 1, 1, 1, clientX, clientY, false, false, false, false, 0, document);
-      var target = document.elementFromPoint(ev.pageX, ev.pageY);
+      var target = document.elementFromPoint(ev.clientX, ev.clientY);
       target.dispatchEvent(ev);
     }

trunk/LayoutTests/fast/forms/slider-zoomed.html

@@ -23 +23 @@
       var ev = document.createEvent("MouseEvent");
       ev.initMouseEvent(eventType, true, true, window, 1, 1, 1, clientX, clientY, false, false, false, false, 0, document);
-      var target = document.elementFromPoint(ev.pageX, ev.pageY);
+      var target = document.elementFromPoint(ev.clientX, ev.clientY);
       target.dispatchEvent(ev);
     }

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-09-12  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Anders Carlsson.
+
+        Fix for https://bugs.webkit.org/show_bug.cgi?id=29219
+        Document.elementFromPoint() should take page scroll into consideration
+
+        Test: fast/dom/elementFromPoint-relative-to-viewport.html
+
+        * dom/Document.cpp:
+        (WebCore::Document::elementFromPoint):
+        (WebCore::Document::caretRangeFromPoint):
+
 2009-09-12  Sam Weinig  <sam@webkit.org>
 

trunk/WebCore/dom/Document.cpp

@@ -928 +928 @@
 Element* Document::elementFromPoint(int x, int y) const
 {
+    // FIXME: Share code between this and caretRangeFromPoint.
     if (!renderer())
         return 0;
-
-    HitTestRequest request(HitTestRequest::ReadOnly |
-                           HitTestRequest::Active);
-
-    float zoomFactor = frame() ? frame()->pageZoomFactor() : 1.0f;
-
-    HitTestResult result(roundedIntPoint(FloatPoint(x * zoomFactor, y * zoomFactor)));
-    renderView()->layer()->hitTest(request, result); 
+    Frame* frame = this->frame();
+    if (!frame)
+        return 0;
+    FrameView* frameView = frame->view();
+    if (!frameView)
+        return 0;
+
+    float zoomFactor = frame->pageZoomFactor();
+    IntPoint point = roundedIntPoint(FloatPoint(x * zoomFactor, y * zoomFactor)) + view()->scrollOffset();
+
+    if (!frameView->boundsRect().contains(point))
+        return 0;
+
+    HitTestRequest request(HitTestRequest::ReadOnly | HitTestRequest::Active);
+    HitTestResult result(point);
+    renderView()->layer()->hitTest(request, result);
 
     Node* n = result.innerNode();
@@ -949 +958 @@
 PassRefPtr<Range> Document::caretRangeFromPoint(int x, int y)
 {
+    // FIXME: Share code between this and elementFromPoint.
     if (!renderer())
         return 0;