Stop dismissing selection handles when selection is kept

third_party/WebKit/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 2326 matching lines @@
   WebString onselectstartfalse = WebString::fromUTF8("onselectstartfalse");
   WebLocalFrameImpl* frame = webView->mainFrameImpl();
 
   EXPECT_TRUE(
       tapElementById(WebInputEvent::GestureLongPress, onselectstartfalse));
   EXPECT_EQ("", std::string(frame->selectionAsText().utf8().data()));
   EXPECT_TRUE(tapElementById(WebInputEvent::GestureLongPress, target));
   EXPECT_EQ("testword", std::string(frame->selectionAsText().utf8().data()));
 }
 
+TEST_P(WebViewTest, FinishComposingTextDoesNotDismissHandles) {
+  registerMockedHttpURLLoad("longpress_selection.html");
+
+  WebViewImpl* webView = m_webViewHelper.initializeAndLoad(
+      m_baseURL + "longpress_selection.html", true);
+  webView->resize(WebSize(500, 300));
+  webView->updateAllLifecyclePhases();
+  runPendingTasks();
+
+  WebString target = WebString::fromUTF8("target");
+  WebLocalFrameImpl* frame = webView->mainFrameImpl();
+  WebInputMethodController* activeInputMethodController =
+      frame->frameWidget()->getActiveWebInputMethodController();
+  EXPECT_TRUE(tapElementById(WebInputEvent::GestureTap, target));
+  WebVector<WebCompositionUnderline> emptyUnderlines;
+  frame->setEditableSelectionOffsets(8, 8);
+  EXPECT_TRUE(activeInputMethodController->setComposition(
+      "12345", emptyUnderlines, 8, 13));
+  EXPECT_TRUE(frame->frame()->inputMethodController().hasComposition());
+  EXPECT_EQ("", std::string(frame->selectionAsText().utf8().data()));
+  EXPECT_FALSE(frame->frame()->selection().isHandleVisible());
+
+  EXPECT_TRUE(tapElementById(WebInputEvent::GestureLongPress, target));
+  EXPECT_EQ("testword12345",
+            std::string(frame->selectionAsText().utf8().data()));
+  EXPECT_TRUE(frame->frame()->selection().isHandleVisible());
+
+  // Check that finishComposingText(KeepSelection) does not dismiss handles.
+  activeInputMethodController->finishComposingText(
+      WebInputMethodController::KeepSelection);
+  EXPECT_TRUE(frame->frame()->selection().isHandleVisible());
+}
+
 #if !OS(MACOSX)
 TEST_P(WebViewTest, TouchDoesntSelectEmptyTextarea) {
   registerMockedHttpURLLoad("longpress_textarea.html");
 
   WebViewImpl* webView = m_webViewHelper.initializeAndLoad(
       m_baseURL + "longpress_textarea.html", true);
   webView->resize(WebSize(500, 300));
   webView->updateAllLifecyclePhases();
   runPendingTasks();
 
@@ skipping 1849 matching lines @@
   EXPECT_EQ(expectedWidth, vwElement->offsetWidth());
   EXPECT_EQ(expectedHeight, vwElement->offsetHeight());
 
   webView->resize(WebSize(800, 600));
   frame->printEnd();
 
   EXPECT_EQ(800, vwElement->offsetWidth());
 }
 
 }  // namespace blink