Changeset 83320 in webkit

Timestamp:

Apr 8, 2011 11:53:21 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-04-08 Varun Jain <​varunjain@chromium.org>

Reviewed by Darin Fisher.

Need to extend WebKit chromium API to access text selection
​https://bugs.webkit.org/show_bug.cgi?id=57888

• Source/WebKit/chromium/public/WebFrame.h:
• Source/WebKit/chromium/public/WebWidget.h:
• Source/WebKit/chromium/src/WebFrameImpl.cpp:
• Source/WebKit/chromium/src/WebFrameImpl.h:
• Source/WebKit/chromium/src/WebPopupMenuImpl.h:
• Source/WebKit/chromium/src/WebViewImpl.cpp:
• Source/WebKit/chromium/src/WebViewImpl.h:
• Source/WebKit/chromium/tests/PopupMenuTest.cpp:

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/WebKit/chromium/public/WebFrame.h (modified) (2 diffs)
• Source/WebKit/chromium/public/WebWidget.h (modified) (2 diffs)
• Source/WebKit/chromium/src/WebFrameImpl.cpp (modified) (4 diffs)
• Source/WebKit/chromium/src/WebFrameImpl.h (modified) (2 diffs)
• Source/WebKit/chromium/src/WebPopupMenuImpl.h (modified) (1 diff)
• Source/WebKit/chromium/src/WebViewImpl.cpp (modified) (1 diff)
• Source/WebKit/chromium/src/WebViewImpl.h (modified) (1 diff)
• Source/WebKit/chromium/tests/PopupMenuTest.cpp (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2011-04-08  Varun Jain  <varunjain@chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        Need to extend WebKit chromium API to access text selection
+        https://bugs.webkit.org/show_bug.cgi?id=57888
+
+        *  Source/WebKit/chromium/public/WebFrame.h:
+        *  Source/WebKit/chromium/public/WebWidget.h:
+        *  Source/WebKit/chromium/src/WebFrameImpl.cpp:
+        *  Source/WebKit/chromium/src/WebFrameImpl.h:
+        *  Source/WebKit/chromium/src/WebPopupMenuImpl.h:
+        *  Source/WebKit/chromium/src/WebViewImpl.cpp:
+        *  Source/WebKit/chromium/src/WebViewImpl.h:
+        *  Source/WebKit/chromium/tests/PopupMenuTest.cpp:
+
 2011-04-08  Jon Lee  <jonlee@apple.com>
 

trunk/Source/WebKit/chromium/public/WebFrame.h

@@ -68 +68 @@
 struct WebConsoleMessage;
 struct WebFindOptions;
+struct WebPoint;
 struct WebRect;
 struct WebScriptSource;
@@ -408 +409 @@
     // there is ranged selection.
     virtual bool selectWordAroundCaret() = 0;
+
+    virtual void selectRange(const WebPoint& start, const WebPoint& end) = 0;
 
 

trunk/Source/WebKit/chromium/public/WebWidget.h

@@ -42 +42 @@
 class WebInputEvent;
 class WebString;
+struct WebPoint;
 struct WebRect;
 struct WebSize;
@@ -127 +128 @@
     virtual WebRect caretOrSelectionBounds() = 0;
 
+    // Returns the start and end point for the current selection, aligned to the
+    // bottom of the selected line.
+    // FIXME: make this pure virtual after all downstream classes have
+    // implemented it.
+    virtual bool selectionRange(WebPoint& start, WebPoint& end) const
+    {
+        return false;
+    }
+
     // Changes the text direction of the selected input node.
     virtual void setTextDirection(WebTextDirection) = 0;

trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp

@@ -91 +91 @@
 #include "FrameTree.h"
 #include "FrameView.h"
+#include "HitTestResult.h"
 #include "HTMLCollection.h"
 #include "HTMLFormElement.h"
@@ -107 +108 @@
 #include "PrintContext.h"
 #include "RenderFrame.h"
+#include "RenderLayer.h"
 #include "RenderObject.h"
 #include "RenderTreeAsText.h"
@@ -141 +143 @@
 #include "WebPlugin.h"
 #include "WebPluginContainerImpl.h"
+#include "WebPoint.h"
 #include "WebRange.h"
 #include "WebRect.h"
@@ -1304 +1307 @@
     selectWordAroundPosition(frame(), controller->selection().visibleStart());
     return true;
+}
+
+void WebFrameImpl::selectRange(const WebPoint& start, const WebPoint& end)
+{
+    VisibleSelection selection(visiblePositionForWindowPoint(start),
+                               visiblePositionForWindowPoint(end));
+
+    if (frame()->selection()->shouldChangeSelection(selection))
+        frame()->selection()->setSelection(selection, CharacterGranularity,
+                                           MakeNonDirectionalSelection);
+}
+
+VisiblePosition WebFrameImpl::visiblePositionForWindowPoint(const WebPoint& point)
+{
+    HitTestRequest::HitTestRequestType hitType = HitTestRequest::MouseMove;
+    hitType |= HitTestRequest::ReadOnly;
+    hitType |= HitTestRequest::Active;
+    HitTestRequest request(hitType);
+    FrameView* view = frame()->view();
+    HitTestResult result(view->windowToContents(
+        view->convertFromContainingWindow(IntPoint(point.x, point.y))));
+
+    frame()->document()->renderView()->layer()->hitTest(request, result);
+
+    // Matching the logic in MouseEventWithHitTestResults::targetNode()
+    Node* node = result.innerNode();
+    if (!node)
+        return VisiblePosition();
+    Element* element = node->parentElement();
+    if (!node->inDocument() && element && element->inDocument())
+        node = element;
+
+    return node->renderer()->positionForPoint(result.localPoint());
 }
 

trunk/Source/WebKit/chromium/src/WebFrameImpl.h

@@ -158 +158 @@
     virtual WebString selectionAsMarkup() const;
     virtual bool selectWordAroundCaret();
+    virtual void selectRange(const WebPoint& start, const WebPoint& end);
     virtual int printBegin(const WebSize& pageSize,
                            const WebNode& constrainToNode,
@@ -327 +328 @@
     void loadJavaScriptURL(const WebCore::KURL&);
 
+    // Returns a hit-tested VisiblePosition for the given point
+    WebCore::VisiblePosition visiblePositionForWindowPoint(const WebPoint&);
+
     FrameLoaderClientImpl m_frameLoaderClient;
 

trunk/Source/WebKit/chromium/src/WebPopupMenuImpl.h

@@ -79 +79 @@
     virtual WebTextInputType textInputType();
     virtual WebRect caretOrSelectionBounds();
+    virtual bool selectionRange(WebPoint& start, WebPoint& end) const { return false; }
     virtual void setTextDirection(WebTextDirection direction);
     virtual bool isAcceleratedCompositingActive() const { return false; }

trunk/Source/WebKit/chromium/src/WebViewImpl.cpp

@@ -1455 +1455 @@
 }
 
+bool WebViewImpl::selectionRange(WebPoint& start, WebPoint& end) const
+{
+    const Frame* frame = focusedWebCoreFrame();
+    if (!frame)
+        return false;
+    RefPtr<Range> selectedRange = frame->selection()->toNormalizedRange();
+    RefPtr<Range> range(Range::create(selectedRange->startContainer()->document(),
+                                      selectedRange->startContainer(),
+                                      selectedRange->startOffset(),
+                                      selectedRange->startContainer(),
+                                      selectedRange->startOffset()));
+
+    IntRect rect = frame->editor()->firstRectForRange(range.get());
+    start.x = rect.x();
+    start.y = rect.y() + rect.height() - 1;
+
+    range = Range::create(selectedRange->endContainer()->document(),
+                          selectedRange->endContainer(),
+                          selectedRange->endOffset(),
+                          selectedRange->endContainer(),
+                          selectedRange->endOffset());
+
+    rect = frame->editor()->firstRectForRange(range.get());
+    end.x = rect.x() + rect.width() - 1;
+    end.y = rect.y() + rect.height() - 1;
+
+    start = frame->view()->contentsToWindow(start);
+    end = frame->view()->contentsToWindow(end);
+    return true;
+}
+
 void WebViewImpl::setTextDirection(WebTextDirection direction)
 {

trunk/Source/WebKit/chromium/src/WebViewImpl.h

@@ -110 +110 @@
     virtual WebTextInputType textInputType();
     virtual WebRect caretOrSelectionBounds();
+    virtual bool selectionRange(WebPoint& start, WebPoint& end) const;
     virtual void setTextDirection(WebTextDirection direction);
     virtual bool isAcceleratedCompositingActive() const;

trunk/Source/WebKit/chromium/tests/PopupMenuTest.cpp

@@ -143 +143 @@
     virtual WebTextInputType textInputType() { return WebKit::WebTextInputTypeNone; }
     virtual WebRect caretOrSelectionBounds() { return WebRect(); }
+    virtual bool selectionRange(WebPoint& start, WebPoint& end) const { return false; }
     virtual void setTextDirection(WebTextDirection) { }
 };