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

Side by Side Diff: Source/modules/mediastream/SourceInfo.cpp

Issue 15796004: [MediaStream API] Adding MediaStreamTrack::getSourceInfos (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fixed review comments and merge Created 7 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « Source/modules/mediastream/SourceInfo.h ('k') | Source/modules/mediastream/SourceInfo.idl » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 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/RTCDTMFToneChangeEvent.h" 27 #include "modules/mediastream/SourceInfo.h"
28 28
29 #include "core/dom/EventNames.h" 29 #include "wtf/text/WTFString.h"
30 30
31 namespace WebCore { 31 namespace WebCore {
32 32
33 PassRefPtr<RTCDTMFToneChangeEvent> RTCDTMFToneChangeEvent::create() 33 PassRefPtr<SourceInfo> SourceInfo::create(const WebKit::WebSourceInfo& webSource Info)
34 { 34 {
35 return adoptRef(new RTCDTMFToneChangeEvent); 35 ASSERT(!webSourceInfo.isNull());
36 return adoptRef(new SourceInfo(webSourceInfo));
36 } 37 }
37 38
38 PassRefPtr<RTCDTMFToneChangeEvent> RTCDTMFToneChangeEvent::create(const String& tone) 39 SourceInfo::SourceInfo(const WebKit::WebSourceInfo& webSourceInfo)
39 { 40 : m_webSourceInfo(webSourceInfo)
40 return adoptRef(new RTCDTMFToneChangeEvent(tone));
41 }
42
43 PassRefPtr<RTCDTMFToneChangeEvent> RTCDTMFToneChangeEvent::create(const AtomicSt ring& type, const RTCDTMFToneChangeEventInit& initializer)
44 {
45 ASSERT(type == eventNames().tonechangeEvent);
46 return adoptRef(new RTCDTMFToneChangeEvent(initializer));
47 }
48
49 RTCDTMFToneChangeEvent::RTCDTMFToneChangeEvent()
50 { 41 {
51 ScriptWrappable::init(this); 42 ScriptWrappable::init(this);
52 } 43 }
53 44
54 RTCDTMFToneChangeEvent::RTCDTMFToneChangeEvent(const String& tone) 45 String SourceInfo::id() const
55 : Event(eventNames().tonechangeEvent, false, false)
56 , m_tone(tone)
57 { 46 {
58 ScriptWrappable::init(this); 47 return m_webSourceInfo.id();
59 } 48 }
60 49
61 RTCDTMFToneChangeEvent::RTCDTMFToneChangeEvent(const RTCDTMFToneChangeEventInit& initializer) 50 String SourceInfo::kind() const
62 : Event(eventNames().tonechangeEvent, initializer)
63 , m_tone(initializer.tone)
64 { 51 {
65 ScriptWrappable::init(this); 52 switch (m_webSourceInfo.kind()) {
53 case WebKit::WebSourceInfo::SourceKindAudio:
54 return ASCIILiteral("audio");
55 case WebKit::WebSourceInfo::SourceKindVideo:
56 return ASCIILiteral("video");
57 case WebKit::WebSourceInfo::SourceKindNone:
58 return ASCIILiteral("none");
59 }
60
61 ASSERT_NOT_REACHED();
62 return String();
66 } 63 }
67 64
68 RTCDTMFToneChangeEvent::~RTCDTMFToneChangeEvent() 65 String SourceInfo::label() const
69 { 66 {
67 return m_webSourceInfo.label();
70 } 68 }
71 69
72 const String& RTCDTMFToneChangeEvent::tone() const 70 String SourceInfo::facing() const
73 { 71 {
74 return m_tone; 72 switch (m_webSourceInfo.facing()) {
75 } 73 case WebKit::WebSourceInfo::VideoFacingModeNone:
74 return String();
75 case WebKit::WebSourceInfo::VideoFacingModeUser:
76 return ASCIILiteral("user");
77 case WebKit::WebSourceInfo::VideoFacingModeEnvironment:
78 return ASCIILiteral("environment");
79 }
76 80
77 const AtomicString& RTCDTMFToneChangeEvent::interfaceName() const 81 ASSERT_NOT_REACHED();
78 { 82 return String();
79 return eventNames().interfaceForRTCDTMFToneChangeEvent;
80 } 83 }
81 84
82 } // namespace WebCore 85 } // namespace WebCore
83
OLDNEW
« no previous file with comments | « Source/modules/mediastream/SourceInfo.h ('k') | Source/modules/mediastream/SourceInfo.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698