OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "config.h" | 5 #include "config.h" |
6 #include "modules/webmidi/MIDIAccessInitializer.h" | 6 #include "modules/webmidi/MIDIAccessInitializer.h" |
7 | 7 |
8 #include "bindings/core/v8/ScriptPromise.h" | 8 #include "bindings/core/v8/ScriptPromise.h" |
9 #include "bindings/core/v8/ScriptPromiseResolver.h" | 9 #include "bindings/core/v8/ScriptPromiseResolver.h" |
10 #include "core/dom/DOMError.h" | 10 #include "core/dom/DOMError.h" |
11 #include "core/dom/Document.h" | 11 #include "core/dom/Document.h" |
12 #include "core/frame/Navigator.h" | 12 #include "core/frame/Navigator.h" |
13 #include "modules/webmidi/MIDIAccess.h" | 13 #include "modules/webmidi/MIDIAccess.h" |
14 #include "modules/webmidi/MIDIController.h" | 14 #include "modules/webmidi/MIDIController.h" |
15 #include "modules/webmidi/MIDIOptions.h" | 15 #include "modules/webmidi/MIDIOptions.h" |
16 #include "modules/webmidi/MIDIPort.h" | 16 #include "modules/webmidi/MIDIPort.h" |
17 | 17 |
18 namespace blink { | 18 namespace blink { |
19 | 19 |
20 MIDIAccessInitializer::MIDIAccessInitializer(ScriptState* scriptState, const MID
IOptions& options) | 20 MIDIAccessInitializer::MIDIAccessInitializer(ScriptState* scriptState, const MID
IOptions& options) |
21 : ScriptPromiseResolver(scriptState) | 21 : ScriptPromiseResolver(scriptState) |
22 , m_requestSysex(false) | 22 , m_requestSysex(false) |
23 { | 23 { |
| 24 #if ENABLE(OILPAN) |
| 25 ThreadState::current()->registerPreFinalizer(*this); |
| 26 #endif |
24 if (options.hasSysex()) | 27 if (options.hasSysex()) |
25 m_requestSysex = options.sysex(); | 28 m_requestSysex = options.sysex(); |
26 } | 29 } |
27 | 30 |
28 MIDIAccessInitializer::~MIDIAccessInitializer() | 31 MIDIAccessInitializer::~MIDIAccessInitializer() |
29 { | 32 { |
30 #if !ENABLE(OILPAN) | 33 #if !ENABLE(OILPAN) |
31 dispose(); | 34 dispose(); |
32 #endif | 35 #endif |
33 } | 36 } |
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
108 { | 111 { |
109 return executionContext()->securityOrigin(); | 112 return executionContext()->securityOrigin(); |
110 } | 113 } |
111 | 114 |
112 ExecutionContext* MIDIAccessInitializer::executionContext() const | 115 ExecutionContext* MIDIAccessInitializer::executionContext() const |
113 { | 116 { |
114 return scriptState()->executionContext(); | 117 return scriptState()->executionContext(); |
115 } | 118 } |
116 | 119 |
117 } // namespace blink | 120 } // namespace blink |
OLD | NEW |