Simplify Supplementables post Oilpan.

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 227 matching lines @@
 #if !ENABLE(OILPAN)
     // Oilpan: see setDOMWindow() comment why it is acceptable not to
     // explicitly call setDOMWindow() here.
     setDOMWindow(nullptr);
 #endif
 }
 
 DEFINE_TRACE(LocalFrame)
 {
     visitor->trace(m_instrumentingAgents);
-#if ENABLE(OILPAN)
     visitor->trace(m_loader);
     visitor->trace(m_navigationScheduler);
     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);
-    HeapSupplementable<LocalFrame>::trace(visitor);
-#endif
+    Frame::trace(visitor);
     LocalFrameLifecycleNotifier::trace(visitor);
-    Frame::trace(visitor);
+    Supplementable<LocalFrame>::trace(visitor);
 }
 
 DOMWindow* LocalFrame::domWindow() const
 {
     return m_domWindow.get();
 }
 
 WindowProxy* LocalFrame::windowProxy(DOMWrapperWorld& world)
 {
     return m_script->windowProxy(world);
@@ skipping 598 matching lines @@
 {
     m_frame->disableNavigation();
 }
 
 FrameNavigationDisabler::~FrameNavigationDisabler()
 {
     m_frame->enableNavigation();
 }
 
 } // namespace blink