| 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 |
| 11 * documentation and/or other materials provided with the distribution. | 11 * documentation and/or other materials provided with the distribution. |
| 12 * | 12 * |
| 13 * THIS SOFTWARE IS PROVIDED BY GOOGLE INC. ``AS IS'' AND ANY | 13 * THIS SOFTWARE IS PROVIDED BY GOOGLE INC. ``AS IS'' AND ANY |
| 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
| 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
| 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GOOGLE INC. OR | 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GOOGLE INC. OR |
| 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, |
| 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |
| 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR |
| 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY | 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY |
| 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 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/MediaDeviceInfo.h" | 26 #include "modules/mediastream/MediaDeviceInfo.h" |
| 27 | 27 |
| 28 #include "bindings/core/v8/ScriptState.h" | |
| 29 #include "bindings/core/v8/ScriptValue.h" | 28 #include "bindings/core/v8/ScriptValue.h" |
| 30 #include "bindings/core/v8/V8ObjectBuilder.h" | 29 #include "bindings/core/v8/V8ObjectBuilder.h" |
| 30 #include "platform/bindings/ScriptState.h" |
| 31 #include "platform/wtf/text/WTFString.h" | 31 #include "platform/wtf/text/WTFString.h" |
| 32 | 32 |
| 33 namespace blink { | 33 namespace blink { |
| 34 | 34 |
| 35 MediaDeviceInfo* MediaDeviceInfo::Create( | 35 MediaDeviceInfo* MediaDeviceInfo::Create( |
| 36 const WebMediaDeviceInfo& web_media_device_info) { | 36 const WebMediaDeviceInfo& web_media_device_info) { |
| 37 DCHECK(!web_media_device_info.IsNull()); | 37 DCHECK(!web_media_device_info.IsNull()); |
| 38 return new MediaDeviceInfo(web_media_device_info); | 38 return new MediaDeviceInfo(web_media_device_info); |
| 39 } | 39 } |
| 40 | 40 |
| (...skipping 30 matching lines...) Expand all Loading... |
| 71 ScriptValue MediaDeviceInfo::toJSONForBinding(ScriptState* script_state) { | 71 ScriptValue MediaDeviceInfo::toJSONForBinding(ScriptState* script_state) { |
| 72 V8ObjectBuilder result(script_state); | 72 V8ObjectBuilder result(script_state); |
| 73 result.AddString("deviceId", deviceId()); | 73 result.AddString("deviceId", deviceId()); |
| 74 result.AddString("kind", kind()); | 74 result.AddString("kind", kind()); |
| 75 result.AddString("label", label()); | 75 result.AddString("label", label()); |
| 76 result.AddString("groupId", groupId()); | 76 result.AddString("groupId", groupId()); |
| 77 return result.GetScriptValue(); | 77 return result.GetScriptValue(); |
| 78 } | 78 } |
| 79 | 79 |
| 80 } // namespace blink | 80 } // namespace blink |
| OLD | NEW |