Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1336)

Unified Diff: third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp

Issue 2888203006: Move the logic to retrieve the WebPluginContainer to LocalFrame and Node. (Closed)
Patch Set: Rename & format. Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 8a687b75995b91133e4d27afa39a57afd308e8fd..5377f4e920119086dd0dc84ad367f7be59df4571 100644
--- a/third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp
+++ b/third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp
@@ -1199,10 +1199,11 @@ LocalFrame* WebFrameWidgetImpl::FocusedLocalFrameInWidget() const {
WebPlugin* WebFrameWidgetImpl::FocusedPluginIfInputMethodSupported(
LocalFrame* frame) const {
- WebPluginContainerBase* container =
- WebLocalFrameImpl::CurrentPluginContainer(frame);
- if (container && container->SupportsInputMethod())
- return container->Plugin();
+ if (frame) {
dcheng 2017/05/19 09:07:02 Do you know if this check is actually needed? I wo
slangley 2017/05/21 23:53:32 Deleted.
+ WebPluginContainerBase* container = frame->GetWebPluginContainerBase();
+ if (container && container->SupportsInputMethod())
+ return container->Plugin();
+ }
return nullptr;
}

Powered by Google App Engine
This is Rietveld 408576698