Make ScriptPromiseResolver RefCountedWillBeRefCountedGarbageCollected.

Source/modules/crypto/CryptoResultImpl.cpp

 /*
  * Copyright (C) 2013 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.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 44 matching lines @@
     if (!resolver->executionContext() || resolver->executionContext()->activeDOMObjectsAreStopped())
         return;
 
     ScriptState::Scope scope(resolver->scriptState());
     v8::Isolate* isolate = resolver->scriptState()->isolate();
     resolver->reject(v8::Exception::TypeError(v8String(isolate, errorDetails)));
 }
 
 class CryptoResultImpl::Resolver final : public ScriptPromiseResolver {
 public:
-    static PassRefPtr<ScriptPromiseResolver> create(ScriptState* scriptState, CryptoResultImpl* result)
+    static PassRefPtrWillBeRawPtr<ScriptPromiseResolver> create(ScriptState* scriptState, CryptoResultImpl* result)
     {
-        RefPtr<Resolver> resolver = adoptRef(new Resolver(scriptState, result));
+        RefPtrWillBeRawPtr<Resolver> resolver = adoptRefWillBeNoop(new Resolver(scriptState, result));
         resolver->suspendIfNeeded();
         resolver->keepAliveWhilePending();
         return resolver.release();
     }
 
     virtual void stop() override
     {
         m_result->cancel();
         m_result->clearResolver();
         m_result = nullptr;
         ScriptPromiseResolver::stop();
     }
 
+    virtual void trace(Visitor* visitor) override
+    {
+        ScriptPromiseResolver::trace(visitor);
+    }
+
 private:
     Resolver(ScriptState* scriptState, CryptoResultImpl* result)
         : ScriptPromiseResolver(scriptState)
         , m_result(result) { }
     RefPtr<CryptoResultImpl> m_result;
 };
 
 ExceptionCode webCryptoErrorToExceptionCode(WebCryptoErrorType errorType)
 {
     switch (errorType) {
@@ skipping 18 matching lines @@
 CryptoResultImpl::~CryptoResultImpl()
 {
     ASSERT(!m_resolver);
 }
 
 void CryptoResultImpl::clearResolver()
 {
     m_resolver = nullptr;
 }
 
-PassRefPtr<CryptoResultImpl> CryptoResultImpl::create(ScriptState* scriptState)
+PassRefPtrWillBeRawPtr<CryptoResultImpl> CryptoResultImpl::create(ScriptState* scriptState)
 {
-    return adoptRef(new CryptoResultImpl(scriptState));
+    return adoptRefWillBeNoop(new CryptoResultImpl(scriptState));
 }
 
 void CryptoResultImpl::completeWithError(WebCryptoErrorType errorType, const WebString& errorDetails)
 {
     if (m_resolver) {
+        ScriptPromiseResolver* resolver = m_resolver;

[haraken, 2014/12/16 13:52:45]

This is unnecessary.

[tasak, 2014/12/17 08:40:08]

Done.

         ExceptionCode ec = webCryptoErrorToExceptionCode(errorType);
 
         // Handle TypeError separately, as it cannot be created using
         // DOMException.
         if (ec == V8TypeError)
-            rejectWithTypeError(errorDetails, m_resolver);
+            rejectWithTypeError(errorDetails, resolver);
         else
-            m_resolver->reject(DOMException::create(ec, errorDetails));
+            resolver->reject(DOMException::create(ec, errorDetails));
     }
     clearResolver();
 }
 
 void CryptoResultImpl::completeWithBuffer(const void* bytes, unsigned bytesSize)
 {
     if (m_resolver)
         m_resolver->resolve(DOMArrayBuffer::create(bytes, bytesSize));
     clearResolver();
 }
@@ skipping 74 matching lines @@
         m_resolver = Resolver::create(scriptState, this).get();
     }
 }
 
 ScriptPromise CryptoResultImpl::promise()
 {
     return m_resolver ? m_resolver->promise() : ScriptPromise();
 }
 
 } // namespace blink