Web MIDI: Ask permissions of the content layer always

third_party/WebKit/Source/modules/webmidi/MIDIAccessInitializer.cpp

Index: third_party/WebKit/Source/modules/webmidi/MIDIAccessInitializer.cpp
diff --git a/third_party/WebKit/Source/modules/webmidi/MIDIAccessInitializer.cpp b/third_party/WebKit/Source/modules/webmidi/MIDIAccessInitializer.cpp
index 343c9baec8ff30985e49ab2921f5bcf034fd07c7..9483d948ac5709ed1c453796c33f5216a3491476 100644
--- a/third_party/WebKit/Source/modules/webmidi/MIDIAccessInitializer.cpp
+++ b/third_party/WebKit/Source/modules/webmidi/MIDIAccessInitializer.cpp
@@ -21,12 +21,10 @@ using PortState = WebMIDIAccessorClient::MIDIPortState;
 
 MIDIAccessInitializer::MIDIAccessInitializer(ScriptState* scriptState, const MIDIOptions& options)
     : ScriptPromiseResolver(scriptState)
-    , m_requestSysex(false)
+    , m_options(options)
     , m_hasBeenDisposed(false)
-    , m_sysexPermissionResolved(false)
+    , m_permissionResolved(false)
 {
-    if (options.hasSysex())
-        m_requestSysex = options.sysex();
 }
 
 MIDIAccessInitializer::~MIDIAccessInitializer()
@@ -48,12 +46,12 @@ void MIDIAccessInitializer::dispose()
     if (!executionContext())
         return;
 
-    if (!m_sysexPermissionResolved) {
+    if (!m_permissionResolved) {
         Document* document = toDocument(executionContext());
         ASSERT(document);
         if (MIDIController* controller = MIDIController::from(document->frame()))
-            controller->cancelSysexPermissionRequest(this);
-        m_sysexPermissionResolved = true;
+            controller->cancelPermissionRequest(this);
+        m_permissionResolved = true;
     }
 
     m_hasBeenDisposed = true;
@@ -64,14 +62,10 @@ ScriptPromise MIDIAccessInitializer::start()
     ScriptPromise promise = this->promise();
     m_accessor = MIDIAccessor::create(this);
 
-    if (!m_requestSysex) {
-        m_accessor->startSession();
-        return promise;
-    }
     Document* document = toDocument(executionContext());
     ASSERT(document);
     if (MIDIController* controller = MIDIController::from(document->frame()))
-        controller->requestSysexPermission(this);
+        controller->requestPermission(this, m_options);
     else
         reject(DOMException::create(SecurityError));
 
@@ -108,7 +102,7 @@ void MIDIAccessInitializer::didStartSession(bool success, const String& error, c
 {
     ASSERT(m_accessor);
     if (success) {
-        resolve(MIDIAccess::create(m_accessor.release(), m_requestSysex, m_portDescriptors, executionContext()));
+        resolve(MIDIAccess::create(m_accessor.release(), m_options.hasSysex(), m_portDescriptors, executionContext()));
     } else {
         // The spec says the name is one of
         //  - SecurityError
@@ -131,9 +125,9 @@ void MIDIAccessInitializer::didStartSession(bool success, const String& error, c
     }
 }
 
-void MIDIAccessInitializer::resolveSysexPermission(bool allowed)
+void MIDIAccessInitializer::resolvePermission(bool allowed)
 {
-    m_sysexPermissionResolved = true;
+    m_permissionResolved = true;
     if (allowed)
         m_accessor->startSession();
     else