| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2014 Google Inc. All rights reserved. | 2 * Copyright (C) 2014 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 | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 11 matching lines...) Expand all Loading... |
| 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 24 */ | 24 */ |
| 25 | 25 |
| 26 #include "modules/mediastream/MediaDevicesRequest.h" | 26 #include "modules/mediastream/MediaDevicesRequest.h" |
| 27 | 27 |
| 28 #include "bindings/core/v8/ScriptPromiseResolver.h" | 28 #include "bindings/core/v8/ScriptPromiseResolver.h" |
| 29 #include "bindings/core/v8/ScriptState.h" | 29 #include "bindings/core/v8/ScriptState.h" |
| 30 #include "core/dom/DOMException.h" | 30 #include "core/dom/DOMException.h" |
| 31 #include "core/dom/Document.h" | 31 #include "core/dom/Document.h" |
| 32 #include "core/dom/ExceptionCode.h" | |
| 33 #include "modules/mediastream/UserMediaController.h" | 32 #include "modules/mediastream/UserMediaController.h" |
| 34 | 33 |
| 35 namespace blink { | 34 namespace blink { |
| 36 | 35 |
| 37 MediaDevicesRequest* MediaDevicesRequest::create(ScriptState* state, UserMediaCo
ntroller* controller) | 36 MediaDevicesRequest* MediaDevicesRequest::create(ScriptState* state, UserMediaCo
ntroller* controller) |
| 38 { | 37 { |
| 39 MediaDevicesRequest* request = new MediaDevicesRequest(state, controller); | 38 MediaDevicesRequest* request = new MediaDevicesRequest(state, controller); |
| 40 request->suspendIfNeeded(); | 39 request->suspendIfNeeded(); |
| 41 return request; | 40 return request; |
| 42 } | 41 } |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 84 } | 83 } |
| 85 | 84 |
| 86 DEFINE_TRACE(MediaDevicesRequest) | 85 DEFINE_TRACE(MediaDevicesRequest) |
| 87 { | 86 { |
| 88 visitor->trace(m_controller); | 87 visitor->trace(m_controller); |
| 89 visitor->trace(m_resolver); | 88 visitor->trace(m_resolver); |
| 90 ActiveDOMObject::trace(visitor); | 89 ActiveDOMObject::trace(visitor); |
| 91 } | 90 } |
| 92 | 91 |
| 93 } // namespace blink | 92 } // namespace blink |
| OLD | NEW |