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

third_party/WebKit/Source/web/WebViewImpl.cpp

 /*
  * Copyright (C) 2011, 2012 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 2401 matching lines @@
   focus = local_frame->View()->ContentsToViewport(focus);
 
   if (!selection.ComputeVisibleSelectionInDOMTree().IsBaseFirst())
     std::swap(anchor, focus);
   return true;
 }
 
 // TODO(ekaramad):This method is almost duplicated in WebFrameWidgetImpl as
 // well. This code needs to be refactored  (http://crbug.com/629721).
 WebPlugin* WebViewImpl::FocusedPluginIfInputMethodSupported(LocalFrame* frame) {
-  WebPluginContainerBase* container =
-      WebLocalFrameImpl::CurrentPluginContainer(frame);
-  if (container && container->SupportsInputMethod())
-    return container->Plugin();
+  if (frame) {

[dcheng, 2017/05/19 09:07:02]

Ditto: I think this is actually unused now

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

Deleted.

+    WebPluginContainerBase* container = frame->GetWebPluginContainerBase();
+    if (container && container->SupportsInputMethod())
+      return container->Plugin();
+  }
   return nullptr;
 }
 
 // TODO(ekaramad):This method is almost duplicated in WebFrameWidgetImpl as
 // well. This code needs to be refactored  (http://crbug.com/629721).
 bool WebViewImpl::SelectionTextDirection(WebTextDirection& start,
                                          WebTextDirection& end) const {
   const LocalFrame* frame = FocusedLocalFrameInWidget();
   if (!frame)
     return false;
@@ skipping 466 matching lines @@
 }
 
 double WebViewImpl::ZoomLevel() {
   return zoom_level_;
 }
 
 void WebViewImpl::PropagateZoomFactorToLocalFrameRoots(Frame* frame,
                                                        float zoom_factor) {
   if (frame->IsLocalRoot()) {
     LocalFrame* local_frame = ToLocalFrame(frame);
-    if (!WebLocalFrameImpl::PluginContainerFromFrame(local_frame))
+    if (!local_frame->GetWebPluginContainerBase())
       local_frame->SetPageZoomFactor(zoom_factor);
   }
 
   for (Frame* child = frame->Tree().FirstChild(); child;
        child = child->Tree().NextSibling())
     PropagateZoomFactorToLocalFrameRoots(child, zoom_factor);
 }
 
 double WebViewImpl::SetZoomLevel(double zoom_level) {
   if (zoom_level < minimum_zoom_level_)
@@ skipping 31 matching lines @@
   maximum_zoom_level_ = maximum_zoom_level;
   client_->ZoomLimitsChanged(minimum_zoom_level_, maximum_zoom_level_);
 }
 
 float WebViewImpl::TextZoomFactor() {
   return MainFrameImpl()->GetFrame()->TextZoomFactor();
 }
 
 float WebViewImpl::SetTextZoomFactor(float text_zoom_factor) {
   LocalFrame* frame = MainFrameImpl()->GetFrame();
-  if (WebLocalFrameImpl::PluginContainerFromFrame(frame))
+  if (frame->GetWebPluginContainerBase())
     return 1;
 
   frame->SetTextZoomFactor(text_zoom_factor);
 
   return text_zoom_factor;
 }
 
 double WebView::ZoomLevelToZoomFactor(double zoom_level) {
   return pow(kTextSizeMultiplierRatio, zoom_level);
 }
@@ skipping 1185 matching lines @@
   if (focused_frame->LocalFrameRoot() != MainFrameImpl()->GetFrame())
     return nullptr;
   return focused_frame;
 }
 
 LocalFrame* WebViewImpl::FocusedLocalFrameAvailableForIme() const {
   return ime_accept_events_ ? FocusedLocalFrameInWidget() : nullptr;
 }
 
 }  // namespace blink