| Index: Source/modules/webmidi/MIDIAccessFuture.cpp
|
| diff --git a/Source/modules/webmidi/MIDIAccess.cpp b/Source/modules/webmidi/MIDIAccessFuture.cpp
|
| similarity index 72%
|
| copy from Source/modules/webmidi/MIDIAccess.cpp
|
| copy to Source/modules/webmidi/MIDIAccessFuture.cpp
|
| index 04b563d35778659d28ad6a5de5e14d9febd7eeb0..a28b916f677353aba93c95acc71fe7a4e51d3dce 100644
|
| --- a/Source/modules/webmidi/MIDIAccess.cpp
|
| +++ b/Source/modules/webmidi/MIDIAccessFuture.cpp
|
| @@ -30,31 +30,30 @@
|
|
|
| #include "config.h"
|
| #include "modules/webmidi/MIDIAccess.h"
|
| -
|
| -#include "core/dom/ExceptionCode.h"
|
| -#include "modules/webmidi/MIDIConnectionEvent.h"
|
| -#include "modules/webmidi/MIDIInput.h"
|
| -#include "modules/webmidi/MIDIOutput.h"
|
| -#include "modules/webmidi/MIDIPort.h"
|
| +#include "modules/webmidi/MIDIAccessFuture.h"
|
| +#include "modules/webmidi/MIDIErrorCallback.h"
|
| +#include "modules/webmidi/MIDISuccessCallback.h"
|
|
|
| namespace WebCore {
|
|
|
| -PassRefPtr<MIDIAccess> MIDIAccess::create(ScriptExecutionContext* context)
|
| +PassRefPtr<MIDIAccessFuture> MIDIAccessFuture::create(ScriptExecutionContext* context)
|
| {
|
| - RefPtr<MIDIAccess> midiAccess(adoptRef(new MIDIAccess(context)));
|
| - midiAccess->suspendIfNeeded();
|
| - return midiAccess.release();
|
| + return adoptRef(new MIDIAccessFuture(context));
|
| }
|
|
|
| -MIDIAccess::~MIDIAccess()
|
| +MIDIAccessFuture::MIDIAccessFuture(ScriptExecutionContext* context)
|
| + : m_context(context)
|
| {
|
| - stop();
|
| + ScriptWrappable::init(this);
|
| }
|
|
|
| -MIDIAccess::MIDIAccess(ScriptExecutionContext* context)
|
| - : ActiveDOMObject(context)
|
| +void MIDIAccessFuture::done(PassRefPtr<MIDISuccessCallback> successCallback, PassRefPtr<MIDIErrorCallback> errorCallback)
|
| {
|
| - ScriptWrappable::init(this);
|
| + RefPtr<MIDIAccess> access = MIDIAccess::create(m_context);
|
| +
|
| + successCallback->handleEvent(access.get());
|
| +
|
| + printf("MIDIAccessFuture::done!!!\n");
|
| }
|
|
|
| } // namespace WebCore
|
|
|