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 32 matching lines @@
 #include "core/dom/ExecutionContext.h"
 #include "modules/crypto/CryptoKey.h"
 #include "modules/crypto/NormalizeAlgorithm.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebCryptoAlgorithm.h"
 
 namespace blink {
 
 class CryptoResultImpl::WeakResolver : public ScriptPromiseResolver {
 public:
-    static WeakPtr<ScriptPromiseResolver> create(ScriptState* scriptState, CryptoResultImpl* result)
+    static PassRefPtrWillBeRawPtr<ScriptPromiseResolver> create(ScriptState* scriptState, CryptoResultImpl* result)
     {
-        RefPtr<WeakResolver> p = adoptRef(new WeakResolver(scriptState, result));
+        RefPtrWillBeRawPtr<WeakResolver> p = adoptRefWillBeNoop(new WeakResolver(scriptState, result));
         p->suspendIfNeeded();
         p->keepAliveWhilePending();
-        return p->m_weakPtrFactory.createWeakPtr();
+        return p.release();
     }
 
-    virtual ~WeakResolver()
+    virtual void stop() override
     {
         m_result->cancel();
+        m_result->clearResolver();
+        ScriptPromiseResolver::stop();
+    }
+
+
+    virtual void trace(Visitor* visitor)
+    {
+        ScriptPromiseResolver::trace(visitor);
     }
 
 private:
     WeakResolver(ScriptState* scriptState, CryptoResultImpl* result)
         : ScriptPromiseResolver(scriptState)
-        , m_weakPtrFactory(this)
         , m_result(result) { }
-    WeakPtrFactory<ScriptPromiseResolver> m_weakPtrFactory;
-    RefPtr<CryptoResultImpl> m_result;
+    RawPtr<CryptoResultImpl> m_result;

[tasak, 2014/12/09 10:38:28]

Since CryptResultImpl has a persistent member: m_resolver, which points 
WeakResolver, RawPtr.

 

 };
 
 ExceptionCode webCryptoErrorToExceptionCode(WebCryptoErrorType errorType)
 {
     switch (errorType) {
     case WebCryptoErrorTypeNotSupported:
         return NotSupportedError;
     case WebCryptoErrorTypeSyntax:
         return SyntaxError;
     case WebCryptoErrorTypeInvalidState:
@@ skipping 12 matching lines @@
         //        revisited.
         return DataError;
     }
 
     ASSERT_NOT_REACHED();
     return 0;
 }
 
 CryptoResultImpl::~CryptoResultImpl()
 {
+#if ENABLE(OILPAN)
+    ASSERT(!m_resolver);
+#endif
 }
 
-PassRefPtr<CryptoResultImpl> CryptoResultImpl::create(ScriptState* scriptState)
+void CryptoResultImpl::clearResolver()
 {
-    return adoptRef(new CryptoResultImpl(scriptState));
+#if ENABLE(OILPAN)
+    m_resolver.clear();
+#else
+    m_resolver = nullptr;
+#endif
+}
+
+ScriptPromiseResolver* CryptoResultImpl::resolver()
+{
+#if ENABLE(OILPAN)
+    return m_resolver ? m_resolver.get()->get() : nullptr;
+#else
+    return m_resolver.get();
+#endif
+}
+
+PassRefPtrWillBeRawPtr<CryptoResultImpl> CryptoResultImpl::create(ScriptState* scriptState)
+{
+    return adoptRefWillBeNoop(new CryptoResultImpl(scriptState));
 }
 
 void CryptoResultImpl::completeWithError(WebCryptoErrorType errorType, const WebString& errorDetails)
 {
-    if (m_resolver)
-        m_resolver->reject(DOMException::create(webCryptoErrorToExceptionCode(errorType), errorDetails));
+    if (resolver())
+        resolver()->reject(DOMException::create(webCryptoErrorToExceptionCode(errorType), errorDetails));
+    clearResolver();
 }
 
 void CryptoResultImpl::completeWithBuffer(const void* bytes, unsigned bytesSize)
 {
-    if (m_resolver)
-        m_resolver->resolve(DOMArrayBuffer::create(bytes, bytesSize));
+    if (resolver())
+        resolver()->resolve(DOMArrayBuffer::create(bytes, bytesSize));
+    clearResolver();
 }
 
 void CryptoResultImpl::completeWithJson(const char* utf8Data, unsigned length)
 {
-    if (m_resolver) {
-        ScriptPromiseResolver* resolver = m_resolver.get();
-        ScriptState* scriptState = resolver->scriptState();
+    if (resolver()) {
+        ScriptPromiseResolver* scriptPromiseResolver = resolver();
+        ScriptState* scriptState = scriptPromiseResolver->scriptState();
         ScriptState::Scope scope(scriptState);
 
         v8::Handle<v8::String> jsonString = v8::String::NewFromUtf8(scriptState->isolate(), utf8Data, v8::String::kInternalizedString, length);
 
         v8::TryCatch exceptionCatcher;
         v8::Handle<v8::Value> jsonDictionary = v8::JSON::Parse(jsonString);
         if (exceptionCatcher.HasCaught() || jsonDictionary.IsEmpty()) {
             ASSERT_NOT_REACHED();
-            resolver->reject(DOMException::create(OperationError, "Failed inflating JWK JSON to object"));
+            scriptPromiseResolver->reject(DOMException::create(OperationError, "Failed inflating JWK JSON to object"));
         } else {
-            resolver->resolve(jsonDictionary);
+            scriptPromiseResolver->resolve(jsonDictionary);
         }
     }
+    clearResolver();
 }
 
 void CryptoResultImpl::completeWithBoolean(bool b)
 {
-    if (m_resolver)
-        m_resolver->resolve(b);
+    if (resolver())
+        resolver()->resolve(b);
+    clearResolver();
 }
 
 void CryptoResultImpl::completeWithKey(const WebCryptoKey& key)
 {
-    if (m_resolver)
-        m_resolver->resolve(CryptoKey::create(key));
+    if (resolver())
+        resolver()->resolve(CryptoKey::create(key));
+    clearResolver();
 }
 
 void CryptoResultImpl::completeWithKeyPair(const WebCryptoKey& publicKey, const WebCryptoKey& privateKey)
 {
-    if (m_resolver) {
-        ScriptState* scriptState = m_resolver->scriptState();
+    if (resolver()) {
+        ScriptState* scriptState = resolver()->scriptState();
         ScriptState::Scope scope(scriptState);
 
         Dictionary keyPair = Dictionary::createEmpty(scriptState->isolate());
 
         v8::Handle<v8::Value> publicKeyValue = toV8(CryptoKey::create(publicKey), scriptState->context()->Global(), scriptState->isolate());
         v8::Handle<v8::Value> privateKeyValue = toV8(CryptoKey::create(privateKey), scriptState->context()->Global(), scriptState->isolate());
 
         keyPair.set("publicKey", publicKeyValue);
         keyPair.set("privateKey", privateKeyValue);
 
-        m_resolver->resolve(keyPair.v8Value());
+        resolver()->resolve(keyPair.v8Value());
     }
+    clearResolver();
 }
 
 bool CryptoResultImpl::cancelled() const
 {
     return acquireLoad(&m_cancelled);
 }
 
 void CryptoResultImpl::cancel()
 {
     releaseStore(&m_cancelled, 1);
 }
 
 CryptoResultImpl::CryptoResultImpl(ScriptState* scriptState)
     : m_cancelled(0)
 {
     // Creating the WeakResolver may return nullptr if active dom objects have
     // been stopped. And in the process set m_cancelled to 1.
-    m_resolver = WeakResolver::create(scriptState, this);
+#if ENABLE(OILPAN)
+    if (!m_resolver)
+        m_resolver = adoptPtr(new Persistent<ScriptPromiseResolver>());
+    *m_resolver = Persistent<ScriptPromiseResolver>(WeakResolver::create(scriptState, this));
+#else
+    m_resolver = WeakResolver::create(scriptState, this).get();
+#endif
 }
 
 ScriptPromise CryptoResultImpl::promise()
 {
-    return m_resolver ? m_resolver->promise() : ScriptPromise();
+    if (ScriptPromiseResolver* scriptPromiseResolver = resolver())
+        return scriptPromiseResolver->promise();
+    return ScriptPromise();
 }
 
 } // namespace blink