| Index: third_party/WebKit/Source/web/WebViewFrameWidget.cpp
|
| diff --git a/third_party/WebKit/Source/web/WebViewFrameWidget.cpp b/third_party/WebKit/Source/web/WebViewFrameWidget.cpp
|
| index 3548c310c1fe75f8cf47507ec2bdb9acd677d54a..c432573140b591b4d385d54ee7b251a1fe03fbe3 100644
|
| --- a/third_party/WebKit/Source/web/WebViewFrameWidget.cpp
|
| +++ b/third_party/WebKit/Source/web/WebViewFrameWidget.cpp
|
| @@ -4,6 +4,7 @@
|
|
|
| #include "web/WebViewFrameWidget.h"
|
|
|
| +#include "web/WebInputMethodControllerImpl.h"
|
| #include "web/WebLocalFrameImpl.h"
|
| #include "web/WebViewImpl.h"
|
|
|
| @@ -128,25 +129,6 @@ void WebViewFrameWidget::setFocus(bool enable)
|
| return m_webView->setFocus(enable);
|
| }
|
|
|
| -bool WebViewFrameWidget::setComposition(
|
| - const WebString& text,
|
| - const WebVector<WebCompositionUnderline>& underlines,
|
| - int selectionStart,
|
| - int selectionEnd)
|
| -{
|
| - return m_webView->setComposition(text, underlines, selectionStart, selectionEnd);
|
| -}
|
| -
|
| -bool WebViewFrameWidget::finishComposingText(ConfirmCompositionBehavior selectionBehavior)
|
| -{
|
| - return m_webView->finishComposingText(selectionBehavior);
|
| -}
|
| -
|
| -bool WebViewFrameWidget::commitText(const WebString& text, int relativeCaretPosition)
|
| -{
|
| - return m_webView->commitText(text, relativeCaretPosition);
|
| -}
|
| -
|
| WebRange WebViewFrameWidget::compositionRange()
|
| {
|
| return m_webView->compositionRange();
|
| @@ -267,6 +249,11 @@ WebLocalFrameImpl* WebViewFrameWidget::localRoot()
|
| return m_webView->mainFrameImpl();
|
| }
|
|
|
| +WebInputMethodControllerImpl* WebViewFrameWidget::getActiveWebInputMethodController() const
|
| +{
|
| + return m_webView->getActiveWebInputMethodController();
|
| +}
|
| +
|
| void WebViewFrameWidget::scheduleAnimation()
|
| {
|
| m_webView->scheduleAnimationForWidget();
|
|
|