Make ScriptPromiseResolver RefCountedWillBeRefCountedGarbageCollected.

Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "modules/encryptedmedia/HTMLMediaElementEncryptedMedia.h"
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/ScriptPromise.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
@@ skipping 36 matching lines @@
 }
 
 // This class allows MediaKeys to be set asynchronously.
 class SetMediaKeysHandler : public ScriptPromiseResolver {
     WTF_MAKE_NONCOPYABLE(SetMediaKeysHandler);
 
 public:
     static ScriptPromise create(ScriptState*, HTMLMediaElement&, MediaKeys*);
     virtual ~SetMediaKeysHandler();
 
+    virtual void trace(Visitor*) override;
+
 private:
     SetMediaKeysHandler(ScriptState*, HTMLMediaElement&, MediaKeys*);
     void timerFired(Timer<SetMediaKeysHandler>*);
 
     void clearExistingMediaKeys();
     void setNewMediaKeys();
     void finish();
 
     void reportSetFailed(ExceptionCode, const String& errorMessage);
 
     // Keep media element alive until promise is fulfilled
-    RefPtrWillBePersistent<HTMLMediaElement> m_element;
-    Persistent<MediaKeys> m_newMediaKeys;
+    RefPtrWillBeMember<HTMLMediaElement> m_element;
+    PersistentWillBeMember<MediaKeys> m_newMediaKeys;
     Timer<SetMediaKeysHandler> m_timer;
 };
 
 typedef Function<void()> SuccessCallback;
 typedef Function<void(ExceptionCode, const String&)> FailureCallback;
 
 // Represents the result used when setContentDecryptionModule() is called.
 // Calls |success| if result is resolved, |failure| is result is rejected.
 class SetContentDecryptionModuleResult final : public ContentDecryptionModuleResult {
 public:
@@ skipping 20 matching lines @@
         (*m_failureCallback)(WebCdmExceptionToExceptionCode(code), message);
     }
 
 private:
     OwnPtr<SuccessCallback> m_successCallback;
     OwnPtr<FailureCallback> m_failureCallback;
 };
 
 ScriptPromise SetMediaKeysHandler::create(ScriptState* scriptState, HTMLMediaElement& element, MediaKeys* mediaKeys)
 {
-    RefPtr<SetMediaKeysHandler> handler = adoptRef(new SetMediaKeysHandler(scriptState, element, mediaKeys));
+    RefPtrWillBeRawPtr<SetMediaKeysHandler> handler = adoptRefWillBeNoop(new SetMediaKeysHandler(scriptState, element, mediaKeys));
     handler->suspendIfNeeded();
     handler->keepAliveWhilePending();
     return handler->promise();
 }
 
 SetMediaKeysHandler::SetMediaKeysHandler(ScriptState* scriptState, HTMLMediaElement& element, MediaKeys* mediaKeys)
     : ScriptPromiseResolver(scriptState)
     , m_element(element)
     , m_newMediaKeys(mediaKeys)
     , m_timer(this, &SetMediaKeysHandler::timerFired)
@@ skipping 100 matching lines @@
 
     // 3.3.2 If the preceding step failed, run the following steps:
     // 3.3.2.1 Set the mediaKeys attribute to null.
     thisElement.m_mediaKeys.clear();
 
     // 3.3.2.2 Reject promise with a new DOMException whose name is the
     //         appropriate error name and that has an appropriate message.
     reject(DOMException::create(code, errorMessage));
 }
 
+void SetMediaKeysHandler::trace(Visitor* visitor)
+{
+    visitor->trace(m_element);
+    visitor->trace(m_newMediaKeys);
+    ScriptPromiseResolver::trace(visitor);
+}
+
 HTMLMediaElementEncryptedMedia::HTMLMediaElementEncryptedMedia()
     : m_emeMode(EmeModeNotSelected)
 {
 }
 
 DEFINE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(HTMLMediaElementEncryptedMedia)
 
 const char* HTMLMediaElementEncryptedMedia::supplementName()
 {
     return "HTMLMediaElementEncryptedMedia";
@@ skipping 302 matching lines @@
     return thisElement.contentDecryptionModule();
 }
 
 void HTMLMediaElementEncryptedMedia::trace(Visitor* visitor)
 {
     visitor->trace(m_mediaKeys);
     WillBeHeapSupplement<HTMLMediaElement>::trace(visitor);
 }
 
 } // namespace blink