Oilpan: simplify plugin container finalization.

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

 /*
  * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
  *                     1999-2001 Lars Knoll <knoll@kde.org>
  *                     1999-2001 Antti Koivisto <koivisto@kde.org>
  *                     2000-2001 Simon Hausmann <hausmann@kde.org>
  *                     2000-2001 Dirk Mueller <mueller@kde.org>
  *                     2000 Stefan Schimanski <1Stein@gmx.de>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
@@ skipping 156 matching lines @@
 
     bool isURLAllowed(const KURL&) const;
     bool shouldReuseDefaultView(const KURL&) const;
     void removeSpellingMarkersUnderWords(const Vector<String>& words);
 
     // FIXME: once scroll customization is enabled everywhere
     // (crbug.com/416862), this should take a ScrollState object.
     ScrollResult applyScrollDelta(const FloatSize& delta, bool isScrollBegin);
     bool shouldScrollTopControls(const FloatSize& delta) const;
 
-#if ENABLE(OILPAN)
-    void registerPluginElement(HTMLPlugInElement*);
-    void unregisterPluginElement(HTMLPlugInElement*);
-    void clearWeakMembers(Visitor*);
-#endif
-
     // DisplayItemClient methods
     String debugName() const final { return "LocalFrame"; }
     // TODO(chrishtr): fix this.
     IntRect visualRect() const override { return IntRect(); }
 
     bool shouldThrottleRendering() const;
 
     // Returns the frame scheduler, creating one if needed.
     WebFrameScheduler* frameScheduler();
     void scheduleVisualUpdateUnlessThrottled();
@@ skipping 33 matching lines @@
     const OwnPtrWillBeMember<Editor> m_editor;
     const OwnPtrWillBeMember<SpellChecker> m_spellChecker;
     const OwnPtrWillBeMember<FrameSelection> m_selection;
     const OwnPtrWillBeMember<EventHandler> m_eventHandler;
     const OwnPtrWillBeMember<FrameConsole> m_console;
     const OwnPtrWillBeMember<InputMethodController> m_inputMethodController;
     OwnPtr<WebFrameScheduler> m_frameScheduler;
 
     int m_navigationDisableCount;
 
-#if ENABLE(OILPAN)
-    // Oilpan: in order to reliably finalize plugin elements with
-    // renderer-less plugins, the frame keeps track of them. When
-    // the frame is detached and disposed, these will be disposed
-    // of in the process. This is needed as the plugin element
-    // might not itself be attached to a DOM tree and be
-    // explicitly detached&disposed of.
-    //
-    // A weak reference is all wanted; the plugin element must
-    // otherwise be referenced and kept alive. So as to be able
-    // to process the set of weak references during the LocalFrame's
-    // weak callback, the set itself is not on the heap and the
-    // references are bare pointers (rather than WeakMembers.)
-    // See LocalFrame::clearWeakMembers().
-    HashSet<UntracedMember<HTMLPlugInElement>> m_pluginElements;
-#endif
-
     float m_pageZoomFactor;
     float m_textZoomFactor;
 
     bool m_inViewSourceMode;
 
     RefPtrWillBeMember<InstrumentingAgents> m_instrumentingAgents;
 
     // TODO(dcheng): Temporary to try to debug https://crbug.com/531291
     enum class SupplementStatus { Uncleared, Clearing, Cleared };
     SupplementStatus m_supplementStatus = SupplementStatus::Uncleared;
@@ skipping 82 matching lines @@
     explicit FrameNavigationDisabler(LocalFrame&);
     ~FrameNavigationDisabler();
 
 private:
     RawPtrWillBeMember<LocalFrame> m_frame;
 };
 
 } // namespace blink
 
 #endif // LocalFrame_h