| 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 17 matching lines...) Expand all Loading... |
| 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 #include "modules/webmidi/NavigatorWebMIDI.h" | 31 #include "modules/webmidi/NavigatorWebMIDI.h" |
| 32 | 32 |
| 33 #include "bindings/core/v8/ScriptPromise.h" | 33 #include "bindings/core/v8/ScriptPromise.h" |
| 34 #include "bindings/core/v8/ScriptPromiseResolver.h" | 34 #include "bindings/core/v8/ScriptPromiseResolver.h" |
| 35 #include "core/dom/DOMException.h" | 35 #include "core/dom/DOMException.h" |
| 36 #include "core/dom/Document.h" | 36 #include "core/dom/Document.h" |
| 37 #include "core/dom/ExecutionContext.h" | 37 #include "core/dom/ExecutionContext.h" |
| 38 #include "core/frame/Deprecation.h" |
| 38 #include "core/frame/LocalFrame.h" | 39 #include "core/frame/LocalFrame.h" |
| 39 #include "core/frame/Navigator.h" | 40 #include "core/frame/Navigator.h" |
| 40 #include "core/frame/UseCounter.h" | 41 #include "core/frame/UseCounter.h" |
| 41 #include "modules/webmidi/MIDIAccessInitializer.h" | 42 #include "modules/webmidi/MIDIAccessInitializer.h" |
| 42 #include "modules/webmidi/MIDIOptions.h" | 43 #include "modules/webmidi/MIDIOptions.h" |
| 44 #include "public/platform/WebFeaturePolicyFeature.h" |
| 43 | 45 |
| 44 namespace blink { | 46 namespace blink { |
| 45 | 47 |
| 46 NavigatorWebMIDI::NavigatorWebMIDI(Navigator& navigator) | 48 NavigatorWebMIDI::NavigatorWebMIDI(Navigator& navigator) |
| 47 : Supplement<Navigator>(navigator) {} | 49 : Supplement<Navigator>(navigator) {} |
| 48 | 50 |
| 49 DEFINE_TRACE(NavigatorWebMIDI) { | 51 DEFINE_TRACE(NavigatorWebMIDI) { |
| 50 Supplement<Navigator>::Trace(visitor); | 52 Supplement<Navigator>::Trace(visitor); |
| 51 } | 53 } |
| 52 | 54 |
| (...skipping 27 matching lines...) Expand all Loading... |
| 80 } | 82 } |
| 81 | 83 |
| 82 Document& document = *ToDocument(ExecutionContext::From(script_state)); | 84 Document& document = *ToDocument(ExecutionContext::From(script_state)); |
| 83 if (options.hasSysex() && options.sysex()) { | 85 if (options.hasSysex() && options.sysex()) { |
| 84 UseCounter::Count(document, WebFeature::kRequestMIDIAccessWithSysExOption); | 86 UseCounter::Count(document, WebFeature::kRequestMIDIAccessWithSysExOption); |
| 85 UseCounter::CountCrossOriginIframe( | 87 UseCounter::CountCrossOriginIframe( |
| 86 document, WebFeature::kRequestMIDIAccessIframeWithSysExOption); | 88 document, WebFeature::kRequestMIDIAccessIframeWithSysExOption); |
| 87 } | 89 } |
| 88 UseCounter::CountCrossOriginIframe(document, | 90 UseCounter::CountCrossOriginIframe(document, |
| 89 WebFeature::kRequestMIDIAccessIframe); | 91 WebFeature::kRequestMIDIAccessIframe); |
| 92 Deprecation::CountDeprecationFeaturePolicy( |
| 93 document, WebFeaturePolicyFeature::kMidiFeature); |
| 94 |
| 90 return MIDIAccessInitializer::Start(script_state, options); | 95 return MIDIAccessInitializer::Start(script_state, options); |
| 91 } | 96 } |
| 92 | 97 |
| 93 } // namespace blink | 98 } // namespace blink |
| OLD | NEW |