Changeset 142011 in webkit

Timestamp:

Feb 6, 2013 11:07:27 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[Chromium] WebWidget should expose a way to determine the start/end of the selection bounds
​https://bugs.webkit.org/show_bug.cgi?id=108667

Patch by Chris Hopman <​cjhopman@chromium.org> on 2013-02-06
Reviewed by Darin Fisher.

WebWidget::selectionBounds() returns the anchor and focus of the
selection. This matches the arguments to WebFrame::selectRange().
Add WebWidget::isSelectionAnchorFirst so that a caller can convert the
anchor/focus to start/end.

• public/WebWidget.h:

(WebWidget):
(WebKit::WebWidget::isSelectionAnchorFirst):

• src/WebViewImpl.cpp:

(WebKit::WebViewImpl::isSelectionAnchorFirst):
(WebKit):

• src/WebViewImpl.h:
• tests/WebViewTest.cpp:

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• public/WebWidget.h (modified) (1 diff)
• src/WebViewImpl.cpp (modified) (1 diff)
• src/WebViewImpl.h (modified) (1 diff)
• tests/WebViewTest.cpp (modified) (1 diff)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2013-02-06  Chris Hopman  <cjhopman@chromium.org>
+
+        [Chromium] WebWidget should expose a way to determine the start/end of the selection bounds
+        https://bugs.webkit.org/show_bug.cgi?id=108667
+
+        Reviewed by Darin Fisher.
+
+        WebWidget::selectionBounds() returns the anchor and focus of the
+        selection. This matches the arguments to WebFrame::selectRange().
+        Add WebWidget::isSelectionAnchorFirst so that a caller can convert the
+        anchor/focus to start/end.
+
+        * public/WebWidget.h:
+        (WebWidget):
+        (WebKit::WebWidget::isSelectionAnchorFirst):
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::isSelectionAnchorFirst):
+        (WebKit):
+        * src/WebViewImpl.h:
+        * tests/WebViewTest.cpp:
+
 2013-02-06  Alec Flett  <alecflett@chromium.org>
 

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

@@ -199 +199 @@
     virtual bool selectionTextDirection(WebTextDirection& start, WebTextDirection& end) const { return false; }
 
+    // Returns true if the selection range is nonempty and its anchor is first
+    // (i.e its anchor is its start).
+    virtual bool isSelectionAnchorFirst() const { return false; }
+
     // Fetch the current selection range of this WebWidget. If there is no
     // selection, it will output a 0-length range with the location at the

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

@@ -2419 +2419 @@
 }
 
+bool WebViewImpl::isSelectionAnchorFirst() const
+{
+    const Frame* frame = focusedWebCoreFrame();
+    if (!frame)
+        return false;
+    FrameSelection* selection = frame->selection();
+    if (!selection)
+        return false;
+    return selection->selection().isBaseFirst();
+}
+
 bool WebViewImpl::setEditableSelectionOffsets(int start, int end)
 {

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

@@ -173 +173 @@
     virtual bool selectionBounds(WebRect& anchor, WebRect& focus) const;
     virtual bool selectionTextDirection(WebTextDirection& start, WebTextDirection& end) const;
+    virtual bool isSelectionAnchorFirst() const;
     virtual bool caretOrSelectionRange(size_t* location, size_t* length);
     virtual void setTextDirection(WebTextDirection direction);

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

@@ -457 +457 @@
 }
 
+TEST_F(WebViewTest, IsSelectionAnchorFirst)
+{
+    URLTestHelpers::registerMockedURLFromBaseURL(WebString::fromUTF8(m_baseURL.c_str()), WebString::fromUTF8("input_field_populated.html"));
+    WebView* webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "input_field_populated.html");
+    WebFrame* frame = webView->mainFrame();
+
+    webView->setInitialFocus(false);
+    webView->setEditableSelectionOffsets(4, 10);
+    EXPECT_TRUE(webView->isSelectionAnchorFirst());
+    WebRect anchor;
+    WebRect focus;
+    webView->selectionBounds(anchor, focus);
+    frame->selectRange(WebPoint(focus.x, focus.y), WebPoint(anchor.x, anchor.y));
+    EXPECT_FALSE(webView->isSelectionAnchorFirst());
+    webView->close();
+}
+
 TEST_F(WebViewTest, ResetScrollAndScaleState)
 {