[ServiceWorker, PushMessaging] Use ScriptPromiseResolverWithContext.

Source/bindings/v8/CallbackPromiseAdapter.h

Index: Source/bindings/v8/CallbackPromiseAdapter.h
diff --git a/Source/bindings/v8/CallbackPromiseAdapter.h b/Source/bindings/v8/CallbackPromiseAdapter.h
index af2216728f4ce3a33847aad980f6bb4e410bde02..2d09e8220ed0d94dee0fc3721e2cc9802728df0a 100644
--- a/Source/bindings/v8/CallbackPromiseAdapter.h
+++ b/Source/bindings/v8/CallbackPromiseAdapter.h
@@ -31,8 +31,7 @@
 #ifndef CallbackPromiseAdapter_h
 #define CallbackPromiseAdapter_h
 
-#include "bindings/v8/NewScriptState.h"
-#include "bindings/v8/ScriptPromiseResolver.h"
+#include "bindings/v8/ScriptPromiseResolverWithContext.h"
 #include "public/platform/WebCallbacks.h"
 
 namespace WebCore {
@@ -64,26 +63,26 @@ namespace WebCore {
 template<typename S, typename T>
 class CallbackPromiseAdapter FINAL : public blink::WebCallbacks<typename S::WebType, typename T::WebType> {
 public:
-    CallbackPromiseAdapter(PassRefPtr<ScriptPromiseResolver> resolver, ExecutionContext* context)
+    CallbackPromiseAdapter(PassRefPtr<ScriptPromiseResolverWithContext> resolver)
         : m_resolver(resolver)
-        , m_scriptState(NewScriptState::current(toIsolate(context)))
     {
     }
     virtual ~CallbackPromiseAdapter() { }
 
     virtual void onSuccess(typename S::WebType* result) OVERRIDE
     {
-        NewScriptState::Scope scope(m_scriptState.get());
-        m_resolver->resolve(S::from(m_scriptState.get(), result));
+        if (!m_resolver->scriptState())
+            return;

[haraken, 2014/04/14 12:13:17]

This will change existing behavior in a case where onSuccess() is called after
an ExecutionContext is stopped. In the old code, resolve() was called. In the
new code, nothing is called. Is this change OK?

In addition, even if you want to return immediately when the ExecutionContext is
gone, you should check it by the existence of
ScriptPromiseResolverWithContext::m_resolver (instead of the existence of
ScriptPromiseResolverWithContext::m_scriptState). As I commented in
ScriptPromiseResolverWithContext.h, m_scriptState shouldn't be cleared out until
the holder object dies.

[yhirano, 2014/04/14 12:37:23]

Yes, this CL changes the behavior as written in the description, though the
blink Promises can't work with a stopped execution context (see [A]).
In addition to that, current ScriptPromiseResolverWithContext ignores resolve or
reject callls when the execution context is stopped.

What should a resolver do when resolve or reject called on a stopped execution
context?
I think of three options:
1. Do nothing (the current behavior)
2. Work normally
3. The resolver rejects the associated promise with a certain exception when the
executionContext is stopped.

A:
https://code.google.com/p/chromium/codesearch#chromium/src/third_party/WebKit...

[yhirano, 2014/04/15 01:02:17]

I made ScriptPromiseResolver::m_scriptState const so that we can use after the
resolver is cleared.

+        m_resolver->resolve(S::from(m_resolver->scriptState(), result));
     }
     virtual void onError(typename T::WebType* error) OVERRIDE
     {
-        NewScriptState::Scope scope(m_scriptState.get());
-        m_resolver->reject(T::from(m_scriptState.get(), error));
+        if (!m_resolver->scriptState())
+            return;

[haraken, 2014/04/14 12:13:17]

Ditto.

+        m_resolver->reject(T::from(m_resolver->scriptState(), error));
     }
 private:
-    RefPtr<ScriptPromiseResolver> m_resolver;
-    RefPtr<NewScriptState> m_scriptState;
+    RefPtr<ScriptPromiseResolverWithContext> m_resolver;
     WTF_MAKE_NONCOPYABLE(CallbackPromiseAdapter);
 };