Oilpan: cancel MIDI permission request when prefinalizing

Source/modules/webmidi/MIDIAccessInitializer.cpp

 // Copyright 2014 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 "modules/webmidi/MIDIAccessInitializer.h"
 
 #include "bindings/core/v8/ScriptPromise.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "core/dom/DOMError.h"
 #include "core/dom/Document.h"
 #include "core/frame/Navigator.h"
 #include "modules/webmidi/MIDIAccess.h"
 #include "modules/webmidi/MIDIController.h"
 #include "modules/webmidi/MIDIOptions.h"
 #include "modules/webmidi/MIDIPort.h"
 
 namespace blink {
 
 MIDIAccessInitializer::MIDIAccessInitializer(ScriptState* scriptState, const MIDIOptions& options)
     : ScriptPromiseResolver(scriptState)
     , m_requestSysex(false)
 {
     if (options.hasSysex())
         m_requestSysex = options.sysex();
 }
 
 MIDIAccessInitializer::~MIDIAccessInitializer()
 {
-    // It is safe to cancel a request which is already finished or canceld.
+#if !ENABLE(OILPAN)
+    dispose();
+#endif
+}
+
+void MIDIAccessInitializer::dispose()
+{
+    // It is safe to cancel a request which is already finished or cancelled.
     Document* document = toDocument(executionContext());
     ASSERT(document);
-    MIDIController* controller = MIDIController::from(document->frame());
-    if (controller)
+    if (MIDIController* controller = MIDIController::from(document->frame()))
         controller->cancelSysexPermissionRequest(this);
 }
 
 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);
-    MIDIController* controller = MIDIController::from(document->frame());
-    if (controller) {
+    if (MIDIController* controller = MIDIController::from(document->frame()))
         controller->requestSysexPermission(this);
-    } else {
+    else
         reject(DOMError::create("SecurityError"));
-    }
+
     return promise;
 }
 
 void MIDIAccessInitializer::didAddInputPort(const String& id, const String& manufacturer, const String& name, const String& version, bool isActive)
 {
     ASSERT(m_accessor);
     m_portDescriptors.append(PortDescriptor(id, manufacturer, name, MIDIPort::MIDIPortTypeInput, version, isActive));
 }
 
 void MIDIAccessInitializer::didAddOutputPort(const String& id, const String& manufacturer, const String& name, const String& version, bool isActive)
@@ skipping 38 matching lines @@
 {
     return executionContext()->securityOrigin();
 }
 
 ExecutionContext* MIDIAccessInitializer::executionContext() const
 {
     return scriptState()->executionContext();
 }
 
 } // namespace blink