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

third_party/WebKit/Source/web/WebLocalFrameImpl.cpp

 /*
  * Copyright (C) 2009 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 228 matching lines @@
 static int g_frame_count = 0;
 
 static HeapVector<ScriptSourceCode> CreateSourcesVector(
     const WebScriptSource* sources_in,
     unsigned num_sources) {
   HeapVector<ScriptSourceCode> sources;
   sources.Append(sources_in, num_sources);
   return sources;
 }
 
-WebPluginContainerBase* WebLocalFrameImpl::PluginContainerFromFrame(
-    LocalFrame* frame) {
-  if (!frame)
-    return 0;
-  if (!frame->GetDocument() || !frame->GetDocument()->IsPluginDocument())
-    return 0;
-  PluginDocument* plugin_document = ToPluginDocument(frame->GetDocument());
-  return ToWebPluginContainerBase(plugin_document->GetPluginView());
-}
-
-WebPluginContainerBase* WebLocalFrameImpl::CurrentPluginContainer(
-    LocalFrame* frame,
-    Node* node) {
-  WebPluginContainerBase* plugin_container = PluginContainerFromFrame(frame);
-  if (plugin_container)
-    return plugin_container;
-
-  if (!node) {
-    DCHECK(frame->GetDocument());
-    node = frame->GetDocument()->FocusedElement();
-  }
-  return ToWebPluginContainerBase(WebNode::PluginContainerFromNode(node));
-}
-
 // Simple class to override some of PrintContext behavior. Some of the methods
 // made virtual so that they can be overridden by ChromePluginPrintContext.
 class ChromePrintContext : public PrintContext {
   WTF_MAKE_NONCOPYABLE(ChromePrintContext);
 
  public:
   explicit ChromePrintContext(LocalFrame* frame)
       : PrintContext(frame), printed_page_width_(0) {}
 
   ~ChromePrintContext() override {}
@@ skipping 810 matching lines @@
 }
 
 bool WebLocalFrameImpl::IsSpellCheckingEnabled() const {
   return GetFrame()->GetSpellChecker().IsSpellCheckingEnabled();
 }
 
 void WebLocalFrameImpl::ReplaceMisspelledRange(const WebString& text) {
   // If this caret selection has two or more markers, this function replace the
   // range covered by the first marker with the specified word as Microsoft Word
   // does.
-  if (PluginContainerFromFrame(GetFrame()))
+  if (CurrentPluginContainer(GetFrame()))
     return;
 
   // TODO(editing-dev): The use of updateStyleAndLayoutIgnorePendingStylesheets
   // needs to be audited.  see http://crbug.com/590369 for more details.
   GetFrame()->GetDocument()->UpdateStyleAndLayoutIgnorePendingStylesheets();
 
   GetFrame()->GetSpellChecker().ReplaceMisspelledRange(text);
 }
 
 void WebLocalFrameImpl::RemoveSpellingMarkers() {
   GetFrame()->GetSpellChecker().RemoveSpellingMarkers();
 }
 
 void WebLocalFrameImpl::RemoveSpellingMarkersUnderWords(
     const WebVector<WebString>& words) {
   Vector<String> converted_words;
   converted_words.Append(words.Data(), words.size());
   GetFrame()->RemoveSpellingMarkersUnderWords(converted_words);
 }
 
 bool WebLocalFrameImpl::HasSelection() const {
-  WebPluginContainerBase* plugin_container =
-      PluginContainerFromFrame(GetFrame());
+  WebPluginContainerBase* plugin_container = CurrentPluginContainer(GetFrame());
   if (plugin_container)
     return plugin_container->Plugin()->HasSelection();
 
   // frame()->selection()->isNone() never returns true.
   return GetFrame()
              ->Selection()
              .ComputeVisibleSelectionInDOMTreeDeprecated()
              .Start() != GetFrame()
                              ->Selection()
                              .ComputeVisibleSelectionInDOMTreeDeprecated()
                              .end();
 }
 
 WebRange WebLocalFrameImpl::SelectionRange() const {
   // TODO(editing-dev): The use of updateStyleAndLayoutIgnorePendingStylesheets
   // needs to be audited.  See http://crbug.com/590369 for more details.
   GetFrame()->GetDocument()->UpdateStyleAndLayoutIgnorePendingStylesheets();
 
   return GetFrame()
       ->Selection()
       .ComputeVisibleSelectionInDOMTreeDeprecated()
       .ToNormalizedEphemeralRange();
 }
 
 WebString WebLocalFrameImpl::SelectionAsText() const {
-  WebPluginContainerBase* plugin_container =
-      PluginContainerFromFrame(GetFrame());
+  WebPluginContainerBase* plugin_container = CurrentPluginContainer(GetFrame());
   if (plugin_container)
     return plugin_container->Plugin()->SelectionAsText();
 
   // TODO(editing-dev): The use of updateStyleAndLayoutIgnorePendingStylesheets
   // needs to be audited.  See http://crbug.com/590369 for more details.
   GetFrame()->GetDocument()->UpdateStyleAndLayoutIgnorePendingStylesheets();
 
   String text = GetFrame()->Selection().SelectedText(
       TextIteratorBehavior::EmitsObjectReplacementCharacterBehavior());
 #if OS(WIN)
   ReplaceNewlinesWithWindowsStyleNewlines(text);
 #endif
   ReplaceNBSPWithSpace(text);
   return text;
 }
 
 WebString WebLocalFrameImpl::SelectionAsMarkup() const {
-  WebPluginContainerBase* plugin_container =
-      PluginContainerFromFrame(GetFrame());
+  WebPluginContainerBase* plugin_container = CurrentPluginContainer(GetFrame());
   if (plugin_container)
     return plugin_container->Plugin()->SelectionAsMarkup();
 
   // TODO(editing-dev): The use of updateStyleAndLayoutIgnorePendingStylesheets
   // needs to be audited.  See http://crbug.com/590369 for more details.
   // Selection normalization and markup generation require clean layout.
   GetFrame()->GetDocument()->UpdateStyleAndLayoutIgnorePendingStylesheets();
 
   return GetFrame()->Selection().SelectedHTMLForClipboard();
 }
@@ skipping 191 matching lines @@
   GetFrame()->Selection().SetCaretVisible(visible);
 }
 
 VisiblePosition WebLocalFrameImpl::VisiblePositionForViewportPoint(
     const WebPoint& point_in_viewport) {
   return VisiblePositionForContentsPoint(
       GetFrame()->View()->ViewportToContents(point_in_viewport), GetFrame());
 }
 
 WebPlugin* WebLocalFrameImpl::FocusedPluginIfInputMethodSupported() {
-  WebPluginContainerBase* container =
-      WebLocalFrameImpl::CurrentPluginContainer(GetFrame());
+  WebPluginContainerBase* container = CurrentPluginContainer(GetFrame());
   if (container && container->SupportsInputMethod())
     return container->Plugin();
   return 0;
 }
 
 int WebLocalFrameImpl::PrintBegin(const WebPrintParams& print_params,
                                   const WebNode& constrain_to_node) {
   DCHECK(!GetFrame()->GetDocument()->IsFrameSet());
   WebPluginContainerBase* plugin_container = nullptr;
   if (constrain_to_node.IsNull()) {
     // If this is a plugin document, check if the plugin supports its own
     // printing. If it does, we will delegate all printing to that.
-    plugin_container = PluginContainerFromFrame(GetFrame());
+    plugin_container = CurrentPluginContainer(GetFrame());
   } else {
     // We only support printing plugin nodes for now.
     plugin_container =
         ToWebPluginContainerBase(constrain_to_node.PluginContainer());
   }
 
   if (plugin_container && plugin_container->SupportsPaginatedPrint()) {
     print_context_ = new ChromePluginPrintContext(GetFrame(), plugin_container,
                                                   print_params);
   } else {
@@ skipping 25 matching lines @@
 }
 
 void WebLocalFrameImpl::PrintEnd() {
   DCHECK(print_context_);
   print_context_->EndPrintMode();
   print_context_.Clear();
 }
 
 bool WebLocalFrameImpl::IsPrintScalingDisabledForPlugin(const WebNode& node) {
   WebPluginContainerBase* plugin_container =
-      node.IsNull() ? PluginContainerFromFrame(GetFrame())
+      node.IsNull() ? CurrentPluginContainer(GetFrame())
                     : ToWebPluginContainerBase(node.PluginContainer());
 
   if (!plugin_container || !plugin_container->SupportsPaginatedPrint())
     return false;
 
   return plugin_container->IsPrintScalingDisabled();
 }
 
 bool WebLocalFrameImpl::GetPrintPresetOptionsForPlugin(
     const WebNode& node,
     WebPrintPresetOptions* preset_options) {
   WebPluginContainerBase* plugin_container =
-      node.IsNull() ? PluginContainerFromFrame(GetFrame())
+      node.IsNull() ? CurrentPluginContainer(GetFrame())
                     : ToWebPluginContainerBase(node.PluginContainer());
 
   if (!plugin_container || !plugin_container->SupportsPaginatedPrint())
     return false;
 
   return plugin_container->GetPrintPresetOptionsFromDocument(preset_options);
 }
 
 bool WebLocalFrameImpl::HasCustomPageSizeStyle(int page_index) {
   return GetFrame()
@@ skipping 440 matching lines @@
 
 void WebLocalFrameImpl::DidFail(const ResourceError& error,
                                 bool was_provisional,
                                 HistoryCommitType commit_type) {
   if (!Client())
     return;
   WebURLError web_error = error;
   WebHistoryCommitType web_commit_type =
       static_cast<WebHistoryCommitType>(commit_type);
 
-  if (WebPluginContainerBase* plugin = PluginContainerFromFrame(GetFrame()))
+  if (WebPluginContainerBase* plugin = CurrentPluginContainer(GetFrame()))
     plugin->DidFailLoading(error);
 
   if (was_provisional)
     Client()->DidFailProvisionalLoad(web_error, web_commit_type);
   else
     Client()->DidFailLoad(web_error, web_commit_type);
 }
 
 void WebLocalFrameImpl::DidFinish() {
   if (!Client())
     return;
 
-  if (WebPluginContainerBase* plugin = PluginContainerFromFrame(GetFrame()))
+  if (WebPluginContainerBase* plugin = CurrentPluginContainer(GetFrame()))
     plugin->DidFinishLoading();
 
   Client()->DidFinishLoad();
 }
 
 void WebLocalFrameImpl::SetCanHaveScrollbars(bool can_have_scrollbars) {
   if (FrameView* view = GetFrameView())
     view->SetCanHaveScrollbars(can_have_scrollbars);
 }
 
@@ skipping 660 matching lines @@
 
 TextCheckerClient& WebLocalFrameImpl::GetTextCheckerClient() const {
   return *text_checker_client_;
 }
 
 void WebLocalFrameImpl::SetTextCheckClient(
     WebTextCheckClient* text_check_client) {
   text_check_client_ = text_check_client;
 }
 
+WebPluginContainerBase* WebLocalFrameImpl::CurrentPluginContainer(
+    LocalFrame* frame,
+    Node* node) const {

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

From what I can tell, there are no callers that pass non-null node. Maybe we
should just remove that argument? Then we can simply this function a bit.
Currently, LocalFrame::GetWebPluginContainerBase has a pretty complex API
surface:
- If LocalFrame holds a PluginDocument, return the associated plugin base.
- Otherwise, if node is null, set the node argument to the current focused
element.
- If the node is associated with a plugin, returned the associated plugin base.
- Otherwise return null.

If we remove it, I think it will just be:
- If LocalFrame holds a PluginDocument, return the associated plugin base.
- Otherwise, return the focused element's associated plugin base, if any.

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

There is one caller that passes a Node - "WebLocalFrameImpl::ExecuteCommand".
Based on the fact that GetFrame() is never null I removed this and just call
LocalFrame() directly.

+  DCHECK(frame);
+  return frame->GetWebPluginContainerBase(node);
+}
+
 }  // namespace blink