Index: third_party/WebKit/Source/web/tests/WebViewTest.cpp |
diff --git a/third_party/WebKit/Source/web/tests/WebViewTest.cpp b/third_party/WebKit/Source/web/tests/WebViewTest.cpp |
index ce3e2e1ec00b447c57166580c9702c4c726ff082..54681d52122929501bc7362df1b61acd3c1ae5fd 100644 |
--- a/third_party/WebKit/Source/web/tests/WebViewTest.cpp |
+++ b/third_party/WebKit/Source/web/tests/WebViewTest.cpp |
@@ -796,8 +796,8 @@ TEST_F(WebViewTest, SetEditableSelectionOffsetsAndTextInputInfo) |
URLTestHelpers::registerMockedURLFromBaseURL(WebString::fromUTF8(m_baseURL.c_str()), WebString::fromUTF8("input_field_populated.html")); |
WebViewImpl* webView = m_webViewHelper.initializeAndLoad(m_baseURL + "input_field_populated.html"); |
webView->setInitialFocus(false); |
+ webView->setEditableSelectionOffsets(5, 13); |
WebLocalFrameImpl* frame = webView->mainFrameImpl(); |
- frame->setEditableSelectionOffsets(5, 13); |
EXPECT_EQ("56789abc", frame->selectionAsText()); |
WebTextInputInfo info = webView->textInputInfo(); |
EXPECT_EQ("0123456789abcdefghijklmnopqrstuvwxyz", info.value); |
@@ -809,8 +809,8 @@ TEST_F(WebViewTest, SetEditableSelectionOffsetsAndTextInputInfo) |
URLTestHelpers::registerMockedURLFromBaseURL(WebString::fromUTF8(m_baseURL.c_str()), WebString::fromUTF8("content_editable_populated.html")); |
webView = m_webViewHelper.initializeAndLoad(m_baseURL + "content_editable_populated.html"); |
webView->setInitialFocus(false); |
+ webView->setEditableSelectionOffsets(8, 19); |
frame = webView->mainFrameImpl(); |
- frame->setEditableSelectionOffsets(8, 19); |
EXPECT_EQ("89abcdefghi", frame->selectionAsText()); |
info = webView->textInputInfo(); |
EXPECT_EQ("0123456789abcdefghijklmnopqrstuvwxyz", info.value); |
@@ -900,9 +900,8 @@ TEST_F(WebViewTest, InsertNewLinePlacementAfterConfirmComposition) |
WebVector<WebCompositionUnderline> emptyUnderlines; |
- WebLocalFrameImpl* frame = webView->mainFrameImpl(); |
- frame->setEditableSelectionOffsets(4, 4); |
- frame->setCompositionFromExistingText(8, 12, emptyUnderlines); |
+ webView->setEditableSelectionOffsets(4, 4); |
+ webView->setCompositionFromExistingText(8, 12, emptyUnderlines); |
WebTextInputInfo info = webView->textInputInfo(); |
EXPECT_EQ("0123456789abcdefghijklmnopqrstuvwxyz", std::string(info.value.utf8().data())); |
@@ -932,15 +931,14 @@ TEST_F(WebViewTest, ExtendSelectionAndDelete) |
{ |
URLTestHelpers::registerMockedURLFromBaseURL(WebString::fromUTF8(m_baseURL.c_str()), WebString::fromUTF8("input_field_populated.html")); |
WebViewImpl* webView = m_webViewHelper.initializeAndLoad(m_baseURL + "input_field_populated.html"); |
- WebLocalFrameImpl* frame = webView->mainFrameImpl(); |
webView->setInitialFocus(false); |
- frame->setEditableSelectionOffsets(10, 10); |
- frame->extendSelectionAndDelete(5, 8); |
+ webView->setEditableSelectionOffsets(10, 10); |
+ webView->extendSelectionAndDelete(5, 8); |
WebTextInputInfo info = webView->textInputInfo(); |
EXPECT_EQ("01234ijklmnopqrstuvwxyz", std::string(info.value.utf8().data())); |
EXPECT_EQ(5, info.selectionStart); |
EXPECT_EQ(5, info.selectionEnd); |
- frame->extendSelectionAndDelete(10, 0); |
+ webView->extendSelectionAndDelete(10, 0); |
info = webView->textInputInfo(); |
EXPECT_EQ("ijklmnopqrstuvwxyz", std::string(info.value.utf8().data())); |
} |
@@ -952,16 +950,15 @@ TEST_F(WebViewTest, SetCompositionFromExistingText) |
webView->setInitialFocus(false); |
WebVector<WebCompositionUnderline> underlines(static_cast<size_t>(1)); |
underlines[0] = WebCompositionUnderline(0, 4, 0, false, 0); |
- WebLocalFrameImpl* frame = webView->mainFrameImpl(); |
- frame->setEditableSelectionOffsets(4, 10); |
- frame->setCompositionFromExistingText(8, 12, underlines); |
+ webView->setEditableSelectionOffsets(4, 10); |
+ webView->setCompositionFromExistingText(8, 12, underlines); |
WebTextInputInfo info = webView->textInputInfo(); |
EXPECT_EQ(4, info.selectionStart); |
EXPECT_EQ(10, info.selectionEnd); |
EXPECT_EQ(8, info.compositionStart); |
EXPECT_EQ(12, info.compositionEnd); |
WebVector<WebCompositionUnderline> emptyUnderlines; |
- frame->setCompositionFromExistingText(0, 0, emptyUnderlines); |
+ webView->setCompositionFromExistingText(0, 0, emptyUnderlines); |
info = webView->textInputInfo(); |
EXPECT_EQ(4, info.selectionStart); |
EXPECT_EQ(10, info.selectionEnd); |
@@ -976,15 +973,14 @@ TEST_F(WebViewTest, SetCompositionFromExistingTextInTextArea) |
webView->setInitialFocus(false); |
WebVector<WebCompositionUnderline> underlines(static_cast<size_t>(1)); |
underlines[0] = WebCompositionUnderline(0, 4, 0, false, 0); |
- WebLocalFrameImpl* frame = webView->mainFrameImpl(); |
- frame->setEditableSelectionOffsets(27, 27); |
+ webView->setEditableSelectionOffsets(27, 27); |
std::string newLineText("\n"); |
webView->confirmComposition(WebString::fromUTF8(newLineText.c_str())); |
WebTextInputInfo info = webView->textInputInfo(); |
EXPECT_EQ("0123456789abcdefghijklmnopq\nrstuvwxyz", std::string(info.value.utf8().data())); |
- frame->setEditableSelectionOffsets(31, 31); |
- frame->setCompositionFromExistingText(30, 34, underlines); |
+ webView->setEditableSelectionOffsets(31, 31); |
+ webView->setCompositionFromExistingText(30, 34, underlines); |
info = webView->textInputInfo(); |
EXPECT_EQ("0123456789abcdefghijklmnopq\nrstuvwxyz", std::string(info.value.utf8().data())); |
EXPECT_EQ(31, info.selectionStart); |
@@ -1009,11 +1005,10 @@ TEST_F(WebViewTest, SetCompositionFromExistingTextInRichText) |
webView->setInitialFocus(false); |
WebVector<WebCompositionUnderline> underlines(static_cast<size_t>(1)); |
underlines[0] = WebCompositionUnderline(0, 4, 0, false, 0); |
- WebLocalFrameImpl* frame = webView->mainFrameImpl(); |
- frame->setEditableSelectionOffsets(1, 1); |
+ webView->setEditableSelectionOffsets(1, 1); |
WebDocument document = webView->mainFrame()->document(); |
EXPECT_FALSE(document.getElementById("bold").isNull()); |
- frame->setCompositionFromExistingText(0, 4, underlines); |
+ webView->setCompositionFromExistingText(0, 4, underlines); |
EXPECT_FALSE(document.getElementById("bold").isNull()); |
} |
@@ -1037,8 +1032,7 @@ TEST_F(WebViewTest, SetEditableSelectionOffsetsKeepsComposition) |
EXPECT_EQ(6, info.compositionStart); |
EXPECT_EQ(11, info.compositionEnd); |
- WebLocalFrameImpl* frame = webView->mainFrameImpl(); |
- frame->setEditableSelectionOffsets(6, 6); |
+ webView->setEditableSelectionOffsets(6, 6); |
info = webView->textInputInfo(); |
EXPECT_EQ("hello world", std::string(info.value.utf8().data())); |
EXPECT_EQ(6, info.selectionStart); |
@@ -1046,7 +1040,7 @@ TEST_F(WebViewTest, SetEditableSelectionOffsetsKeepsComposition) |
EXPECT_EQ(6, info.compositionStart); |
EXPECT_EQ(11, info.compositionEnd); |
- frame->setEditableSelectionOffsets(8, 8); |
+ webView->setEditableSelectionOffsets(8, 8); |
info = webView->textInputInfo(); |
EXPECT_EQ("hello world", std::string(info.value.utf8().data())); |
EXPECT_EQ(8, info.selectionStart); |
@@ -1054,7 +1048,7 @@ TEST_F(WebViewTest, SetEditableSelectionOffsetsKeepsComposition) |
EXPECT_EQ(6, info.compositionStart); |
EXPECT_EQ(11, info.compositionEnd); |
- frame->setEditableSelectionOffsets(11, 11); |
+ webView->setEditableSelectionOffsets(11, 11); |
info = webView->textInputInfo(); |
EXPECT_EQ("hello world", std::string(info.value.utf8().data())); |
EXPECT_EQ(11, info.selectionStart); |
@@ -1062,7 +1056,7 @@ TEST_F(WebViewTest, SetEditableSelectionOffsetsKeepsComposition) |
EXPECT_EQ(6, info.compositionStart); |
EXPECT_EQ(11, info.compositionEnd); |
- frame->setEditableSelectionOffsets(6, 11); |
+ webView->setEditableSelectionOffsets(6, 11); |
info = webView->textInputInfo(); |
EXPECT_EQ("hello world", std::string(info.value.utf8().data())); |
EXPECT_EQ(6, info.selectionStart); |
@@ -1070,7 +1064,7 @@ TEST_F(WebViewTest, SetEditableSelectionOffsetsKeepsComposition) |
EXPECT_EQ(6, info.compositionStart); |
EXPECT_EQ(11, info.compositionEnd); |
- frame->setEditableSelectionOffsets(2, 2); |
+ webView->setEditableSelectionOffsets(2, 2); |
info = webView->textInputInfo(); |
EXPECT_EQ("hello world", std::string(info.value.utf8().data())); |
EXPECT_EQ(2, info.selectionStart); |
@@ -1083,14 +1077,14 @@ TEST_F(WebViewTest, IsSelectionAnchorFirst) |
{ |
URLTestHelpers::registerMockedURLFromBaseURL(WebString::fromUTF8(m_baseURL.c_str()), WebString::fromUTF8("input_field_populated.html")); |
WebViewImpl* webView = m_webViewHelper.initializeAndLoad(m_baseURL + "input_field_populated.html"); |
- WebLocalFrame* frame = webView->mainFrameImpl(); |
webView->setInitialFocus(false); |
- frame->setEditableSelectionOffsets(4, 10); |
+ webView->setEditableSelectionOffsets(4, 10); |
EXPECT_TRUE(webView->isSelectionAnchorFirst()); |
WebRect anchor; |
WebRect focus; |
webView->selectionBounds(anchor, focus); |
+ WebLocalFrame* frame = webView->mainFrameImpl(); |
frame->selectRange(WebPoint(focus.x, focus.y), WebPoint(anchor.x, anchor.y)); |
EXPECT_FALSE(webView->isSelectionAnchorFirst()); |
} |
@@ -2030,8 +2024,8 @@ TEST_F(WebViewTest, LosingFocusDoesNotTriggerAutofillTextChange) |
// Set up a composition that needs to be committed. |
WebVector<WebCompositionUnderline> emptyUnderlines; |
- frame->setEditableSelectionOffsets(4, 10); |
- frame->setCompositionFromExistingText(8, 12, emptyUnderlines); |
+ webView->setEditableSelectionOffsets(4, 10); |
+ webView->setCompositionFromExistingText(8, 12, emptyUnderlines); |
WebTextInputInfo info = webView->textInputInfo(); |
EXPECT_EQ(4, info.selectionStart); |
EXPECT_EQ(10, info.selectionEnd); |
@@ -2069,9 +2063,9 @@ TEST_F(WebViewTest, CompositionNotCancelledByBackspace) |
for (int i = 0; i < 2; ++i) { |
// Select composition and do sanity check. |
WebVector<WebCompositionUnderline> emptyUnderlines; |
- frame->setEditableSelectionOffsets(6, 6); |
+ webView->setEditableSelectionOffsets(6, 6); |
EXPECT_TRUE(webView->setComposition("fghij", emptyUnderlines, 0, 5)); |
- frame->setEditableSelectionOffsets(11, 11); |
+ webView->setEditableSelectionOffsets(11, 11); |
verifySelectionAndComposition(webView, 11, 11, 6, 11, "initial case"); |
// Press Backspace and verify composition didn't get cancelled. This is to verify the fix |
@@ -2082,9 +2076,9 @@ TEST_F(WebViewTest, CompositionNotCancelledByBackspace) |
keyEvent.type = WebInputEvent::RawKeyDown; |
webView->handleInputEvent(keyEvent); |
- frame->setEditableSelectionOffsets(6, 6); |
+ webView->setEditableSelectionOffsets(6, 6); |
EXPECT_TRUE(webView->setComposition("fghi", emptyUnderlines, 0, 4)); |
- frame->setEditableSelectionOffsets(10, 10); |
+ webView->setEditableSelectionOffsets(10, 10); |
verifySelectionAndComposition(webView, 10, 10, 6, 10, "after pressing Backspace"); |
keyEvent.type = WebInputEvent::KeyUp; |
@@ -2137,7 +2131,7 @@ TEST_F(WebViewTest, SetCompositionFromExistingTextTriggersAutofillTextChange) |
WebVector<WebCompositionUnderline> emptyUnderlines; |
client.clearChangeCounts(); |
- frame->setCompositionFromExistingText(8, 12, emptyUnderlines); |
+ webView->setCompositionFromExistingText(8, 12, emptyUnderlines); |
WebTextInputInfo info = webView->textInputInfo(); |
EXPECT_EQ("0123456789abcdefghijklmnopqrstuvwxyz", std::string(info.value.utf8().data())); |