Move plugins to be stored in HTMLPlugInElement.

third_party/WebKit/Source/core/html/PluginDocument.cpp

 /*
  * Copyright (C) 2006, 2008 Apple 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 16 matching lines @@
 #include "bindings/core/v8/ExceptionState.h"
 #include "core/HTMLNames.h"
 #include "core/dom/RawDataDocumentParser.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/LocalFrameClient.h"
 #include "core/frame/UseCounter.h"
 #include "core/html/HTMLBodyElement.h"
 #include "core/html/HTMLEmbedElement.h"
 #include "core/html/HTMLHtmlElement.h"
+#include "core/html/HTMLPlugInElement.h"
 #include "core/layout/LayoutEmbeddedObject.h"
 #include "core/loader/DocumentLoader.h"
 #include "core/loader/FrameLoader.h"
 #include "core/plugins/PluginView.h"
 
 namespace blink {
 
 using namespace HTMLNames;
 
 // FIXME: Share more code with MediaDocumentParser.
@@ skipping 121 matching lines @@
   UseCounter::count(*this, UseCounter::PluginDocument);
   if (!isInMainFrame())
     UseCounter::count(*this, UseCounter::PluginDocumentInFrame);
 }
 
 DocumentParser* PluginDocument::createParser() {
   return PluginDocumentParser::create(this);
 }
 
 PluginView* PluginDocument::pluginView() {
-  if (m_pluginNode && m_pluginNode->layoutObject()) {
-    CHECK(m_pluginNode->layoutObject()->isEmbeddedObject());
-    FrameViewBase* frameViewBase =
-        toLayoutEmbeddedObject(m_pluginNode->layoutObject())->frameViewBase();
-    if (!frameViewBase || !frameViewBase->isPluginContainer())
-      return nullptr;
-    return toPluginView(frameViewBase);
-  }
-  return 0;
+  return m_pluginNode && isHTMLPlugInElement(m_pluginNode)

[haraken, 2017/04/05 12:34:00]

Add TODO: Change the type of m_pluginNode to HTMLPluginElement and remove this
check.

[joelhockey, 2017/04/05 22:10:31]

Ack

+             ? toHTMLPlugInElement(m_pluginNode)->plugin()
+             : nullptr;
 }
 
 Node* PluginDocument::pluginNode() {
   return m_pluginNode.get();
 }
 
 void PluginDocument::shutdown() {
   // Release the plugin node so that we don't have a circular reference.
   m_pluginNode = nullptr;
   HTMLDocument::shutdown();
 }
 
 DEFINE_TRACE(PluginDocument) {
   visitor->trace(m_pluginNode);
   HTMLDocument::trace(visitor);
 }
 
 }  // namespace blink