Return null when no promise/reason is given in PromiseRejectionEvent

Source/core/events/PromiseRejectionEvent.cpp

 // Copyright 2015 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 "core/events/PromiseRejectionEvent.h"
 
 namespace blink {
 
 PromiseRejectionEvent::PromiseRejectionEvent()
 {
 }
 
-PromiseRejectionEvent::PromiseRejectionEvent(const AtomicString& type, const PromiseRejectionEventInit& initializer)
+PromiseRejectionEvent::PromiseRejectionEvent(ScriptState* state, const AtomicString& type, const PromiseRejectionEventInit& initializer)
     : Event(type, initializer)
+    , m_scriptState(state)
 {
     if (initializer.hasPromise()) {
         m_promise.set(initializer.promise().isolate(), initializer.promise().v8Value());
         m_promise.setWeak(this, &PromiseRejectionEvent::didCollectPromise);
     }
     if (initializer.hasReason()) {
         m_reason.set(initializer.reason().isolate(), initializer.reason().v8Value());
         m_reason.setWeak(this, &PromiseRejectionEvent::didCollectReason);
     }
 }
 
 PromiseRejectionEvent::~PromiseRejectionEvent()
 {
 }
 
-ScriptPromise PromiseRejectionEvent::promise(ScriptState* state) const
+ScriptPromise PromiseRejectionEvent::promise() const
 {
-    v8::Local<v8::Value> value = m_promise.newLocal(state->isolate());
-    return ScriptPromise(state, value);
+    if (!m_scriptState || !m_scriptState->contextIsValid())

[haraken, 2015/06/19 11:38:03]

When is it possible that m_scriptState becomes 0?

[jochen (gone - plz use gerrit), 2015/06/19 12:06:21]

The ctor that doesn't take parameters doesn't initialize m_scriptState - it
doesn't become null in that case, it always is null

+        return ScriptPromise();
+    return ScriptPromise(m_scriptState.get(), m_promise.newLocal(m_scriptState->isolate()));
 }
 
-ScriptValue PromiseRejectionEvent::reason(ScriptState* state) const
+ScriptValue PromiseRejectionEvent::reason() const
 {
-    v8::Local<v8::Value> value = m_reason.newLocal(state->isolate());
-    return ScriptValue(state, value);
+    if (!m_scriptState || !m_scriptState->contextIsValid())
+        return ScriptValue();
+    return ScriptValue(m_scriptState.get(), m_reason.newLocal(m_scriptState->isolate()));
 }
 
 const AtomicString& PromiseRejectionEvent::interfaceName() const
 {
     return EventNames::PromiseRejectionEvent;
 }
 
 DEFINE_TRACE(PromiseRejectionEvent)
 {
     Event::trace(visitor);
 }
 
 void PromiseRejectionEvent::didCollectPromise(const v8::WeakCallbackInfo<PromiseRejectionEvent>& data)
 {
     data.GetParameter()->m_promise.clear();
 }
 
 void PromiseRejectionEvent::didCollectReason(const v8::WeakCallbackInfo<PromiseRejectionEvent>& data)

[haraken, 2015/06/19 11:38:03]

(Nit: It's not really nice we have to write V8 things in core/, but we need to
solve the ScriptValue-leak problem to remove the code...)

 {
     data.GetParameter()->m_reason.clear();
 }
 
 } // namespace blink