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

Side by Side Diff: third_party/WebKit/Source/platform/exported/WebMediaStreamSource.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 Google Inc. All rights reserved. 2 * Copyright (C) 2011 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 are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 return static_cast<ExtraDataContainer*>(data)->getExtraData(); 140 return static_cast<ExtraDataContainer*>(data)->getExtraData();
141 } 141 }
142 142
143 void WebMediaStreamSource::setExtraData(ExtraData* extraData) { 143 void WebMediaStreamSource::setExtraData(ExtraData* extraData) {
144 ASSERT(!m_private.isNull()); 144 ASSERT(!m_private.isNull());
145 145
146 if (extraData) 146 if (extraData)
147 extraData->setOwner(m_private.get()); 147 extraData->setOwner(m_private.get());
148 148
149 m_private->setExtraData( 149 m_private->setExtraData(
150 wrapUnique(new ExtraDataContainer(wrapUnique(extraData)))); 150 WTF::wrapUnique(new ExtraDataContainer(WTF::wrapUnique(extraData))));
151 } 151 }
152 152
153 WebMediaConstraints WebMediaStreamSource::constraints() { 153 WebMediaConstraints WebMediaStreamSource::constraints() {
154 ASSERT(!m_private.isNull()); 154 ASSERT(!m_private.isNull());
155 return m_private->constraints(); 155 return m_private->constraints();
156 } 156 }
157 157
158 bool WebMediaStreamSource::requiresAudioConsumer() const { 158 bool WebMediaStreamSource::requiresAudioConsumer() const {
159 ASSERT(!m_private.isNull()); 159 ASSERT(!m_private.isNull());
160 return m_private->requiresAudioConsumer(); 160 return m_private->requiresAudioConsumer();
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 ConsumerWrapper* wrapper = static_cast<ConsumerWrapper*>(it->get()); 217 ConsumerWrapper* wrapper = static_cast<ConsumerWrapper*>(it->get());
218 if (wrapper->consumer() == consumer) { 218 if (wrapper->consumer() == consumer) {
219 m_private->removeAudioConsumer(wrapper); 219 m_private->removeAudioConsumer(wrapper);
220 return true; 220 return true;
221 } 221 }
222 } 222 }
223 return false; 223 return false;
224 } 224 }
225 225
226 } // namespace blink 226 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698