| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 20 matching lines...) Expand all Loading... |
| 31 #include "config.h" | 31 #include "config.h" |
| 32 #include "modules/webmidi/MIDIAccess.h" | 32 #include "modules/webmidi/MIDIAccess.h" |
| 33 | 33 |
| 34 #include "core/dom/DOMError.h" | 34 #include "core/dom/DOMError.h" |
| 35 #include "core/dom/Document.h" | 35 #include "core/dom/Document.h" |
| 36 #include "core/loader/DocumentLoadTiming.h" | 36 #include "core/loader/DocumentLoadTiming.h" |
| 37 #include "core/loader/DocumentLoader.h" | 37 #include "core/loader/DocumentLoader.h" |
| 38 #include "modules/webmidi/MIDIAccessPromise.h" | 38 #include "modules/webmidi/MIDIAccessPromise.h" |
| 39 #include "modules/webmidi/MIDIConnectionEvent.h" | 39 #include "modules/webmidi/MIDIConnectionEvent.h" |
| 40 #include "modules/webmidi/MIDIController.h" | 40 #include "modules/webmidi/MIDIController.h" |
| 41 #include "modules/webmidi/MIDIInput.h" | |
| 42 #include "modules/webmidi/MIDIOutput.h" | |
| 43 #include "modules/webmidi/MIDIPort.h" | 41 #include "modules/webmidi/MIDIPort.h" |
| 44 | 42 |
| 45 namespace WebCore { | 43 namespace WebCore { |
| 46 | 44 |
| 47 PassRefPtr<MIDIAccess> MIDIAccess::create(ExecutionContext* context, MIDIAccessP
romise* promise) | 45 PassRefPtr<MIDIAccess> MIDIAccess::create(ExecutionContext* context, MIDIAccessP
romise* promise) |
| 48 { | 46 { |
| 49 RefPtr<MIDIAccess> midiAccess(adoptRef(new MIDIAccess(context, promise))); | 47 RefPtr<MIDIAccess> midiAccess(adoptRef(new MIDIAccess(context, promise))); |
| 50 midiAccess->suspendIfNeeded(); | 48 midiAccess->suspendIfNeeded(); |
| 51 midiAccess->startRequest(); | 49 midiAccess->startRequest(); |
| 52 return midiAccess.release(); | 50 return midiAccess.release(); |
| (...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 177 | 175 |
| 178 void MIDIAccess::permissionDenied() | 176 void MIDIAccess::permissionDenied() |
| 179 { | 177 { |
| 180 ASSERT(isMainThread()); | 178 ASSERT(isMainThread()); |
| 181 | 179 |
| 182 m_hasAccess = false; | 180 m_hasAccess = false; |
| 183 m_promise->reject(DOMError::create("SecurityError")); | 181 m_promise->reject(DOMError::create("SecurityError")); |
| 184 } | 182 } |
| 185 | 183 |
| 186 } // namespace WebCore | 184 } // namespace WebCore |
| OLD | NEW |