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"
 
+#include "bindings/core/v8/DOMWrapperWorld.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
 {
-    v8::Local<v8::Value> value = m_promise.newLocal(state->isolate());
-    return ScriptPromise(state, value);
+    // Return null when the promise is accessed by a different world than the world that created the promise.
+    if (!m_scriptState || !m_scriptState->contextIsValid() || m_scriptState->world().worldId() != state->world().worldId())
+        return ScriptPromise();

[haraken, 2015/06/19 13:46:55]

One idea would be to add an ability to create a null ScriptPromise. Then we
won't need the custom binding.

+    return ScriptPromise(m_scriptState.get(), m_promise.newLocal(m_scriptState->isolate()));
 }
 
 ScriptValue PromiseRejectionEvent::reason(ScriptState* state) const
 {
-    v8::Local<v8::Value> value = m_reason.newLocal(state->isolate());
-    return ScriptValue(state, value);
+    // Return null when the value is accessed by a different world than the world that created the value.
+    if (!m_scriptState || !m_scriptState->contextIsValid() || m_scriptState->world().worldId() != state->world().worldId())
+        return ScriptValue();

[haraken, 2015/06/19 13:46:55]

If we return ScriptValue(v8::Null()), we won't need the custom binding.

That said, bashi@ would know better about this, so I'll defer the decision to
bashi@. Jochen: Feel free to land this CL.

+    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)
 {
     data.GetParameter()->m_reason.clear();
 }
 
 } // namespace blink