| Index: third_party/WebKit/Source/web/WebInputMethodControllerImpl.cpp
|
| diff --git a/third_party/WebKit/Source/web/WebInputMethodControllerImpl.cpp b/third_party/WebKit/Source/web/WebInputMethodControllerImpl.cpp
|
| index bff1b861c4a44a433953624a3d4c374dc6d0fed8..c26b860f0cffcc7377c6ca42ef935300379d1eef 100644
|
| --- a/third_party/WebKit/Source/web/WebInputMethodControllerImpl.cpp
|
| +++ b/third_party/WebKit/Source/web/WebInputMethodControllerImpl.cpp
|
| @@ -6,6 +6,7 @@
|
|
|
| #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"
|
| @@ -19,7 +20,6 @@
|
| #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"
|
|
|
| @@ -85,7 +85,7 @@ bool WebInputMethodControllerImpl::SetComposition(
|
| // 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();
|
| @@ -135,7 +135,7 @@ bool WebInputMethodControllerImpl::CommitText(
|
| GetFrame()->GetDocument()->UpdateStyleAndLayoutIgnorePendingStylesheets();
|
|
|
| return GetInputMethodController().CommitText(
|
| - text, CompositionUnderlineVectorBuilder(underlines),
|
| + text, CompositionUnderlineVectorBuilder::Build(underlines),
|
| relative_caret_position);
|
| }
|
|
|
|
|