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

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

Issue 2710213005: Revert of Remove |remote| and |readonly| members of MediaStreamTrack (Closed)
Patch Set: 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 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 // TODO(pbos): Log warning? 160 // TODO(pbos): Log warning?
161 // Invalid values for video are to be ignored (similar to invalid enum 161 // Invalid values for video are to be ignored (similar to invalid enum
162 // values). 162 // values).
163 return; 163 return;
164 } 164 }
165 } 165 }
166 166
167 m_component->setContentHint(translatedHint); 167 m_component->setContentHint(translatedHint);
168 } 168 }
169 169
170 bool MediaStreamTrack::remote() const {
171 return m_component->source()->remote();
172 }
173
170 String MediaStreamTrack::readyState() const { 174 String MediaStreamTrack::readyState() const {
171 if (ended()) 175 if (ended())
172 return "ended"; 176 return "ended";
173 177
174 switch (m_readyState) { 178 switch (m_readyState) {
175 case MediaStreamSource::ReadyStateLive: 179 case MediaStreamSource::ReadyStateLive:
176 return "live"; 180 return "live";
177 case MediaStreamSource::ReadyStateMuted: 181 case MediaStreamSource::ReadyStateMuted:
178 return "muted"; 182 return "muted";
179 case MediaStreamSource::ReadyStateEnded: 183 case MediaStreamSource::ReadyStateEnded:
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
342 } 346 }
343 347
344 DEFINE_TRACE(MediaStreamTrack) { 348 DEFINE_TRACE(MediaStreamTrack) {
345 visitor->trace(m_registeredMediaStreams); 349 visitor->trace(m_registeredMediaStreams);
346 visitor->trace(m_component); 350 visitor->trace(m_component);
347 EventTargetWithInlineData::trace(visitor); 351 EventTargetWithInlineData::trace(visitor);
348 ContextLifecycleObserver::trace(visitor); 352 ContextLifecycleObserver::trace(visitor);
349 } 353 }
350 354
351 } // namespace blink 355 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698