Simplify Supplementables post Oilpan.

third_party/WebKit/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 @@
     RuntimeEnabledFeatures::setLangAttributeAwareFormControlUIEnabled(m_langAttributeAwareFormControlUIEnabled);
     settings->setImagesEnabled(m_imagesEnabled);
     settings->setDefaultVideoPosterURL(m_defaultVideoPosterURL);
     settings->genericFontFamilySettings().reset();
     RuntimeEnabledFeatures::setImageColorProfilesEnabled(m_originalImageColorProfilesEnabled);
     settings->setImageAnimationPolicy(m_originalImageAnimationPolicy);
     RuntimeEnabledFeatures::setScrollTopLeftInteropEnabled(m_originalScrollTopLeftInteropEnabled);
     RuntimeEnabledFeatures::setCompositorWorkerEnabled(m_originalCompositorWorkerEnabled);
 }
 
-#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 ENABLE(ASSERT)
-    bool isRefCountedWrapper() const override { return true; }
-#endif
-    InternalSettings* internalSettings() const { return m_internalSettings.get(); }
-
-private:
-    RefPtr<InternalSettings> m_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)
@@ skipping 203 matching lines @@
 void InternalSettings::setDefaultVideoPosterURL(const String& url, ExceptionState& exceptionState)
 {
     InternalSettingsGuardForSettings();
     settings()->setDefaultVideoPosterURL(url);
 }
 
 DEFINE_TRACE(InternalSettings)
 {
     visitor->trace(m_page);
     InternalSettingsGenerated::trace(visitor);
-#if ENABLE(OILPAN)
-    HeapSupplement<Page>::trace(visitor);
-#endif
+    Supplement<Page>::trace(visitor);
 }
 
 void InternalSettings::setAvailablePointerTypes(const String& pointers, ExceptionState& exceptionState)
 {
     InternalSettingsGuardForSettings();
 
     // Allow setting multiple pointer types by passing comma seperated list
     // ("coarse,fine").
     Vector<String> tokens;
     pointers.split(",", false, tokens);
@@ skipping 132 matching lines @@
     settings()->setLogPreload(enabled);
 }
 
 void InternalSettings::setCompositorWorkerEnabled(bool enabled, ExceptionState& exceptionState)
 {
     InternalSettingsGuardForSettings();
     RuntimeEnabledFeatures::setCompositorWorkerEnabled(enabled);
 }
 
 } // namespace blink