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

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

Issue 547383004: WebMIDI: Add MIDIOptions dictionary (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 6 years, 3 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 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 NavigatorWebMIDI& NavigatorWebMIDI::from(Navigator& navigator) 59 NavigatorWebMIDI& NavigatorWebMIDI::from(Navigator& navigator)
60 { 60 {
61 NavigatorWebMIDI* supplement = static_cast<NavigatorWebMIDI*>(WillBeHeapSupp lement<Navigator>::from(navigator, supplementName())); 61 NavigatorWebMIDI* supplement = static_cast<NavigatorWebMIDI*>(WillBeHeapSupp lement<Navigator>::from(navigator, supplementName()));
62 if (!supplement) { 62 if (!supplement) {
63 supplement = new NavigatorWebMIDI(navigator.frame()); 63 supplement = new NavigatorWebMIDI(navigator.frame());
64 provideTo(navigator, supplementName(), adoptPtrWillBeNoop(supplement)); 64 provideTo(navigator, supplementName(), adoptPtrWillBeNoop(supplement));
65 } 65 }
66 return *supplement; 66 return *supplement;
67 } 67 }
68 68
69 ScriptPromise NavigatorWebMIDI::requestMIDIAccess(ScriptState* scriptState, Navi gator& navigator, const Dictionary& options) 69 ScriptPromise NavigatorWebMIDI::requestMIDIAccess(ScriptState* scriptState, Navi gator& navigator, const MIDIOptions* options)
70 { 70 {
71 return NavigatorWebMIDI::from(navigator).requestMIDIAccess(scriptState, opti ons); 71 return NavigatorWebMIDI::from(navigator).requestMIDIAccess(scriptState, opti ons);
72 } 72 }
73 73
74 ScriptPromise NavigatorWebMIDI::requestMIDIAccess(ScriptState* scriptState, cons t Dictionary& options) 74 ScriptPromise NavigatorWebMIDI::requestMIDIAccess(ScriptState* scriptState, cons t MIDIOptions* options)
75 { 75 {
76 if (!frame() || frame()->document()->activeDOMObjectsAreStopped()) { 76 if (!frame() || frame()->document()->activeDOMObjectsAreStopped()) {
77 RefPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(s criptState); 77 RefPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(s criptState);
78 ScriptPromise promise = resolver->promise(); 78 ScriptPromise promise = resolver->promise();
79 // FIXME: Currently this rejection does not work because the context is stopped. 79 // FIXME: Currently this rejection does not work because the context is stopped.
80 resolver->reject(DOMError::create("AbortError")); 80 resolver->reject(DOMError::create("AbortError"));
81 return promise; 81 return promise;
82 } 82 }
83 83
84 return MIDIAccessInitializer::start(scriptState, MIDIOptions(options)); 84 return MIDIAccessInitializer::start(scriptState, options);
85 } 85 }
86 86
87 } // namespace blink 87 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698