Make CryptoResultImpl not to use WeakPtr.

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 30 matching lines @@
 #include "core/dom/DOMError.h"
 #include "core/dom/DOMException.h"
 #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 {
+class CryptoResultResolver : public ScriptPromiseResolver {

[haraken, 2014/12/12 00:04:10]

Add final.

[tasak, 2014/12/12 07:56:50]

Done.

 public:
-    static WeakPtr<ScriptPromiseResolver> create(ScriptState* scriptState, CryptoResultImpl* result)
+    static PassRefPtr<ScriptPromiseResolver> create(ScriptState* scriptState, CryptoResultImpl* result)
     {
-        RefPtr<WeakResolver> p = adoptRef(new WeakResolver(scriptState, result));
+        RefPtr<CryptoResultResolver> p = adoptRef(new CryptoResultResolver(scriptState, result));

[haraken, 2014/12/12 00:04:10]

p => resolver

[tasak, 2014/12/12 07:56:51]

Done.

         p->suspendIfNeeded();
         p->keepAliveWhilePending();
-        return p->m_weakPtrFactory.createWeakPtr();
+        return p.release();
     }
 
-    virtual ~WeakResolver()
+    virtual void stop() override
     {
-        m_result->cancel();
+        if (m_result) {
+            m_result->cancel();
+            m_result->clearResolver();
+            m_result = nullptr;
+        }
+        ScriptPromiseResolver::stop();
+    }
+
+    void clearCryptoResult()
+    {
+        m_result = nullptr;
     }
 
 private:
-    WeakResolver(ScriptState* scriptState, CryptoResultImpl* result)
+    CryptoResultResolver(ScriptState* scriptState, CryptoResultImpl* result)
         : ScriptPromiseResolver(scriptState)
-        , m_weakPtrFactory(this)
         , m_result(result) { }
-    WeakPtrFactory<ScriptPromiseResolver> m_weakPtrFactory;
-    RefPtr<CryptoResultImpl> m_result;
+    CryptoResultImpl* m_result;

[haraken, 2014/12/12 00:04:10]

Help me understand: Why can't this a RefPtr?

[tasak, 2014/12/12 07:56:50]

As far as I investigated, CryptoResultImpl should live longer than this
Resolver.
So Resolver don't need to use RefPtr to hold CryptoResultImpl. Instead, we
should carefully clear m_result.

 };
 
+DEFINE_TYPE_CASTS(CryptoResultResolver, ScriptPromiseResolver, resolver, true, true);
+
 ExceptionCode webCryptoErrorToExceptionCode(WebCryptoErrorType errorType)
 {
     switch (errorType) {
     case WebCryptoErrorTypeNotSupported:
         return NotSupportedError;
     case WebCryptoErrorTypeSyntax:
         return SyntaxError;
     case WebCryptoErrorTypeInvalidState:
         return InvalidStateError;
     case WebCryptoErrorTypeInvalidAccess:
         return InvalidAccessError;
     case WebCryptoErrorTypeUnknown:
         return UnknownError;
     case WebCryptoErrorTypeData:
         return DataError;
     case WebCryptoErrorTypeOperation:
         return OperationError;
     case WebCryptoErrorTypeType:
         // FIXME: This should construct a TypeError instead. For now do
         //        something to facilitate refactor, but this will need to be
         //        revisited.
         return DataError;
     }
 
     ASSERT_NOT_REACHED();
     return 0;
 }
 
 CryptoResultImpl::~CryptoResultImpl()
 {

[haraken, 2014/12/12 00:04:10]

Add ASSERT(!m_resolver) to verify that the resolver is cleared before the
CryptoResultImpl is destructed.

 }
 
+void CryptoResultImpl::clearResolver()
+{
+    if (m_resolver)
+        toCryptoResultResolver(m_resolver)->clearCryptoResult();
+    m_resolver = nullptr;
+}
+
 PassRefPtr<CryptoResultImpl> CryptoResultImpl::create(ScriptState* scriptState)
 {
     return adoptRef(new CryptoResultImpl(scriptState));
 }
 
 void CryptoResultImpl::completeWithError(WebCryptoErrorType errorType, const WebString& errorDetails)
 {
     if (m_resolver)
         m_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));
+    clearResolver();
 }
 
 void CryptoResultImpl::completeWithJson(const char* utf8Data, unsigned length)
 {
     if (m_resolver) {
         ScriptPromiseResolver* resolver = m_resolver.get();
         ScriptState* scriptState = resolver->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"));
         } else {
             resolver->resolve(jsonDictionary);
         }
     }
+    clearResolver();
 }
 
 void CryptoResultImpl::completeWithBoolean(bool b)
 {
     if (m_resolver)
         m_resolver->resolve(b);
+    clearResolver();
 }
 
 void CryptoResultImpl::completeWithKey(const WebCryptoKey& key)
 {
     if (m_resolver)
         m_resolver->resolve(CryptoKey::create(key));
+    clearResolver();
 }
 
 void CryptoResultImpl::completeWithKeyPair(const WebCryptoKey& publicKey, const WebCryptoKey& privateKey)
 {
     if (m_resolver) {
         ScriptState* scriptState = m_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());
     }
+    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);
+    ASSERT(scriptState);

[haraken, 2014/12/12 00:04:10]

scriptState should never be 0. Instead you should check if
scriptState->contextIsValid().

+    if (scriptState->executionContext()->activeDOMObjectsAreStopped()) {
+        // If active dom objects have been stopped, avoid creating
+        // CryptoResultResolver.
+        m_resolver = nullptr;
+    } else {
+        m_resolver = CryptoResultResolver::create(scriptState, this).get();
+    }
 }
 
 ScriptPromise CryptoResultImpl::promise()
 {
     return m_resolver ? m_resolver->promise() : ScriptPromise();
 }
 
 } // namespace blink