Changeset 48188 in webkit

Timestamp:

Sep 8, 2009 3:02:41 PM (15 years ago)

Author:

weinig@apple.com

Message:

WebCore: Fix for ​https://bugs.webkit.org/show_bug.cgi?id=27046
Implement CSSOM DocumentView.caretRangeFromPoint

Reviewed by Timothy Hatcher.

Tests: fast/dom/Document/CaretRangeFromPoint/basic.html

fast/dom/Document/CaretRangeFromPoint/replace-element.html

• dom/Document.cpp:

(WebCore::Document::caretRangeFromPoint):

• dom/Document.h:
• dom/Document.idl:

LayoutTests: Test for ​https://bugs.webkit.org/show_bug.cgi?id=27046
Implement CSSOM DocumentView.caretRangeFromPoint

Reviewed by Timothy Hatcher.

• fast/dom/Document/CaretRangeFromPoint: Added.
• fast/dom/Document/CaretRangeFromPoint/basic-expected.txt: Added.
• fast/dom/Document/CaretRangeFromPoint/basic.html: Added.
• fast/dom/Document/CaretRangeFromPoint/replace-element-expected.txt: Added.
• fast/dom/Document/CaretRangeFromPoint/replace-element.html: Added.
• fast/dom/Window/window-properties-expected.txt:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dom/Document/CaretRangeFromPoint (added)
• LayoutTests/fast/dom/Document/CaretRangeFromPoint/basic-expected.txt (added)
• LayoutTests/fast/dom/Document/CaretRangeFromPoint/basic.html (added)
• LayoutTests/fast/dom/Document/CaretRangeFromPoint/replace-element-expected.txt (added)
• LayoutTests/fast/dom/Document/CaretRangeFromPoint/replace-element.html (added)
• LayoutTests/fast/dom/Window/window-properties-expected.txt (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/dom/Document.cpp (modified) (4 diffs)
• WebCore/dom/Document.h (modified) (1 diff)
• WebCore/dom/Document.idl (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2009-09-08  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Timothy Hatcher.
+
+        Test for https://bugs.webkit.org/show_bug.cgi?id=27046
+        Implement CSSOM DocumentView.caretRangeFromPoint
+
+        * fast/dom/Document/CaretRangeFromPoint: Added.
+        * fast/dom/Document/CaretRangeFromPoint/basic-expected.txt: Added.
+        * fast/dom/Document/CaretRangeFromPoint/basic.html: Added.
+        * fast/dom/Document/CaretRangeFromPoint/replace-element-expected.txt: Added.
+        * fast/dom/Document/CaretRangeFromPoint/replace-element.html: Added.
+        * fast/dom/Window/window-properties-expected.txt:
+
 2009-09-08  Brian Weinstein  <bweinstein@apple.com>
 

trunk/LayoutTests/fast/dom/Window/window-properties-expected.txt

@@ -540 +540 @@
 window.Document.prototype.adoptNode [function]
 window.Document.prototype.appendChild [function]
+window.Document.prototype.caretRangeFromPoint [function]
 window.Document.prototype.cloneNode [function]
 window.Document.prototype.compareDocumentPosition [function]

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-09-08  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Timothy Hatcher.
+
+        Fix for https://bugs.webkit.org/show_bug.cgi?id=27046
+        Implement CSSOM DocumentView.caretRangeFromPoint
+
+        Tests: fast/dom/Document/CaretRangeFromPoint/basic.html
+               fast/dom/Document/CaretRangeFromPoint/replace-element.html
+
+        * dom/Document.cpp:
+        (WebCore::Document::caretRangeFromPoint):
+        * dom/Document.h:
+        * dom/Document.idl:
+
 2009-09-08  Kevin Ollivier  <kevino@theolliviers.com>
 

trunk/WebCore/dom/Document.cpp

@@ -111 +111 @@
 #include "SelectionController.h"
 #include "Settings.h"
-
-#if ENABLE(SHARED_WORKERS)
-#include "SharedWorkerRepository.h"
-#endif
-
 #include "StyleSheetList.h"
 #include "TextEvent.h"
@@ -129 +124 @@
 #include "XMLNames.h"
 #include "XMLTokenizer.h"
+#include "htmlediting.h"
 #include <wtf/CurrentTime.h>
 #include <wtf/HashFunctions.h>
@@ -138 +134 @@
 #include "Database.h"
 #include "DatabaseThread.h"
+#endif
+
+#if ENABLE(SHARED_WORKERS)
+#include "SharedWorkerRepository.h"
 #endif
 
@@ -942 +942 @@
         n = n->shadowAncestorNode();
     return static_cast<Element*>(n);
+}
+
+PassRefPtr<Range> Document::caretRangeFromPoint(int x, int y)
+{
+    if (!renderer())
+        return 0;
+    Frame* frame = this->frame();
+    if (!frame)
+        return 0;
+
+    float zoomFactor = frame->pageZoomFactor();
+    IntPoint point = roundedIntPoint(FloatPoint(x * zoomFactor, y * zoomFactor));
+
+    FrameView* frameView = frame->view();
+    if (!frameView)
+        return 0;
+    if (!frameView->boundsRect().contains(point))
+        return 0;
+
+    HitTestRequest request(HitTestRequest::ReadOnly | HitTestRequest::Active);
+    HitTestResult result(point);
+    renderView()->layer()->hitTest(request, result);
+
+    Node* node = result.innerNode();
+    if (!node)
+        return 0;
+
+    Node* shadowAncestorNode = node->shadowAncestorNode();
+    if (shadowAncestorNode != node) {
+        unsigned offset = shadowAncestorNode->nodeIndex();
+        Node* container = shadowAncestorNode->parentNode();
+        return Range::create(this, container, offset, container, offset);
+    }
+
+    RenderObject* renderer = node->renderer();
+    if (!renderer)
+        return 0;
+    VisiblePosition visiblePosition = renderer->positionForPoint(result.localPoint());
+    if (visiblePosition.isNull())
+        return 0;
+
+    Position rangeCompliantPosition = rangeCompliantEquivalent(visiblePosition);
+    return Range::create(this, rangeCompliantPosition, rangeCompliantPosition);
 }
 

trunk/WebCore/dom/Document.h

@@ -229 +229 @@
 
     Element* elementFromPoint(int x, int y) const;
+    PassRefPtr<Range> caretRangeFromPoint(int x, int y);
+
     String readyState() const;
 

trunk/WebCore/dom/Document.idl

@@ -192 +192 @@
 
         Element            elementFromPoint(in long x, in long y);
+        Range              caretRangeFromPoint(in long x, in long y);
 
         // Mozilla extensions