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 219 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 1227 matching lines @@
 void FrameView::updateGeometries() {
   Vector<RefPtr<LayoutPart>> parts;
   copyToVector(m_parts, parts);
 
   for (auto part : parts) {
     // Script or plugins could detach the frame so abort processing if that
     // happens.
     if (layoutViewItem().isNull())
       break;
 
-    if (FrameViewBase* frameViewBase = part->frameViewBase()) {
+    if (FrameViewBase* frameViewBase = part->pluginOrFrame()) {
       if (frameViewBase->isFrameView()) {
         FrameView* frameView = toFrameView(frameViewBase);
         bool didNeedLayout = frameView->needsLayout();
         part->updateGeometry();
         if (!didNeedLayout && !frameView->shouldThrottleRendering())
           frameView->checkDoesNotNeedLayout();
       } else {
         part->updateGeometry();
       }
     }
@@ skipping 1820 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 432 matching lines @@
   FrameViewBase::setParent(parentView);
 
   updateParentScrollableAreaSet();
   setupRenderThrottling();
 
   if (parentFrameView())
     m_subtreeThrottled = parentFrameView()->canThrottleRendering();
 }
 
 void FrameView::removeChild(FrameViewBase* child) {
-  ASSERT(child->parent() == this);
+  CHECK(child->parent() == this);

[dcheng, 2017/04/04 07:20:12]

Nit: DCHECK is the equivalent of ASSERT

[joelhockey, 2017/04/04 23:39:05]

Done, also changed CHECK below in removePlugin to be DCHECK.

 
   if (child->isFrameView() &&
       !RuntimeEnabledFeatures::rootLayerScrollingEnabled())
     removeScrollableArea(toFrameView(child));
 
-  child->setParent(0);
+  child->setParent(nullptr);
   m_children.erase(child);
 }
 
+void FrameView::removePlugin(PluginView* plugin) {
+  CHECK(plugin->parent() == this);
+  DCHECK(m_plugins.contains(plugin));
+  plugin->setParent(nullptr);
+  m_plugins.erase(plugin);
+}
+
+void FrameView::addPlugin(PluginView* plugin) {
+  DCHECK(!plugin->parent());
+  DCHECK(!m_plugins.contains(plugin));
+  plugin->setParent(this);
+  m_plugins.insert(plugin);
+}
+
 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 16 matching lines @@
   page->chromeClient().setCursor(cursor, m_frame);
 }
 
 void FrameView::frameRectsChanged() {
   TRACE_EVENT0("blink", "FrameView::frameRectsChanged");
   if (layoutSizeFixedToFrameSize())
     setLayoutSizeInternal(frameRect().size());
 
   for (const auto& child : m_children)
     child->frameRectsChanged();
+
+  for (const auto& plugin : m_plugins)
+    plugin->frameRectsChanged();
 }
 
 void FrameView::setLayoutSizeInternal(const IntSize& size) {
   if (m_layoutSize == size)
     return;
 
   m_layoutSize = size;
   contentsResized();
 }
 
@@ skipping 30 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 775 matching lines @@
   // and potentially child frame views.
   setNeedsCompositingUpdate(layoutViewItem(), CompositingUpdateRebuildTree);
 
   FrameViewBase::setParentVisible(visible);
 
   if (!isSelfVisible())
     return;
 
   for (const auto& child : m_children)
     child->setParentVisible(visible);
+
+  for (const auto& plugin : m_plugins)
+    plugin->setParentVisible(visible);
 }
 
 void FrameView::show() {
   if (!isSelfVisible()) {
     setSelfVisible(true);
     if (ScrollingCoordinator* scrollingCoordinator =
             this->scrollingCoordinator())
       scrollingCoordinator->frameViewVisibilityDidChange();
     setNeedsCompositingUpdate(layoutViewItem(), CompositingUpdateRebuildTree);
     updateParentScrollableAreaSet();
     if (RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled() &&
         !RuntimeEnabledFeatures::rootLayerScrollingEnabled()) {
       // The existance of scrolling properties depends on visibility through
       // isScrollable() so ensure properties are updated if visibility changes.
       setNeedsPaintPropertyUpdate();
     }
     if (isParentVisible()) {
       for (const auto& child : m_children)
         child->setParentVisible(true);
+
+      for (const auto& plugin : m_plugins)
+        plugin->setParentVisible(true);
     }
   }
 
   FrameViewBase::show();
 }
 
 void FrameView::hide() {
   if (isSelfVisible()) {
     if (isParentVisible()) {
       for (const auto& child : m_children)
         child->setParentVisible(false);
+
+      for (const auto& plugin : m_plugins)
+        plugin->setParentVisible(false);
     }
     setSelfVisible(false);
     if (ScrollingCoordinator* scrollingCoordinator =
             this->scrollingCoordinator())
       scrollingCoordinator->frameViewVisibilityDidChange();
     setNeedsCompositingUpdate(layoutViewItem(), CompositingUpdateRebuildTree);
     updateParentScrollableAreaSet();
     if (RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled() &&
         !RuntimeEnabledFeatures::rootLayerScrollingEnabled()) {
       // The existance of scrolling properties depends on visibility through
@@ skipping 549 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