Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / modules / webmidi / NavigatorWebMIDI.cpp

diff --git a/src/third_party/WebKit/Source/modules/webmidi/NavigatorWebMIDI.cpp b/src/third_party/WebKit/Source/modules/webmidi/NavigatorWebMIDI.cpp
index 278986b..d12cb50 100644 (file)
--- a/src/third_party/WebKit/Source/modules/webmidi/NavigatorWebMIDI.cpp
+++ b/src/third_party/WebKit/Source/modules/webmidi/NavigatorWebMIDI.cpp
@@ -66,15 +66,15 @@ NavigatorWebMIDI& NavigatorWebMIDI::from(Navigator& navigator)
     return *supplement;
 }
 
-ScriptPromise NavigatorWebMIDI::requestMIDIAccess(Navigator& navigator, const Dictionary& options)
+ScriptPromise NavigatorWebMIDI::requestMIDIAccess(ScriptState* scriptState, Navigator& navigator, const Dictionary& options)
 {
-    return NavigatorWebMIDI::from(navigator).requestMIDIAccess(options);
+    return NavigatorWebMIDI::from(navigator).requestMIDIAccess(scriptState, options);
 }
 
-ScriptPromise NavigatorWebMIDI::requestMIDIAccess(const Dictionary& options)
+ScriptPromise NavigatorWebMIDI::requestMIDIAccess(ScriptState* scriptState, const Dictionary& options)
 {
-    if (!frame()) {
-        RefPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(v8::Isolate::GetCurrent());
+    if (!frame() || frame()->document()->activeDOMObjectsAreStopped()) {
+        RefPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scriptState);
         ScriptPromise promise = resolver->promise();
         // FIXME: Currently this rejection does not work because the context is stopped.
         resolver->reject(DOMError::create("AbortError"));