Oilpan: Move all supplements of Page, Document, and WorkerClients to the managed heap.

Source/core/testing/InternalSettings.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  * Copyright (C) 2013 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 82 matching lines @@
     settings->setMockScrollbarsEnabled(m_originalMockScrollbarsEnabled);
     RuntimeEnabledFeatures::setLangAttributeAwareFormControlUIEnabled(m_langAttributeAwareFormControlUIEnabled);
     settings->setImagesEnabled(m_imagesEnabled);
     settings->setDefaultVideoPosterURL(m_defaultVideoPosterURL);
     settings->setCompositorDrivenAcceleratedScrollingEnabled(m_originalCompositorDrivenAcceleratedScrollEnabled);
     settings->setLayerSquashingEnabled(m_originalLayerSquashingEnabled);
     settings->setPasswordGenerationDecorationEnabled(m_originalPasswordGenerationDecorationEnabled);
     settings->genericFontFamilySettings().reset();
 }
 
+#if ENABLE(OILPAN)
+InternalSettings* InternalSettings::from(Page& page)
+{
+    if (!HeapSupplement<Page>::from(page, supplementName()))
+        HeapSupplement<Page>::provideTo(page, supplementName(), new InternalSettings(page));
+    return static_cast<InternalSettings*>(HeapSupplement<Page>::from(page, supplementName()));
+}
+#else
 // We can't use RefCountedSupplement because that would try to make InternalSettings RefCounted
 // and InternalSettings is already RefCounted via its base class, InternalSettingsGenerated.
 // Instead, we manually make InternalSettings supplement Page.
 class InternalSettingsWrapper : public Supplement<Page> {
 public:
     explicit InternalSettingsWrapper(Page& page)
         : m_internalSettings(InternalSettings::create(page)) { }
     virtual ~InternalSettingsWrapper() { m_internalSettings->hostDestroyed(); }
 #if !ASSERT_DISABLED
     virtual bool isRefCountedWrapper() const OVERRIDE { return true; }
 #endif
     InternalSettings* internalSettings() const { return m_internalSettings.get(); }
 
     virtual void trace(Visitor*) OVERRIDE { }
 
 private:
-    RefPtrWillBePersistent<InternalSettings> m_internalSettings;
+    RefPtr<InternalSettings> m_internalSettings;
 };
 
-const char* InternalSettings::supplementName()
-{
-    return "InternalSettings";
-}
-
 InternalSettings* InternalSettings::from(Page& page)
 {
     if (!Supplement<Page>::from(page, supplementName()))
         Supplement<Page>::provideTo(page, supplementName(), adoptPtr(new InternalSettingsWrapper(page)));
     return static_cast<InternalSettingsWrapper*>(Supplement<Page>::from(page, supplementName()))->internalSettings();
 }
+#endif
+
+const char* InternalSettings::supplementName()
+{
+    return "InternalSettings";
+}
 
 InternalSettings::~InternalSettings()
 {
 }
 
 InternalSettings::InternalSettings(Page& page)
     : InternalSettingsGenerated(&page)
     , m_page(&page)
     , m_backup(&page.settings())
 {
@@ skipping 196 matching lines @@
     InternalSettingsGuardForSettings();
     settings()->setDefaultVideoPosterURL(url);
 }
 
 void InternalSettings::setPasswordGenerationDecorationEnabled(bool enabled, ExceptionState& exceptionState)
 {
     InternalSettingsGuardForSettings();
     settings()->setPasswordGenerationDecorationEnabled(enabled);
 }
 
+void InternalSettings::trace(Visitor* visitor)
+{
+    visitor->trace(m_page);
+    InternalSettingsGenerated::trace(visitor);
 }
+
+}