| Index: third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp
|
| diff --git a/third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp b/third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp
|
| index 3082bf7c55d41eb82968523d001f1a915a8f6c16..68a8e8252949b3bba7d791f90128552322b9150e 100644
|
| --- a/third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp
|
| +++ b/third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp
|
| @@ -71,7 +71,6 @@
|
| #include "web/CompositorWorkerProxyClientImpl.h"
|
| #include "web/ContextMenuAllowedScope.h"
|
| #include "web/WebDevToolsAgentImpl.h"
|
| -#include "web/WebInputMethodControllerImpl.h"
|
| #include "web/WebLocalFrameImpl.h"
|
| #include "web/WebPagePopupImpl.h"
|
| #include "web/WebRemoteFrameImpl.h"
|
| @@ -458,9 +457,11 @@ void WebFrameWidgetImpl::UpdateBaseBackgroundColor() {
|
| local_root_->GetFrameView()->SetBaseBackgroundColor(BaseBackgroundColor());
|
| }
|
|
|
| -WebInputMethodControllerImpl*
|
| +WebInputMethodController*
|
| WebFrameWidgetImpl::GetActiveWebInputMethodController() const {
|
| - return WebInputMethodControllerImpl::FromFrame(FocusedLocalFrameInWidget());
|
| + WebLocalFrameBase* local_frame =
|
| + WebLocalFrameBase::FromFrame(FocusedLocalFrameInWidget());
|
| + return local_frame ? local_frame->GetInputMethodController() : nullptr;
|
| }
|
|
|
| void WebFrameWidgetImpl::ScheduleAnimation() {
|
|
|