Move the logic to retrieve the WebPluginContainer to LocalFrame and Node.

third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp

 /*
  * Copyright (C) 2014 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 1181 matching lines @@
 
 LocalFrame* WebFrameWidgetImpl::FocusedLocalFrameInWidget() const {
   LocalFrame* frame = GetPage()->GetFocusController().FocusedFrame();
   return (frame && frame->LocalFrameRoot() == local_root_->GetFrame())
              ? frame
              : nullptr;
 }
 
 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 would be surprised to be calling
with a null |frame|.

(Actually maybe we can delete this? I don't see any references to this in
codesearch)

[slangley, 2017/05/21 23:53:32]

Deleted.

+    WebPluginContainerBase* container = frame->GetWebPluginContainerBase();
+    if (container && container->SupportsInputMethod())
+      return container->Plugin();
+  }
   return nullptr;
 }
 
 LocalFrame* WebFrameWidgetImpl::FocusedLocalFrameAvailableForIme() const {
   if (!ime_accept_events_)
     return nullptr;
   return FocusedLocalFrameInWidget();
 }
 
 }  // namespace blink