Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(329)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: Source/WebKit/chromium/tests/WebFrameTest.cpp

Issue 15017002: WebFrame::selectRange and moveCaret should behave like mouse selection (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Move to method of VisibleSelection, fix style nits Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« Source/WebKit/chromium/public/WebFrame.h ('K') | « Source/WebKit/chromium/src/WebFrameImpl.cpp ('k') | Source/WebKit/chromium/tests/data/move_caret.html » ('j') | Source/core/page/EventHandler.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebKit/chromium/tests/WebFrameTest.cpp
diff --git a/Source/WebKit/chromium/tests/WebFrameTest.cpp b/Source/WebKit/chromium/tests/WebFrameTest.cpp
index c36270a0b6d95bfc19c75bffcaf1cfd2ea2df98f..de1cd834393cba1be96de3942271db817fa72f90 100644
--- a/Source/WebKit/chromium/tests/WebFrameTest.cpp
+++ b/Source/WebKit/chromium/tests/WebFrameTest.cpp
@@ -2199,8 +2199,6 @@ TEST_F(WebFrameTest, SelectRange)
registerMockedHttpURLLoad("select_range_basic.html");
registerMockedHttpURLLoad("select_range_scroll.html");
- registerMockedHttpURLLoad("select_range_iframe.html");
- registerMockedHttpURLLoad("select_range_editable.html");
m_webView = createWebViewForTextSelection(m_baseURL + "select_range_basic.html");
frame = m_webView->mainFrame();
@@ -2223,6 +2221,16 @@ TEST_F(WebFrameTest, SelectRange)
EXPECT_EQ("Some offscreen test text for testing.", selectionAsString(frame));
m_webView->close();
m_webView = 0;
+}
+
+TEST_F(WebFrameTest, SelectRangeInIframe)
+{
+ WebFrame* frame;
+ WebRect startWebRect;
+ WebRect endWebRect;
+
+ registerMockedHttpURLLoad("select_range_iframe.html");
+ registerMockedHttpURLLoad("select_range_basic.html");
m_webView = createWebViewForTextSelection(m_baseURL + "select_range_iframe.html");
frame = m_webView->mainFrame();
@@ -2235,21 +2243,75 @@ TEST_F(WebFrameTest, SelectRange)
EXPECT_EQ("Some test text for testing.", selectionAsString(subframe));
m_webView->close();
m_webView = 0;
+}
+
+TEST_F(WebFrameTest, SelectRangeDivContentEditable)
+{
+ WebFrame* frame;
+ WebRect startWebRect;
+ WebRect endWebRect;
+
+ registerMockedHttpURLLoad("select_range_div_editable.html");
// Select the middle of an editable element, then try to extend the selection to the top of the document.
// The selection range should be clipped to the bounds of the editable element.
- m_webView = createWebViewForTextSelection(m_baseURL + "select_range_editable.html");
+ m_webView = createWebViewForTextSelection(m_baseURL + "select_range_div_editable.html");
frame = m_webView->mainFrame();
EXPECT_EQ("This text is initially selected.", selectionAsString(frame));
m_webView->selectionBounds(startWebRect, endWebRect);
+
frame->selectRange(bottomRightMinusOne(endWebRect), WebPoint(0, 0));
EXPECT_EQ("16-char header. This text is initially selected.", selectionAsString(frame));
m_webView->close();
m_webView = 0;
// As above, but extending the selection to the bottom of the document.
- m_webView = createWebViewForTextSelection(m_baseURL + "select_range_editable.html");
+ m_webView = createWebViewForTextSelection(m_baseURL + "select_range_div_editable.html");
frame = m_webView->mainFrame();
+
+ m_webView->selectionBounds(startWebRect, endWebRect);
+ frame->selectRange(topLeft(startWebRect), bottomRightMinusOne(endWebRect));
+ EXPECT_EQ("This text is initially selected.", selectionAsString(frame));
+ m_webView->selectionBounds(startWebRect, endWebRect);
+
+ m_webView->selectionBounds(startWebRect, endWebRect);
+ frame->selectRange(topLeft(startWebRect), WebPoint(640, 480));
+ EXPECT_EQ("This text is initially selected. 16-char footer.", selectionAsString(frame));
+ m_webView->close();
+ m_webView = 0;
+}
+
+// positionForPoint returns the wrong values for contenteditable spans. See
+// http://crbug.com/238334.
+TEST_F(WebFrameTest, DISABLED_SelectRangeSpanContentEditable)
+{
+ WebFrame* frame;
+ WebRect startWebRect;
+ WebRect endWebRect;
+
+ registerMockedHttpURLLoad("select_range_span_editable.html");
+
+ // Select the middle of an editable element, then try to extend the selection to the top of the document.
+ // The selection range should be clipped to the bounds of the editable element.
+ m_webView = createWebViewForTextSelection(m_baseURL + "select_range_span_editable.html");
+ frame = m_webView->mainFrame();
+ EXPECT_EQ("This text is initially selected.", selectionAsString(frame));
+ m_webView->selectionBounds(startWebRect, endWebRect);
+
+ frame->selectRange(bottomRightMinusOne(endWebRect), WebPoint(0, 0));
+ EXPECT_EQ("16-char header. This text is initially selected.", selectionAsString(frame));
+ m_webView->close();
+ m_webView = 0;
+
+ // As above, but extending the selection to the bottom of the document.
+ m_webView = createWebViewForTextSelection(m_baseURL + "select_range_span_editable.html");
+ frame = m_webView->mainFrame();
+
+ m_webView->selectionBounds(startWebRect, endWebRect);
+ frame->selectRange(topLeft(startWebRect), bottomRightMinusOne(endWebRect));
+ EXPECT_EQ("This text is initially selected.", selectionAsString(frame));
+ m_webView->selectionBounds(startWebRect, endWebRect);
+
EXPECT_EQ("This text is initially selected.", selectionAsString(frame));
m_webView->selectionBounds(startWebRect, endWebRect);
frame->selectRange(topLeft(startWebRect), WebPoint(640, 480));
@@ -2300,7 +2362,9 @@ TEST_F(WebFrameTest, SelectRangeCanMoveSelectionStart)
frame->executeScript(WebScriptSource("selectElement('editable_2');"));
EXPECT_EQ("Editable 2.", selectionAsString(frame));
frame->selectRange(bottomRightMinusOne(elementBounds(frame, "editable_2")), topLeft(elementBounds(frame, "header_2")));
- EXPECT_EQ("[ Editable 1. Editable 2.", selectionAsString(frame));
+ // positionForPoint returns the wrong values for contenteditable spans. See
+ // http://crbug.com/238334.
+ // EXPECT_EQ("[ Editable 1. Editable 2.", selectionAsString(frame));
}
TEST_F(WebFrameTest, SelectRangeCanMoveSelectionEnd)
@@ -2345,10 +2409,75 @@ TEST_F(WebFrameTest, SelectRangeCanMoveSelectionEnd)
frame->executeScript(WebScriptSource("selectElement('editable_1');"));
EXPECT_EQ("Editable 1.", selectionAsString(frame));
frame->selectRange(topLeft(elementBounds(frame, "editable_1")), bottomRightMinusOne(elementBounds(frame, "footer_1")));
- EXPECT_EQ("Editable 1. Editable 2. ]", selectionAsString(frame));
+ // positionForPoint returns the wrong values for contenteditable spans. See
+ // http://crbug.com/238334.
+ // EXPECT_EQ("Editable 1. Editable 2. ]", selectionAsString(frame));
+}
+
+// positionForPoint returns the wrong values for contenteditable spans. See
+// http://crbug.com/238334.
+TEST_F(WebFrameTest, DISABLED_PositionForPointTest)
+{
+ registerMockedHttpURLLoad("select_range_span_editable.html");
+ m_webView = createWebViewForTextSelection(m_baseURL + "select_range_span_editable.html");
+ WebFrameImpl* mainFrame = static_cast<WebFrameImpl*>(m_webView->mainFrame());
+ WebCore::RenderObject* renderer = mainFrame->frame()->selection()->rootEditableElement()->renderer();
+ EXPECT_EQ(0, renderer->positionForPoint(WebCore::LayoutPoint(-1, -1)).deepEquivalent().computeOffsetInContainerNode());
+ EXPECT_EQ(64, renderer->positionForPoint(WebCore::LayoutPoint(1000, 1000)).deepEquivalent().computeOffsetInContainerNode());
+
+ registerMockedHttpURLLoad("select_range_div_editable.html");
+ m_webView = createWebViewForTextSelection(m_baseURL + "select_range_div_editable.html");
+ mainFrame = static_cast<WebFrameImpl*>(m_webView->mainFrame());
+ renderer = mainFrame->frame()->selection()->rootEditableElement()->renderer();
+ EXPECT_EQ(0, renderer->positionForPoint(WebCore::LayoutPoint(-1, -1)).deepEquivalent().computeOffsetInContainerNode());
+ EXPECT_EQ(64, renderer->positionForPoint(WebCore::LayoutPoint(1000, 1000)).deepEquivalent().computeOffsetInContainerNode());
}
#if OS(ANDROID)
+TEST_F(WebFrameTest, SelectRangeStaysHorizontallyAlignedWhenMoved)
+{
+ WebFrameImpl* frame;
+ registerMockedHttpURLLoad("move_caret.html");
+
+ m_webView = createWebViewForTextSelection(m_baseURL + "move_caret.html");
+ frame = (WebFrameImpl*)m_webView->mainFrame();
+
+ WebRect initialStartRect;
+ WebRect initialEndRect;
+ WebRect startRect;
+ WebRect endRect;
+
+ frame->executeScript(WebScriptSource("selectRange();"));
+ m_webView->selectionBounds(initialStartRect, initialEndRect);
+ WebPoint movedStart(topLeft(initialStartRect));
+
+ movedStart.y += 40;
+ frame->selectRange(movedStart, bottomRightMinusOne(initialEndRect));
+ m_webView->selectionBounds(startRect, endRect);
+ EXPECT_EQ(startRect, initialStartRect);
+ EXPECT_EQ(endRect, initialEndRect);
+
+ movedStart.y -= 80;
+ frame->selectRange(movedStart, bottomRightMinusOne(initialEndRect));
+ m_webView->selectionBounds(startRect, endRect);
+ EXPECT_EQ(startRect, initialStartRect);
+ EXPECT_EQ(endRect, initialEndRect);
+
+ WebPoint movedEnd(bottomRightMinusOne(initialEndRect));
+
+ movedEnd.y += 40;
+ frame->selectRange(topLeft(initialStartRect), movedEnd);
+ m_webView->selectionBounds(startRect, endRect);
+ EXPECT_EQ(startRect, initialStartRect);
+ EXPECT_EQ(endRect, initialEndRect);
+
+ movedEnd.y -= 80;
+ frame->selectRange(topLeft(initialStartRect), movedEnd);
+ m_webView->selectionBounds(startRect, endRect);
+ EXPECT_EQ(startRect, initialStartRect);
+ EXPECT_EQ(endRect, initialEndRect);
+}
+
TEST_F(WebFrameTest, MoveCaretStaysHorizontallyAlignedWhenMoved)
{
WebFrameImpl* frame;
@@ -2362,7 +2491,7 @@ TEST_F(WebFrameTest, MoveCaretStaysHorizontallyAlignedWhenMoved)
WebRect startRect;
WebRect endRect;
- frame->executeScript(WebScriptSource("select();"));
+ frame->executeScript(WebScriptSource("selectCaret();"));
m_webView->selectionBounds(initialStartRect, initialEndRect);
WebPoint moveTo(topLeft(initialStartRect));
« Source/WebKit/chromium/public/WebFrame.h ('K') | « Source/WebKit/chromium/src/WebFrameImpl.cpp ('k') | Source/WebKit/chromium/tests/data/move_caret.html » ('j') | Source/core/page/EventHandler.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698