Simplify Supplementables post Oilpan.

third_party/WebKit/Source/core/page/Page.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All Rights Reserved.
  * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  *
  * 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 508 matching lines @@
 }
 
 void Page::purgeMemory(DeviceKind deviceKind)
 {
     if (deviceKind == DeviceKind::LowEnd)
         memoryCache()->pruneAll();
 }
 
 DEFINE_TRACE(Page)
 {
-#if ENABLE(OILPAN)
     visitor->trace(m_animator);
     visitor->trace(m_autoscrollController);
     visitor->trace(m_chromeClient);
     visitor->trace(m_dragCaretController);
     visitor->trace(m_dragController);
     visitor->trace(m_focusController);
     visitor->trace(m_contextMenuController);
     visitor->trace(m_pointerLockController);
     visitor->trace(m_scrollingCoordinator);
     visitor->trace(m_undoStack);
     visitor->trace(m_mainFrame);
     visitor->trace(m_validationMessageClient);
     visitor->trace(m_multisamplingChangedObservers);
     visitor->trace(m_frameHost);
     visitor->trace(m_memoryPurgeController);
-    HeapSupplementable<Page>::trace(visitor);
-#endif
+    Supplementable<Page>::trace(visitor);
     PageLifecycleNotifier::trace(visitor);
     MemoryPurgeClient::trace(visitor);
 }
 
 void Page::layerTreeViewInitialized(WebLayerTreeView& layerTreeView)
 {
     if (scrollingCoordinator())
         scrollingCoordinator()->layerTreeViewInitialized(layerTreeView);
 }
 
@@ skipping 46 matching lines @@
     , editorClient(nullptr)
     , dragClient(nullptr)
     , spellCheckerClient(nullptr)
 {
 }
 
 Page::PageClients::~PageClients()
 {
 }
 
-template class CORE_TEMPLATE_EXPORT HeapSupplement<Page>;
+template class CORE_TEMPLATE_EXPORT Supplement<Page>;
 
 } // namespace blink