Index: third_party/WebKit/Source/web/WebInputMethodControllerImpl.cpp |
diff --git a/third_party/WebKit/Source/web/WebInputMethodControllerImpl.cpp b/third_party/WebKit/Source/web/WebInputMethodControllerImpl.cpp |
index b1ed72e6131dbd161b54a432dfae687ec0b34b55..4904552fb870447ae6fb16914b96736c7bc2ed4f 100644 |
--- a/third_party/WebKit/Source/web/WebInputMethodControllerImpl.cpp |
+++ b/third_party/WebKit/Source/web/WebInputMethodControllerImpl.cpp |
@@ -158,10 +158,11 @@ InputMethodController& WebInputMethodControllerImpl::GetInputMethodController() |
WebPlugin* WebInputMethodControllerImpl::FocusedPluginIfInputMethodSupported() |
const { |
- WebPluginContainerBase* container = |
- WebLocalFrameImpl::CurrentPluginContainer(GetFrame()); |
- if (container && container->SupportsInputMethod()) |
- return container->Plugin(); |
+ if (GetFrame()) { |
dcheng
2017/05/19 09:07:02
This GetFrame() check shouldn't be required.
We p
slangley
2017/05/21 23:53:33
Removed the check - no other methods have it.
|
+ WebPluginContainerBase* container = GetFrame()->GetWebPluginContainerBase(); |
+ if (container && container->SupportsInputMethod()) |
+ return container->Plugin(); |
+ } |
return nullptr; |
} |