| Index: third_party/WebKit/Source/web/WebViewImpl.h
|
| diff --git a/third_party/WebKit/Source/web/WebViewImpl.h b/third_party/WebKit/Source/web/WebViewImpl.h
|
| index c547c8c767170d02438378aa81fe7a7c1540fdd7..4c6951069a6ec868130b7e5606b668343af30769 100644
|
| --- a/third_party/WebKit/Source/web/WebViewImpl.h
|
| +++ b/third_party/WebKit/Source/web/WebViewImpl.h
|
| @@ -141,9 +141,8 @@ public:
|
| const WebVector<WebCompositionUnderline>& underlines,
|
| int selectionStart,
|
| int selectionEnd) override;
|
| - bool confirmComposition() override;
|
| - bool confirmComposition(ConfirmCompositionBehavior selectionBehavior) override;
|
| - bool confirmComposition(const WebString& text) override;
|
| + bool commitText(const WebString& text, int relativeCaretPosition) override;
|
| + bool finishComposingText(ConfirmCompositionBehavior selectionBehavior) override;
|
| WebRange compositionRange() override;
|
| WebTextInputInfo textInputInfo() override;
|
| WebTextInputType textInputType() override;
|
| @@ -564,8 +563,6 @@ private:
|
| // Returns true if the event was actually processed.
|
| bool keyEventDefault(const WebKeyboardEvent&);
|
|
|
| - bool confirmComposition(const WebString& text, ConfirmCompositionBehavior);
|
| -
|
| // Returns true if the view was scrolled.
|
| bool scrollViewWithKeyboard(int keyCode, int modifiers);
|
|
|
|
|