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

Side by Side Diff: third_party/WebKit/Source/platform/mediastream/MediaStreamCenter.cpp

Issue 2547053003: s/ passed(...) / WTF::passed(...) / to avoid future ambiguity w/ base::Passed. (Closed)
Patch Set: Rebasing... Created 4 years 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) 2011 Ericsson AB. All rights reserved. 2 * Copyright (C) 2011 Ericsson AB. All rights reserved.
3 * Copyright (C) 2012 Google Inc. All rights reserved. 3 * Copyright (C) 2012 Google Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 8 *
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 namespace blink { 45 namespace blink {
46 46
47 MediaStreamCenter& MediaStreamCenter::instance() { 47 MediaStreamCenter& MediaStreamCenter::instance() {
48 ASSERT(isMainThread()); 48 ASSERT(isMainThread());
49 DEFINE_STATIC_LOCAL(MediaStreamCenter, center, ()); 49 DEFINE_STATIC_LOCAL(MediaStreamCenter, center, ());
50 return center; 50 return center;
51 } 51 }
52 52
53 MediaStreamCenter::MediaStreamCenter() 53 MediaStreamCenter::MediaStreamCenter()
54 : m_private( 54 : m_private(
55 wrapUnique(Platform::current()->createMediaStreamCenter(this))) {} 55 WTF::wrapUnique(Platform::current()->createMediaStreamCenter(this))) {
56 }
56 57
57 MediaStreamCenter::~MediaStreamCenter() {} 58 MediaStreamCenter::~MediaStreamCenter() {}
58 59
59 void MediaStreamCenter::didSetMediaStreamTrackEnabled( 60 void MediaStreamCenter::didSetMediaStreamTrackEnabled(
60 MediaStreamComponent* component) { 61 MediaStreamComponent* component) {
61 if (m_private) { 62 if (m_private) {
62 if (component->enabled()) { 63 if (component->enabled()) {
63 m_private->didEnableMediaStreamTrack(component); 64 m_private->didEnableMediaStreamTrack(component);
64 } else { 65 } else {
65 m_private->didDisableMediaStreamTrack(component); 66 m_private->didDisableMediaStreamTrack(component);
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 113
113 void MediaStreamCenter::didCreateMediaStreamTrack(MediaStreamComponent* track) { 114 void MediaStreamCenter::didCreateMediaStreamTrack(MediaStreamComponent* track) {
114 if (m_private) 115 if (m_private)
115 m_private->didCreateMediaStreamTrack(track); 116 m_private->didCreateMediaStreamTrack(track);
116 } 117 }
117 118
118 std::unique_ptr<AudioSourceProvider> 119 std::unique_ptr<AudioSourceProvider>
119 MediaStreamCenter::createWebAudioSourceFromMediaStreamTrack( 120 MediaStreamCenter::createWebAudioSourceFromMediaStreamTrack(
120 MediaStreamComponent* track) { 121 MediaStreamComponent* track) {
121 DCHECK(track); 122 DCHECK(track);
122 if (m_private) 123 if (m_private) {
123 return MediaStreamWebAudioSource::create( 124 return MediaStreamWebAudioSource::create(WTF::wrapUnique(
124 wrapUnique(m_private->createWebAudioSourceFromMediaStreamTrack(track))); 125 m_private->createWebAudioSourceFromMediaStreamTrack(track)));
126 }
125 127
126 return nullptr; 128 return nullptr;
127 } 129 }
128 130
129 void MediaStreamCenter::stopLocalMediaStream(const WebMediaStream& webStream) { 131 void MediaStreamCenter::stopLocalMediaStream(const WebMediaStream& webStream) {
130 MediaStreamDescriptor* stream = webStream; 132 MediaStreamDescriptor* stream = webStream;
131 MediaStreamDescriptorClient* client = stream->client(); 133 MediaStreamDescriptorClient* client = stream->client();
132 if (client) 134 if (client)
133 client->streamEnded(); 135 client->streamEnded();
134 } 136 }
135 137
136 } // namespace blink 138 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698