Move plugins to be stored in HTMLPlugInElement.

third_party/WebKit/Source/core/frame/FrameView.cpp

 /*
  * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
  *                     1999 Lars Knoll <knoll@kde.org>
  *                     1999 Antti Koivisto <koivisto@kde.org>
  *                     2000 Dirk Mueller <mueller@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
  *           (C) 2006 Graham Dennis (graham.dennis@gmail.com)
  *           (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
@@ skipping 83 matching lines @@
 #include "core/page/Page.h"
 #include "core/page/PrintContext.h"
 #include "core/page/scrolling/RootScrollerUtil.h"
 #include "core/page/scrolling/ScrollingCoordinator.h"
 #include "core/page/scrolling/TopDocumentRootScrollerController.h"
 #include "core/paint/BlockPaintInvalidator.h"
 #include "core/paint/FramePainter.h"
 #include "core/paint/PaintLayer.h"
 #include "core/paint/PaintTiming.h"
 #include "core/paint/PrePaintTreeWalk.h"
-#include "core/plugins/PluginView.h"
 #include "core/style/ComputedStyle.h"
 #include "core/svg/SVGDocumentExtensions.h"
 #include "core/svg/SVGSVGElement.h"
 #include "platform/Histogram.h"
 #include "platform/HostWindow.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/ScriptForbiddenScope.h"
 #include "platform/WebFrameScheduler.h"
 #include "platform/fonts/FontCache.h"
 #include "platform/geometry/DoubleRect.h"
@@ skipping 116 matching lines @@
   ASSERT(m_hasBeenDisposed);
 }
 
 DEFINE_TRACE(FrameView) {
   visitor->trace(m_frame);
   visitor->trace(m_fragmentAnchor);
   visitor->trace(m_scrollableAreas);
   visitor->trace(m_animatingScrollableAreas);
   visitor->trace(m_autoSizeInfo);
   visitor->trace(m_children);
+  visitor->trace(m_plugins);
   visitor->trace(m_viewportScrollableArea);
   visitor->trace(m_visibilityObserver);
   visitor->trace(m_scrollAnchor);
   visitor->trace(m_anchoringAdjustmentQueue);
   visitor->trace(m_scrollbarManager);
   visitor->trace(m_printContext);
   FrameViewBase::trace(visitor);
   ScrollableArea::trace(visitor);
 }
 
@@ skipping 3062 matching lines @@
   if (needsLayout())
     layout();
 
   checkDoesNotNeedLayout();
 
   // WebView plugins need to update regardless of whether the
   // LayoutEmbeddedObject that owns them needed layout.
   // TODO(leviw): This currently runs the entire lifecycle on plugin WebViews.
   // We should have a way to only run these other Documents to the same
   // lifecycle stage as this frame.
-  const ChildrenSet* viewChildren = children();
-  for (const Member<FrameViewBase>& child : *viewChildren) {
-    if ((*child).isPluginContainer())
-      toPluginView(child.get())->updateAllLifecyclePhases();
+  for (const Member<PluginView>& plugin : *plugins()) {
+    plugin->updateAllLifecyclePhases();
   }
   checkDoesNotNeedLayout();
 
   // FIXME: Calling layout() shouldn't trigger script execution or have any
   // observable effects on the frame tree but we're not quite there yet.
   HeapVector<Member<FrameView>> frameViews;
   for (Frame* child = m_frame->tree().firstChild(); child;
        child = child->tree().nextSibling()) {
     if (!child->isLocalFrame())
       continue;
@@ skipping 440 matching lines @@
   ASSERT(child->parent() == this);
 
   if (child->isFrameView() &&
       !RuntimeEnabledFeatures::rootLayerScrollingEnabled())
     removeScrollableArea(toFrameView(child));
 
   child->setParent(0);
   m_children.erase(child);
 }
 
+void FrameView::removePlugin(PluginView* plugin) {
+  m_plugins.erase(plugin);

[haraken, 2017/03/28 07:39:41]

DCHECK(m_plugins.contains(plugin));

[joelhockey, 2017/03/28 22:56:23]

Done

+}
+
+void FrameView::addPlugin(PluginView* plugin) {
+  m_plugins.insert(plugin);

[haraken, 2017/03/28 07:39:41]

DCHECK(!m_plugins.contains(plugin));

[joelhockey, 2017/03/28 22:56:23]

Done

+}
+
 bool FrameView::visualViewportSuppliesScrollbars() {
   // On desktop, we always use the layout viewport's scrollbars.
   if (!m_frame->settings() || !m_frame->settings()->getViewportEnabled() ||
       !m_frame->document() || !m_frame->page())
     return false;
 
   const TopDocumentRootScrollerController& controller =
       m_frame->page()->globalRootScrollerController();
 
   if (!layoutViewportScrollableArea())
@@ skipping 66 matching lines @@
       page->globalRootScrollerController();
   if (layoutViewport == controller.rootScrollerArea())
     visibleSize = controller.rootScrollerVisibleArea();
 
   IntSize maximumOffset =
       toIntSize(-scrollOrigin() + (contentBounds - visibleSize));
   return maximumOffset.expandedTo(minimumScrollOffsetInt());
 }
 
 void FrameView::addChild(FrameViewBase* child) {
-  ASSERT(child != this && !child->parent());
+  DCHECK(child != this && !child->parent());
+  DCHECK(!child->isPluginView());
   child->setParent(this);
   m_children.insert(child);
 }
 
 void FrameView::setScrollbarModes(ScrollbarMode horizontalMode,
                                   ScrollbarMode verticalMode,
                                   bool horizontalLock,
                                   bool verticalLock) {
   bool needsUpdate = false;
 
@@ skipping 1377 matching lines @@
 void FrameView::setAnimationHost(
     std::unique_ptr<CompositorAnimationHost> host) {
   m_animationHost = std::move(host);
 }
 
 LayoutUnit FrameView::caretWidth() const {
   return LayoutUnit(getHostWindow()->windowToViewportScalar(1));
 }
 
 }  // namespace blink