Move plugins to be stored in HTMLPlugInElement.

third_party/WebKit/Source/core/html/HTMLPlugInElement.h

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2004, 2006, 2007, 2008, 2009, 2012 Apple Inc. All rights
  * reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
@@ skipping 32 matching lines @@
 
 class CORE_EXPORT HTMLPlugInElement : public HTMLFrameOwnerElement {
  public:
   ~HTMLPlugInElement() override;
   DECLARE_VIRTUAL_TRACE();
 
   void resetInstance();
   // TODO(dcheng): Consider removing this, since HTMLEmbedElementLegacyCall
   // and HTMLObjectElementLegacyCall usage is extremely low.
   SharedPersistent<v8::Object>* pluginWrapper();
+  // TODO(joelhockey): Clean up pluginWidget and plugin (maybe also
+  // pluginWrapper).  It would be good to remove and/or rename some of these.
+  // pluginWidget and plugin both return the plugin that is stored on this
+  // element.  However pluginWidget will synchronously create the plugin if
+  // required by calling layoutPartForJSBindings.  Possibly the pluginWidget
+  // code can be inlined into pluginWrapper.
   PluginView* pluginWidget() const;
+  PluginView* plugin() const;
   bool canProcessDrag() const;
   const String& url() const { return m_url; }
 
   // Public for FrameView::addPartToUpdate()
   bool needsPluginUpdate() const { return m_needsPluginUpdate; }
   void setNeedsPluginUpdate(bool needsPluginUpdate) {
     m_needsPluginUpdate = needsPluginUpdate;
   }
   void updatePlugin();
 
@@ skipping 88 matching lines @@
                   bool requireLayoutObject);
   // Perform checks after we have determined that a plugin will be used to
   // show the object (i.e after allowedToLoadObject).
   bool allowedToLoadPlugin(const KURL&, const String& mimeType);
   // Perform checks based on the URL and MIME-type of the object to load.
   bool allowedToLoadObject(const KURL&, const String& mimeType);
   bool wouldLoadAsNetscapePlugin(const String& url, const String& serviceType);
 
   void setPlugin(PluginView*);
   PluginView* releasePlugin();
-  PluginView* ownedPlugin() const;
   void setPersistedPlugin(PluginView*);
 
   bool requestObjectInternal(const String& url,
                              const String& mimeType,
                              const Vector<String>& paramNames,
                              const Vector<String>& paramValues);
 
   mutable RefPtr<SharedPersistent<v8::Object>> m_pluginWrapper;
   bool m_needsPluginUpdate;
   bool m_shouldPreferPlugInsForImages;
   // Represents |layoutObject() && layoutObject()->isEmbeddedObject() &&
   // !layoutEmbeddedItem().showsUnavailablePluginIndicator()|.  We want to
   // avoid accessing |layoutObject()| in layoutObjectIsFocusable().
   bool m_pluginIsAvailable = false;
 
+  Member<PluginView> m_plugin;
   // Normally the plugin is stored in HTMLFrameOwnerElement::m_widget.
   // However, plugins can persist even when not rendered. In order to
   // prevent confusing code which may assume that ownedWidget() != null
   // means the frame is active, we save off m_widget here while
   // the plugin is persisting but not being displayed.
   Member<PluginView> m_persistedPlugin;
 };
 
 inline bool isHTMLPlugInElement(const HTMLElement& element) {
   return element.isPluginElement();
 }
 
 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLPlugInElement);
 
 }  // namespace blink
 
 #endif  // HTMLPlugInElement_h