| Index: third_party/WebKit/public/web/WebPlugin.h
|
| diff --git a/third_party/WebKit/public/web/WebPlugin.h b/third_party/WebKit/public/web/WebPlugin.h
|
| index 9e9d71dbc271534ffd13ba50adef7f8df765e489..7cc339f14e03db17a3b2ffc99e30a96a1dd7da09 100644
|
| --- a/third_party/WebKit/public/web/WebPlugin.h
|
| +++ b/third_party/WebKit/public/web/WebPlugin.h
|
| @@ -98,7 +98,7 @@ public:
|
| virtual bool supportsKeyboardFocus() const { return false; }
|
| virtual bool supportsEditCommands() const { return false; }
|
| // Returns true if this plugin supports input method, which implements
|
| - // setComposition() and confirmComposition() below.
|
| + // setComposition(), commitText() and finishComposingText() below.
|
| virtual bool supportsInputMethod() const { return false; }
|
|
|
| virtual bool canProcessDrag() const { return false; }
|
| @@ -154,9 +154,15 @@ public:
|
| // Sets composition text from input method, and returns true if the
|
| // composition is set successfully.
|
| virtual bool setComposition(const WebString& text, const WebVector<WebCompositionUnderline>& underlines, int selectionStart, int selectionEnd) { return false; }
|
| - // Confirms an ongoing composition and returns true if there is an ongoing
|
| - // composition or the text is inserted.
|
| - virtual bool confirmComposition(const WebString& text, WebWidget::ConfirmCompositionBehavior selectionBehavior) { return false; }
|
| +
|
| + // Deletes the ongoing composition if any, inserts the specified text, and
|
| + // moves the caret according to relativeCaretPosition.
|
| + virtual bool commitText(const WebString& text, int relativeCaretPosition) { return false; }
|
| +
|
| + // Confirms an ongoing composition; holds or moves selections accroding to
|
| + // selectionBehavior.
|
| + virtual bool finishComposingText(WebWidget::ConfirmCompositionBehavior selectionBehavior) { return false; }
|
| +
|
| // Deletes the current selection plus the specified number of characters
|
| // before and after the selection or caret.
|
| virtual void extendSelectionAndDelete(int before, int after) { }
|
|
|