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

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

Issue 2767963002: Revert of Remove |remote| and |readonly| members of MediaStreamTrack. (Closed)
Patch Set: rebase Created 3 years, 9 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) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * Copyright (C) 2011 Ericsson AB. All rights reserved. 3 * Copyright (C) 2011 Ericsson AB. 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 * 1. Redistributions of source code must retain the above copyright 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 // TODO(pbos): Log warning? 172 // TODO(pbos): Log warning?
173 // Invalid values for video are to be ignored (similar to invalid enum 173 // Invalid values for video are to be ignored (similar to invalid enum
174 // values). 174 // values).
175 return; 175 return;
176 } 176 }
177 } 177 }
178 178
179 m_component->setContentHint(translatedHint); 179 m_component->setContentHint(translatedHint);
180 } 180 }
181 181
182 bool MediaStreamTrack::remote() const {
183 return m_component->source()->remote();
184 }
185
182 String MediaStreamTrack::readyState() const { 186 String MediaStreamTrack::readyState() const {
183 if (ended()) 187 if (ended())
184 return "ended"; 188 return "ended";
185 189
186 switch (m_readyState) { 190 switch (m_readyState) {
187 case MediaStreamSource::ReadyStateLive: 191 case MediaStreamSource::ReadyStateLive:
188 return "live"; 192 return "live";
189 case MediaStreamSource::ReadyStateMuted: 193 case MediaStreamSource::ReadyStateMuted:
190 return "muted"; 194 return "muted";
191 case MediaStreamSource::ReadyStateEnded: 195 case MediaStreamSource::ReadyStateEnded:
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
408 412
409 DEFINE_TRACE(MediaStreamTrack) { 413 DEFINE_TRACE(MediaStreamTrack) {
410 visitor->trace(m_registeredMediaStreams); 414 visitor->trace(m_registeredMediaStreams);
411 visitor->trace(m_component); 415 visitor->trace(m_component);
412 visitor->trace(m_imageCapture); 416 visitor->trace(m_imageCapture);
413 EventTargetWithInlineData::trace(visitor); 417 EventTargetWithInlineData::trace(visitor);
414 ContextLifecycleObserver::trace(visitor); 418 ContextLifecycleObserver::trace(visitor);
415 } 419 }
416 420
417 } // namespace blink 421 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698