Move plugins to be stored in HTMLPlugInElement.

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

 /*
    Copyright (C) 1997 Martin Jones (mjones@kde.org)
              (C) 1998 Waldo Bastian (bastian@kde.org)
              (C) 1998, 1999 Torben Weis (weis@kde.org)
              (C) 1999 Lars Knoll (knoll@kde.org)
              (C) 1999 Antti Koivisto (koivisto@kde.org)
    Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights
    reserved.
 
    This library is free software; you can redistribute it and/or
@@ skipping 21 matching lines @@
 #include "core/frame/FrameViewAutoSizeInfo.h"
 #include "core/frame/LayoutSubtreeRootList.h"
 #include "core/frame/RootFrameViewport.h"
 #include "core/layout/MapCoordinatesFlags.h"
 #include "core/layout/ScrollAnchor.h"
 #include "core/paint/FirstMeaningfulPaintDetector.h"
 #include "core/paint/ObjectPaintProperties.h"
 #include "core/paint/PaintInvalidationCapableScrollableArea.h"
 #include "core/paint/PaintPhase.h"
 #include "core/paint/ScrollbarManager.h"
+#include "core/plugins/PluginView.h"
 #include "platform/FrameViewBase.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/animation/CompositorAnimationHost.h"
 #include "platform/animation/CompositorAnimationTimeline.h"
 #include "platform/geometry/IntRect.h"
 #include "platform/geometry/LayoutRect.h"
 #include "platform/graphics/Color.h"
 #include "platform/graphics/GraphicsLayerClient.h"
 #include "platform/scroll/ScrollTypes.h"
 #include "platform/scroll/Scrollbar.h"
@@ skipping 400 matching lines @@
   LayoutRect scrollIntoView(const LayoutRect& rectInContent,
                             const ScrollAlignment& alignX,
                             const ScrollAlignment& alignY,
                             ScrollType = ProgrammaticScroll) override;
 
   // The window that hosts the FrameView. The FrameView will communicate scrolls
   // and repaints to the host window in the window's coordinate space.
   HostWindow* getHostWindow() const;
 
   typedef HeapHashSet<Member<FrameViewBase>> ChildrenSet;
+  typedef HeapHashSet<Member<PluginView>> PluginsSet;
 
   // Functions for child manipulation and inspection.
   void setParent(FrameViewBase*) override;
   void removeChild(FrameViewBase*);
   void addChild(FrameViewBase*);
   const ChildrenSet* children() const { return &m_children; }
+  void removePlugin(PluginView*);
+  void addPlugin(PluginView*);
+  const PluginsSet* plugins() const { return &m_plugins; }
 
   // If the scroll view does not use a native widget, then it will have
   // cross-platform Scrollbars. These functions can be used to obtain those
   // scrollbars.
   Scrollbar* horizontalScrollbar() const override {
     return m_scrollbarManager.horizontalScrollbar();
   }
   Scrollbar* verticalScrollbar() const override {
     return m_scrollbarManager.verticalScrollbar();
   }
@@ skipping 652 matching lines @@
   bool m_hasBeenDisposed = false;
 #endif
 
   ScrollbarMode m_horizontalScrollbarMode;
   ScrollbarMode m_verticalScrollbarMode;
 
   bool m_horizontalScrollbarLock;
   bool m_verticalScrollbarLock;
 
   ChildrenSet m_children;
+  PluginsSet m_plugins;

[haraken, 2017/03/22 15:32:33]

You don't need to address this in this CL but it looks weird that "FrameView"
owns a set of "plugin"s.

[joelhockey, 2017/03/27 06:42:21]

I'm curious what you think is weird.  I don't really know the code well enough
to get that sort of sense.

It doesn't seem so strange to me that a frame can contain a set of other frames
(ChildrenSet) and also a set of plugins (PluginsSet).  The PluginSet is required
in FrameView::updateStyleAndLayoutIfNeededRecursiveInternal to call
PluginView::updateAllLifecyclePhases.  If there is a better way to achieve this,
I can definitely do it in another CL.

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

Ah, thanks! That makes sense :)

 
   ScrollOffset m_pendingScrollDelta;
   ScrollOffset m_scrollOffset;
   IntSize m_contentsSize;
 
   bool m_scrollbarsSuppressed;
 
   bool m_inUpdateScrollbars;
 
   std::unique_ptr<LayoutAnalyzer> m_analyzer;
@@ skipping 116 matching lines @@
                   frameViewBase.isFrameView());
 DEFINE_TYPE_CASTS(FrameView,
                   ScrollableArea,
                   scrollableArea,
                   scrollableArea->isFrameView(),
                   scrollableArea.isFrameView());
 
 }  // namespace blink
 
 #endif  // FrameView_h