| Index: third_party/WebKit/Source/web/WebViewImpl.cpp
|
| diff --git a/third_party/WebKit/Source/web/WebViewImpl.cpp b/third_party/WebKit/Source/web/WebViewImpl.cpp
|
| index 2ab59d927d0c2a72d5f9f3872c3daa3afb1f3e29..633c2cbd414361c8a03b2a25a8b9a7b0153e5b9b 100644
|
| --- a/third_party/WebKit/Source/web/WebViewImpl.cpp
|
| +++ b/third_party/WebKit/Source/web/WebViewImpl.cpp
|
| @@ -172,7 +172,6 @@
|
| #include "web/PrerendererClientImpl.h"
|
| #include "web/StorageQuotaClientImpl.h"
|
| #include "web/WebDevToolsAgentImpl.h"
|
| -#include "web/WebInputMethodControllerImpl.h"
|
| #include "web/WebRemoteFrameImpl.h"
|
| #include "web/WebSettingsImpl.h"
|
|
|
| @@ -3514,9 +3513,11 @@ void WebViewImpl::HidePopups() {
|
| CancelPagePopup();
|
| }
|
|
|
| -WebInputMethodControllerImpl* WebViewImpl::GetActiveWebInputMethodController()
|
| +WebInputMethodController* WebViewImpl::GetActiveWebInputMethodController()
|
| const {
|
| - return WebInputMethodControllerImpl::FromFrame(FocusedLocalFrameInWidget());
|
| + WebLocalFrameBase* local_frame =
|
| + WebLocalFrameBase::FromFrame(FocusedLocalFrameInWidget());
|
| + return local_frame ? local_frame->GetInputMethodController() : nullptr;
|
| }
|
|
|
| Color WebViewImpl::BaseBackgroundColor() const {
|
|
|