Fulfill or reject MIDIAccessPromise from MIDIAccessor

Source/modules/webmidi/MIDIAccessPromise.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 23 matching lines @@
 #include "core/dom/DOMError.h"
 #include "modules/webmidi/MIDIAccess.h"
 #include "modules/webmidi/MIDIErrorCallback.h"
 #include "modules/webmidi/MIDISuccessCallback.h"
 
 namespace WebCore {
 
 PassRefPtr<MIDIAccessPromise> MIDIAccessPromise::create(ScriptExecutionContext* context, const Dictionary& options)
 {
     RefPtr<MIDIAccessPromise> midiAccessPromise(adoptRef(new MIDIAccessPromise(context, options)));
-    midiAccessPromise->setPendingActivity(midiAccessPromise.get());
     midiAccessPromise->suspendIfNeeded();
     return midiAccessPromise.release();
 }
 
 MIDIAccessPromise::MIDIAccessPromise(ScriptExecutionContext* context, const Dictionary& options)
     : ActiveDOMObject(context)
     , m_state(Pending)
     , m_options(adoptPtr(new MIDIOptions(options)))
-    , m_access(MIDIAccess::create(context, this))
 {
     ScriptWrappable::init(this);
 }
 
 MIDIAccessPromise::~MIDIAccessPromise()
 {
     stop();
 }
 
 void MIDIAccessPromise::fulfill()
 {
     if (m_state == Pending) {
         if (m_successCallback) {
             m_state = Invoked;
+            ASSERT(m_access.get());
             m_successCallback->handleEvent(m_access.release().leakRef(), m_options->sysexEnabled);
             m_options.clear();
         } else {
             m_state = Accepted;
         }
         unsetPendingActivity(this);
     }
     m_successCallback.clear();
     m_errorCallback.clear();
 }
 
-void MIDIAccessPromise::reject(DOMError* error)
+void MIDIAccessPromise::reject(PassRefPtr<DOMError> error)
 {
     if (m_state == Pending) {
         if (m_errorCallback) {
             m_state = Invoked;
-            m_errorCallback->handleEvent(error);
+            m_errorCallback->handleEvent(error.leakRef());
         } else {
             m_state = Rejected;
-            m_error = adoptRef(error);
+            m_error = error;
         }
         unsetPendingActivity(this);
     }
     m_successCallback.clear();
     m_errorCallback.clear();
 }
 
 void MIDIAccessPromise::then(PassRefPtr<MIDISuccessCallback> successCallback, PassRefPtr<MIDIErrorCallback> errorCallback)
 {
+    // Lazily request access.
+    if (!m_access) {
+        setPendingActivity(this);
+        m_access = MIDIAccess::create(scriptExecutionContext(), this);
+    }
+
     switch (m_state) {
     case Accepted:
         successCallback->handleEvent(m_access.release().leakRef(), m_options->sysexEnabled);
         m_options.clear();
         m_state = Invoked;
         break;
     case Rejected:
         errorCallback->handleEvent(m_error.release().leakRef());
         m_state = Invoked;
         break;
     case Pending:
         m_successCallback = successCallback;
         m_errorCallback = errorCallback;
         break;
     case Invoked:
         break;
     default:
         ASSERT_NOT_REACHED();
     }
 }
 
 } // namespace WebCore