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

Side by Side Diff: third_party/WebKit/Source/modules/mediastream/MediaDeviceInfo.cpp

Issue 1571303003: Add JSON serializer to MediaDeviceInfo. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2564
Patch Set: Created 4 years, 11 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) 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 "config.h" 26 #include "config.h"
27 #include "modules/mediastream/MediaDeviceInfo.h" 27 #include "modules/mediastream/MediaDeviceInfo.h"
28 28
29 #include "bindings/core/v8/ScriptState.h"
30 #include "bindings/core/v8/ScriptValue.h"
31 #include "bindings/core/v8/V8ObjectBuilder.h"
29 #include "wtf/text/WTFString.h" 32 #include "wtf/text/WTFString.h"
30 33
31 namespace blink { 34 namespace blink {
32 35
33 MediaDeviceInfo* MediaDeviceInfo::create(const WebMediaDeviceInfo& webMediaDevic eInfo) 36 MediaDeviceInfo* MediaDeviceInfo::create(const WebMediaDeviceInfo& webMediaDevic eInfo)
34 { 37 {
35 ASSERT(!webMediaDeviceInfo.isNull()); 38 ASSERT(!webMediaDeviceInfo.isNull());
36 return new MediaDeviceInfo(webMediaDeviceInfo); 39 return new MediaDeviceInfo(webMediaDeviceInfo);
37 } 40 }
38 41
(...skipping 25 matching lines...) Expand all
64 String MediaDeviceInfo::label() const 67 String MediaDeviceInfo::label() const
65 { 68 {
66 return m_webMediaDeviceInfo.label(); 69 return m_webMediaDeviceInfo.label();
67 } 70 }
68 71
69 String MediaDeviceInfo::groupId() const 72 String MediaDeviceInfo::groupId() const
70 { 73 {
71 return m_webMediaDeviceInfo.groupId(); 74 return m_webMediaDeviceInfo.groupId();
72 } 75 }
73 76
77 ScriptValue MediaDeviceInfo::toJSONForBinding(ScriptState* scriptState)
78 {
79 V8ObjectBuilder result(scriptState);
80 result.addString("deviceId", deviceId());
81 result.addString("kind", kind());
82 result.addString("label", label());
83 result.addString("groupId", groupId());
84 return result.scriptValue();
85 }
86
74 } // namespace blink 87 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698