Changeset 48333 in webkit

Timestamp:

Sep 12, 2009 1:14:53 AM (15 years ago)

Author:

weinig@apple.com

Message:

WebCore: Fix for ​https://bugs.webkit.org/show_bug.cgi?id=29217
Document.caretRangeFromPoint should take the scroll offset into account before hit testing

Reviewed by Maciej Stachowiak.

In accordance with the CSSOM View Module spec, Document.caretRangeFromPoint should interpret
the point passed to it as relative to the viewport, not the document.

Test: fast/dom/Document/CaretRangeFromPoint/hittest-relative-to-viewport.html

• dom/Document.cpp:

(WebCore::Document::caretRangeFromPoint):

LayoutTests: Test for ​https://bugs.webkit.org/show_bug.cgi?id=29217
Document.caretRangeFromPoint should take the scroll offset into account before hit testing

Reviewed by Maciej Stachowiak.

• fast/dom/Document/CaretRangeFromPoint/hittest-relative-to-viewport-expected.txt: Added.
• fast/dom/Document/CaretRangeFromPoint/hittest-relative-to-viewport.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dom/Document/CaretRangeFromPoint/hittest-relative-to-viewport-expected.txt (added)
• LayoutTests/fast/dom/Document/CaretRangeFromPoint/hittest-relative-to-viewport.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/dom/Document.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2009-09-12  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Maciej Stachowiak.
+
+        Test for https://bugs.webkit.org/show_bug.cgi?id=29217
+        Document.caretRangeFromPoint should take the scroll offset into account before hit testing
+
+        * fast/dom/Document/CaretRangeFromPoint/hittest-relative-to-viewport-expected.txt: Added.
+        * fast/dom/Document/CaretRangeFromPoint/hittest-relative-to-viewport.html: Added.
+
 2009-09-11  Oliver Hunt  <oliver@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-09-12  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Maciej Stachowiak.
+
+        Fix for https://bugs.webkit.org/show_bug.cgi?id=29217
+        Document.caretRangeFromPoint should take the scroll offset into account before hit testing
+
+        In accordance with the CSSOM View Module spec, Document.caretRangeFromPoint should interpret
+        the point passed to it as relative to the viewport, not the document.
+
+        Test: fast/dom/Document/CaretRangeFromPoint/hittest-relative-to-viewport.html
+
+        * dom/Document.cpp:
+        (WebCore::Document::caretRangeFromPoint):
+
 2009-09-11  Chris Marrin  <cmarrin@apple.com>
 

trunk/WebCore/dom/Document.cpp

@@ -954 +954 @@
     if (!frame)
         return 0;
-
-    float zoomFactor = frame->pageZoomFactor();
-    IntPoint point = roundedIntPoint(FloatPoint(x * zoomFactor, y * zoomFactor));
-
     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;