Oilpan: simplify plugin container finalization.

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

 /*
  * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
  *                     1999 Lars Knoll <knoll@kde.org>
  *                     1999 Antti Koivisto <koivisto@kde.org>
  *                     2000 Simon Hausmann <hausmann@kde.org>
  *                     2000 Stefan Schimanski <1Stein@gmx.de>
  *                     2001 George Staikos <staikos@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com>
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
@@ skipping 202 matching lines @@
     visitor->trace(m_view);
     visitor->trace(m_domWindow);
     visitor->trace(m_pagePopupOwner);
     visitor->trace(m_script);
     visitor->trace(m_editor);
     visitor->trace(m_spellChecker);
     visitor->trace(m_selection);
     visitor->trace(m_eventHandler);
     visitor->trace(m_console);
     visitor->trace(m_inputMethodController);
-    visitor->template registerWeakMembers<LocalFrame, &LocalFrame::clearWeakMembers>(this);
     HeapSupplementable<LocalFrame>::trace(visitor);
 #endif
     LocalFrameLifecycleNotifier::trace(visitor);
     Frame::trace(visitor);
 }
 
 DOMWindow* LocalFrame::domWindow() const
 {
     return m_domWindow.get();
 }
@@ skipping 130 matching lines @@
 WindowProxyManager* LocalFrame::windowProxyManager() const
 {
     return m_script->windowProxyManager();
 }
 
 void LocalFrame::disconnectOwnerElement()
 {
     if (owner()) {
         if (Document* document = this->document())
             document->topDocument().clearAXObjectCache();
-#if ENABLE(OILPAN)
-        // First give the plugin elements holding persisted,
-        // renderer-less plugins the opportunity to dispose of them.
-        for (const auto& pluginElement : m_pluginElements)
-            pluginElement->disconnectContentFrame();
-        m_pluginElements.clear();
-#endif
     }
     Frame::disconnectOwnerElement();
 }
 
 bool LocalFrame::shouldClose()
 {
     // TODO(dcheng): This should be fixed to dispatch beforeunload events to
     // both local and remote frames.
     return m_loader.shouldClose();
 }
@@ skipping 436 matching lines @@
     // direction to hide the top controls, only give the delta to the
     // top controls when the frame can scroll.
     DoublePoint maximumScrollPosition =
         host()->visualViewport().maximumScrollPositionDouble() +
         toDoubleSize(view()->maximumScrollPositionDouble());
     DoublePoint scrollPosition = host()->visualViewport()
         .visibleRectInDocument().location();
     return delta.height() > 0 || scrollPosition.y() < maximumScrollPosition.y();
 }
 
-#if ENABLE(OILPAN)
-void LocalFrame::registerPluginElement(HTMLPlugInElement* plugin)
-{
-    m_pluginElements.add(plugin);
-}
-
-void LocalFrame::unregisterPluginElement(HTMLPlugInElement* plugin)
-{
-    ASSERT(m_pluginElements.contains(plugin));
-    m_pluginElements.remove(plugin);
-}
-
-void LocalFrame::clearWeakMembers(Visitor* visitor)
-{
-    Vector<UntracedMember<HTMLPlugInElement>> deadPlugins;
-    for (const auto& pluginElement : m_pluginElements) {
-        if (!Heap::isHeapObjectAlive(pluginElement)) {
-            pluginElement->shouldDisposePlugin();
-            deadPlugins.append(pluginElement);
-        }
-    }
-    for (unsigned i = 0; i < deadPlugins.size(); ++i)
-        m_pluginElements.remove(deadPlugins[i]);
-}
-#endif
-
 String LocalFrame::localLayerTreeAsText(unsigned flags) const
 {
     if (!contentLayoutObject())
         return String();
 
     return contentLayoutObject()->compositor()->layerTreeAsText(static_cast<LayerTreeFlags>(flags));
 }
 
 bool LocalFrame::shouldThrottleRendering() const
 {
@@ skipping 51 matching lines @@
 {
     m_frame->disableNavigation();
 }
 
 FrameNavigationDisabler::~FrameNavigationDisabler()
 {
     m_frame->enableNavigation();
 }
 
 } // namespace blink