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

Source/core/dom/ContextFeatures.h

 /*
  * Copyright (C) 2012 Google 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Neither the name of Google Inc. nor the names of its
@@ skipping 17 matching lines @@
 #define ContextFeatures_h
 
 #include "platform/RefCountedSupplement.h"
 
 namespace WebCore {
 
 class ContextFeaturesClient;
 class Document;
 class Page;
 
+#if ENABLE(OILPAN)
+class ContextFeatures FINAL : public RefCountedGarbageCollected<ContextFeatures>, public HeapSupplement<Page> {
+    WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(ContextFeatures);
+public:
+    typedef HeapSupplement<Page> SupplementType;
+#else
 class ContextFeatures : public RefCountedSupplement<Page, ContextFeatures> {
 public:
+    typedef RefCountedSupplement<Page, ContextFeatures> SupplementType;
+#endif
     enum FeatureType {
         DialogElement = 0,
         StyleScoped,
         PagePopup,
         MutationEvents,
         PushState,
         FeatureTypeSize // Should be the last entry.
     };
 
     static const char* supplementName();
     static ContextFeatures* defaultSwitch();
-    static PassRefPtr<ContextFeatures> create(PassOwnPtr<ContextFeaturesClient>);
+    static PassRefPtrWillBeRawPtr<ContextFeatures> create(PassOwnPtr<ContextFeaturesClient>);
 
     static bool dialogElementEnabled(Document*);
     static bool styleScopedEnabled(Document*);
     static bool pagePopupEnabled(Document*);
     static bool mutationEventsEnabled(Document*);
     static bool pushStateEnabled(Document*);
 
     bool isEnabled(Document*, FeatureType, bool) const;
     void urlDidChange(Document*);
 
+#if ENABLE(OILPAN)
+    virtual void trace(Visitor*) OVERRIDE { }
+#endif
+
 private:
     explicit ContextFeatures(PassOwnPtr<ContextFeaturesClient> client)
         : m_client(client)
     { }
 
     OwnPtr<ContextFeaturesClient> m_client;
 };
 
 class ContextFeaturesClient {
     WTF_MAKE_FAST_ALLOCATED;
 public:
     static PassOwnPtr<ContextFeaturesClient> empty();
 
     virtual ~ContextFeaturesClient() { }
     virtual bool isEnabled(Document*, ContextFeatures::FeatureType, bool defaultValue) { return defaultValue; }
     virtual void urlDidChange(Document*) { }
 };
 
 void provideContextFeaturesTo(Page&, PassOwnPtr<ContextFeaturesClient>);
 void provideContextFeaturesToDocumentFrom(Document&, Page&);
 
-inline PassRefPtr<ContextFeatures> ContextFeatures::create(PassOwnPtr<ContextFeaturesClient> client)
+inline PassRefPtrWillBeRawPtr<ContextFeatures> ContextFeatures::create(PassOwnPtr<ContextFeaturesClient> client)
 {
-    return adoptRef(new ContextFeatures(client));
+    return adoptRefWillBeRefCountedGarbageCollected(new ContextFeatures(client));
 }
 
 inline bool ContextFeatures::isEnabled(Document* document, FeatureType type, bool defaultValue) const
 {
     if (!m_client)
         return defaultValue;
     return m_client->isEnabled(document, type, defaultValue);
 }
 
 inline void ContextFeatures::urlDidChange(Document* document)
 {
     // FIXME: The original code, commented out below, is obviously
     // wrong, but the seemingly correct fix of negating the test to
     // the more logical 'if (!m_client)' crashes the renderer.
     // See issue 294180
     //
     // if (m_client)
     //     return;
     // m_client->urlDidChange(document);
 }
 
 } // namespace WebCore
 
 #endif // ContextFeatures_h