Oilpan: Make LocalFrame PersistentHeapSupplementable and use transition types for its supplements.

Source/modules/mediastream/UserMediaController.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:
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
@@ skipping 16 matching lines @@
 
 #include "core/frame/LocalFrame.h"
 #include "modules/mediastream/UserMediaClient.h"
 #include "wtf/PassOwnPtr.h"
 
 namespace WebCore {
 
 class MediaDevicesRequest;
 class UserMediaRequest;
 
-class UserMediaController FINAL : public Supplement<LocalFrame> {
+class UserMediaController FINAL : public NoBaseWillBeGarbageCollected<UserMediaController>, public WillBeHeapSupplement<LocalFrame> {
+    WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(UserMediaController);
+    DECLARE_EMPTY_VIRTUAL_DESTRUCTOR_WILL_BE_REMOVED();
 public:
-    virtual ~UserMediaController();
 
     UserMediaClient* client() const { return m_client; }
 
     void requestUserMedia(PassRefPtrWillBeRawPtr<UserMediaRequest>);
     void cancelUserMediaRequest(UserMediaRequest*);
 
     void requestMediaDevices(PassRefPtrWillBeRawPtr<MediaDevicesRequest>);
     void cancelMediaDevicesRequest(MediaDevicesRequest*);
 
-    static PassOwnPtr<UserMediaController> create(UserMediaClient*);
+    static PassOwnPtrWillBeRawPtr<UserMediaController> create(UserMediaClient*);
     static const char* supplementName();
-    static UserMediaController* from(LocalFrame* frame) { return static_cast<UserMediaController*>(Supplement<LocalFrame>::from(frame, supplementName())); }
+    static UserMediaController* from(LocalFrame* frame) { return static_cast<UserMediaController*>(WillBeHeapSupplement<LocalFrame>::from(frame, supplementName())); }
 
-    virtual void trace(Visitor* visitor) OVERRIDE { Supplement<LocalFrame>::trace(visitor); }
+    virtual void trace(Visitor* visitor) OVERRIDE { WillBeHeapSupplement<LocalFrame>::trace(visitor); }
 
 protected:
     explicit UserMediaController(UserMediaClient*);
 
 private:
     UserMediaClient* m_client;
 };
 
 inline void UserMediaController::requestUserMedia(PassRefPtrWillBeRawPtr<UserMediaRequest> request)
 {
@@ skipping 11 matching lines @@
 }
 
 inline void UserMediaController::cancelMediaDevicesRequest(MediaDevicesRequest* request)
 {
     m_client->cancelMediaDevicesRequest(request);
 }
 
 } // namespace WebCore
 
 #endif // UserMediaController_h