Remove FrameViewBase as base class of PluginView.

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

 /*
  * Copyright (C) 2006, 2007, 2009 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.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 17 matching lines @@
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/LocalFrameClient.h"
 #include "core/layout/LayoutPart.h"
 #include "core/layout/api/LayoutPartItem.h"
 #include "core/loader/FrameLoadRequest.h"
 #include "core/loader/FrameLoader.h"
 #include "core/page/Page.h"
 #include "core/plugins/PluginView.h"
 #include "platform/weborigin/SecurityOrigin.h"
+#include "wtf/Vector.h"
 
 namespace blink {
 
 typedef HeapHashMap<Member<FrameViewBase>, Member<FrameView>>
     FrameViewBaseToParentMap;
 static FrameViewBaseToParentMap& WidgetNewParentMap() {
   DEFINE_STATIC_LOCAL(FrameViewBaseToParentMap, map,
                       (new FrameViewBaseToParentMap));
   return map;
 }
 
 using FrameViewBaseSet = HeapHashSet<Member<FrameViewBase>>;
 static FrameViewBaseSet& WidgetsPendingTemporaryRemovalFromParent() {
   // FrameViewBases in this set will not leak because it will be cleared in
   // HTMLFrameOwnerElement::UpdateSuspendScope::performDeferredWidgetTreeOperations.
   DEFINE_STATIC_LOCAL(FrameViewBaseSet, set, (new FrameViewBaseSet));
   return set;
 }
 
-static FrameViewBaseSet& WidgetsPendingDispose() {
-  DEFINE_STATIC_LOCAL(FrameViewBaseSet, set, (new FrameViewBaseSet));
-  return set;
+using DisposeList = Vector<FrameOrPlugin*>;
+static DisposeList& PendingDispose() {

[dcheng, 2017/04/12 00:06:39]

PendingDispose / DisposeList is a bit too generic -- what's pending dispose,
etc.

(This relates to my naming comment from earlier)

[joelhockey, 2017/04/12 04:33:00]

If you suggest a name, I'm happy to change it.  But in this case, I would make
an argument that this is a good name.  I feel like the type of the Vector shows
what's pending dispose - it is FrameOrPlugin.  So I don't feel like the variable
needs to echo the name of the type that is involved.

If I was to pick another name, I guess it would be FrameOrPluginPendingDispose. 
Or <Whatever-name-we-agree-for-this-class>PendingDispose

+  DEFINE_STATIC_LOCAL(DisposeList, list, ());
+  return list;
 }
 
 SubframeLoadingDisabler::SubtreeRootSet&
 SubframeLoadingDisabler::DisabledSubtreeRoots() {
   DEFINE_STATIC_LOCAL(SubtreeRootSet, nodes, ());
   return nodes;
 }
 
 static unsigned g_update_suspend_count = 0;
 
@@ skipping 23 matching lines @@
     FrameViewBaseSet set;
     WidgetsPendingTemporaryRemovalFromParent().Swap(set);
     for (const auto& frame_view_base : set) {
       FrameView* current_parent = ToFrameView(frame_view_base->Parent());
       if (current_parent)
         current_parent->RemoveChild(frame_view_base.Get());
     }
   }
 
   {
-    FrameViewBaseSet set;
-    WidgetsPendingDispose().Swap(set);
-    for (const auto& frame_view_base : set) {
-      frame_view_base->Dispose();
+    DisposeList list;
+    PendingDispose().Swap(list);
+    for (const auto& frame_or_plugin : list) {
+      frame_or_plugin->Dispose();
     }
   }
 }
 
 HTMLFrameOwnerElement::UpdateSuspendScope::~UpdateSuspendScope() {
   DCHECK_GT(g_update_suspend_count, 0u);
   if (g_update_suspend_count == 1)
     PerformDeferredWidgetTreeOperations();
   --g_update_suspend_count;
 }
@@ skipping 91 matching lines @@
   // the subframe hasn't been created yet.
   if (ContentFrame())
     GetDocument().GetFrame()->Loader().Client()->DidChangeSandboxFlags(
         ContentFrame(), flags);
 }
 
 bool HTMLFrameOwnerElement::IsKeyboardFocusable() const {
   return content_frame_ && HTMLElement::IsKeyboardFocusable();
 }
 
-void HTMLFrameOwnerElement::DisposeWidgetSoon(FrameViewBase* frame_view_base) {
+void HTMLFrameOwnerElement::DisposeSoon(FrameOrPlugin* frame_or_plugin) {
   if (g_update_suspend_count) {
-    WidgetsPendingDispose().insert(frame_view_base);
+    PendingDispose().push_back(frame_or_plugin);
     return;
   }
-  frame_view_base->Dispose();
+  frame_or_plugin->Dispose();
 }
 
 void HTMLFrameOwnerElement::FrameOwnerPropertiesChanged() {
   // Don't notify about updates if contentFrame() is null, for example when
   // the subframe hasn't been created yet.
   if (ContentFrame())
     GetDocument().GetFrame()->Loader().Client()->DidChangeFrameOwnerProperties(
         this);
 }
 
@@ skipping 108 matching lines @@
 }
 
 DEFINE_TRACE(HTMLFrameOwnerElement) {
   visitor->Trace(content_frame_);
   visitor->Trace(widget_);
   HTMLElement::Trace(visitor);
   FrameOwner::Trace(visitor);
 }
 
 }  // namespace blink