Fixing the bounds check in cancelCompositionIfSelectionIsInvalid.

Source/web/tests/WebViewTest.cpp

 /*
  * Copyright (C) 2011, 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 665 matching lines @@
     webView->confirmComposition(WebString::fromUTF8(compositionText.c_str()));
     info = webView->textInputInfo();
     EXPECT_EQ("0123456789abcdefghijklmnopq\nrsyoloxyz", std::string(info.value.utf8().data()));
     EXPECT_EQ(34, info.selectionStart);
     EXPECT_EQ(34, info.selectionEnd);
     EXPECT_EQ(-1, info.compositionStart);
     EXPECT_EQ(-1, info.compositionEnd);
     webView->close();
 }
 
+TEST_F(WebViewTest, SetEditableSelectionOffsetsKeepsComposition)
+{
+    URLTestHelpers::registerMockedURLFromBaseURL(WebString::fromUTF8(m_baseURL.c_str()), WebString::fromUTF8("input_field_populated.html"));
+    WebView* webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "input_field_populated.html");
+    webView->setInitialFocus(false);
+
+    std::string compositionTextFirst("hello ");
+    std::string compositionTextSecond("world");
+    WebVector<WebCompositionUnderline> emptyUnderlines;
+
+    webView->confirmComposition(WebString::fromUTF8(compositionTextFirst.c_str()));
+    webView->setComposition(WebString::fromUTF8(compositionTextSecond.c_str()), emptyUnderlines, 5, 5);
+
+    WebTextInputInfo info = webView->textInputInfo();
+    EXPECT_EQ("hello world", std::string(info.value.utf8().data()));
+    EXPECT_EQ(11, info.selectionStart);
+    EXPECT_EQ(11, info.selectionEnd);
+    EXPECT_EQ(6, info.compositionStart);
+    EXPECT_EQ(11, info.compositionEnd);
+
+    webView->setEditableSelectionOffsets(6, 6);
+    info = webView->textInputInfo();
+    EXPECT_EQ("hello world", std::string(info.value.utf8().data()));
+    EXPECT_EQ(6, info.selectionStart);
+    EXPECT_EQ(6, info.selectionEnd);
+    EXPECT_EQ(6, info.compositionStart);
+    EXPECT_EQ(11, info.compositionEnd);
+
+    webView->setEditableSelectionOffsets(8, 8);
+    info = webView->textInputInfo();
+    EXPECT_EQ("hello world", std::string(info.value.utf8().data()));
+    EXPECT_EQ(8, info.selectionStart);
+    EXPECT_EQ(8, info.selectionEnd);
+    EXPECT_EQ(6, info.compositionStart);
+    EXPECT_EQ(11, info.compositionEnd);
+
+    webView->setEditableSelectionOffsets(11, 11);
+    info = webView->textInputInfo();
+    EXPECT_EQ("hello world", std::string(info.value.utf8().data()));
+    EXPECT_EQ(11, info.selectionStart);
+    EXPECT_EQ(11, info.selectionEnd);
+    EXPECT_EQ(6, info.compositionStart);
+    EXPECT_EQ(11, info.compositionEnd);
+
+    webView->setEditableSelectionOffsets(6, 11);
+    info = webView->textInputInfo();
+    EXPECT_EQ("hello world", std::string(info.value.utf8().data()));
+    EXPECT_EQ(6, info.selectionStart);
+    EXPECT_EQ(11, info.selectionEnd);
+    EXPECT_EQ(6, info.compositionStart);
+    EXPECT_EQ(11, info.compositionEnd);
+
+    webView->setEditableSelectionOffsets(2, 2);
+    info = webView->textInputInfo();
+    EXPECT_EQ("hello world", std::string(info.value.utf8().data()));
+    EXPECT_EQ(2, info.selectionStart);
+    EXPECT_EQ(2, info.selectionEnd);
+    EXPECT_EQ(-1, info.compositionStart);
+    EXPECT_EQ(-1, info.compositionEnd);
+    webView->close();
+}
+
 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;
@@ skipping 449 matching lines @@
     WebHelperPluginImpl* helperPlugin = webViewImpl->createHelperPlugin("dummy-plugin-type", frame->document());
     EXPECT_TRUE(helperPlugin);
     EXPECT_EQ(0, helperPlugin->getPlugin()); // Invalid plugin type means no plugin.
 
     webViewImpl->closeHelperPluginSoon(helperPlugin);
 
     webViewImpl->close();
 }
 
 }