Move CompositionUnderlineVectorBuilder.* from web/ -> core/editing/.

third_party/WebKit/Source/web/WebInputMethodControllerImpl.cpp

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "web/WebInputMethodControllerImpl.h"
 
 #include "core/InputTypeNames.h"
 #include "core/dom/DocumentUserGestureToken.h"
+#include "core/editing/CompositionUnderlineVectorBuilder.h"
 #include "core/editing/EditingUtilities.h"
 #include "core/editing/Editor.h"
 #include "core/editing/EphemeralRange.h"
 #include "core/editing/FrameSelection.h"
 #include "core/editing/InputMethodController.h"
 #include "core/editing/PlainTextRange.h"
 #include "core/frame/LocalFrame.h"
 #include "core/page/FocusController.h"
 #include "core/page/Page.h"
 #include "platform/UserGestureIndicator.h"
 #include "public/platform/WebString.h"
 #include "public/web/WebPlugin.h"
 #include "public/web/WebRange.h"
-#include "web/CompositionUnderlineVectorBuilder.h"
 #include "web/WebLocalFrameImpl.h"
 #include "web/WebPluginContainerImpl.h"
 
 namespace blink {
 
 WebInputMethodControllerImpl::WebInputMethodControllerImpl(
     WebLocalFrameImpl* web_local_frame)
     : web_local_frame_(web_local_frame) {}
 
 WebInputMethodControllerImpl::~WebInputMethodControllerImpl() {}
@@ skipping 45 matching lines @@
   }
 
   UserGestureIndicator gesture_indicator(DocumentUserGestureToken::Create(
       GetFrame()->GetDocument(), UserGestureToken::kNewGesture));
 
   // When the range of composition underlines overlap with the range between
   // selectionStart and selectionEnd, WebKit somehow won't paint the selection
   // at all (see InlineTextBox::paint() function in InlineTextBox.cpp).
   // But the selection range actually takes effect.
   GetInputMethodController().SetComposition(
-      String(text), CompositionUnderlineVectorBuilder(underlines),
+      String(text), CompositionUnderlineVectorBuilder::Build(underlines),
       selection_start, selection_end);
 
   return text.IsEmpty() || GetInputMethodController().HasComposition();
 }
 
 bool WebInputMethodControllerImpl::FinishComposingText(
     ConfirmCompositionBehavior selection_behavior) {
   // TODO(ekaramad): Here and in other IME calls we should expect the
   // call to be made when our frame is focused. This, however, is not the case
   // all the time. For instance, resetInputMethod call on RenderViewImpl could
@@ skipping 29 matching lines @@
 
   // Select the range to be replaced with the composition later.
   if (!replacement_range.IsNull())
     web_local_frame_->SelectRange(replacement_range);
 
   // TODO(editing-dev): The use of updateStyleAndLayoutIgnorePendingStylesheets
   // needs to be audited.  See http://crbug.com/590369 for more details.
   GetFrame()->GetDocument()->UpdateStyleAndLayoutIgnorePendingStylesheets();
 
   return GetInputMethodController().CommitText(
-      text, CompositionUnderlineVectorBuilder(underlines),
+      text, CompositionUnderlineVectorBuilder::Build(underlines),
       relative_caret_position);
 }
 
 WebTextInputInfo WebInputMethodControllerImpl::TextInputInfo() {
   return GetFrame()->GetInputMethodController().TextInputInfo();
 }
 
 WebTextInputType WebInputMethodControllerImpl::TextInputType() {
   return GetFrame()->GetInputMethodController().TextInputType();
 }
@@ skipping 10 matching lines @@
 WebPlugin* WebInputMethodControllerImpl::FocusedPluginIfInputMethodSupported()
     const {
   WebPluginContainerImpl* container =
       WebLocalFrameImpl::CurrentPluginContainer(GetFrame());
   if (container && container->SupportsInputMethod())
     return container->Plugin();
   return nullptr;
 }
 
 }  // namespace blink