Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8)

Side by Side Diff: Source/modules/webmidi/NavigatorWebMIDI.h

Issue 207583005: Revert of Make WebMIDI use blink Promise. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 13 matching lines...) Expand all
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #ifndef NavigatorWebMIDI_h 31 #ifndef NavigatorWebMIDI_h
32 #define NavigatorWebMIDI_h 32 #define NavigatorWebMIDI_h
33 33
34 #include "bindings/v8/ScriptPromise.h"
35 #include "core/frame/DOMWindowProperty.h" 34 #include "core/frame/DOMWindowProperty.h"
36 #include "heap/Handle.h" 35 #include "heap/Handle.h"
37 #include "modules/webmidi/MIDIOptions.h" 36 #include "modules/webmidi/MIDIOptions.h"
38 #include "platform/Supplementable.h" 37 #include "platform/Supplementable.h"
39 38
40 namespace WebCore { 39 namespace WebCore {
41 40
41 class MIDIAccessPromise;
42 class Navigator; 42 class Navigator;
43 43
44 class NavigatorWebMIDI FINAL : public NoBaseWillBeGarbageCollectedFinalized<Navi gatorWebMIDI>, public WillBeHeapSupplement<Navigator>, public DOMWindowProperty { 44 class NavigatorWebMIDI FINAL : public NoBaseWillBeGarbageCollectedFinalized<Navi gatorWebMIDI>, public WillBeHeapSupplement<Navigator>, public DOMWindowProperty {
45 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(NavigatorWebMIDI); 45 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(NavigatorWebMIDI);
46 public: 46 public:
47 virtual ~NavigatorWebMIDI(); 47 virtual ~NavigatorWebMIDI();
48 static NavigatorWebMIDI& from(Navigator&); 48 static NavigatorWebMIDI& from(Navigator&);
49 49
50 static ScriptPromise requestMIDIAccess(Navigator&, const Dictionary&); 50 static PassRefPtrWillBeRawPtr<MIDIAccessPromise> requestMIDIAccess(Navigator &, const Dictionary&);
51 ScriptPromise requestMIDIAccess(const Dictionary&); 51 PassRefPtrWillBeRawPtr<MIDIAccessPromise> requestMIDIAccess(const Dictionary &);
52 52
53 void trace(Visitor*) { } 53 void trace(Visitor*) { }
54 54
55 private: 55 private:
56 NavigatorWebMIDI(LocalFrame*); 56 NavigatorWebMIDI(LocalFrame*);
57 static const char* supplementName(); 57 static const char* supplementName();
58 }; 58 };
59 59
60 } // namespace WebCore 60 } // namespace WebCore
61 61
62 #endif // NavigatorWebMIDI_h 62 #endif // NavigatorWebMIDI_h
OLDNEW
« no previous file with comments | « Source/modules/webmidi/MIDIAccessPromise.idl ('k') | Source/modules/webmidi/NavigatorWebMIDI.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698