| OLD | NEW |
| 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 Loading... |
| 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 | |
| 186 String MediaStreamTrack::readyState() const { | 182 String MediaStreamTrack::readyState() const { |
| 187 if (ended()) | 183 if (ended()) |
| 188 return "ended"; | 184 return "ended"; |
| 189 | 185 |
| 190 switch (m_readyState) { | 186 switch (m_readyState) { |
| 191 case MediaStreamSource::ReadyStateLive: | 187 case MediaStreamSource::ReadyStateLive: |
| 192 return "live"; | 188 return "live"; |
| 193 case MediaStreamSource::ReadyStateMuted: | 189 case MediaStreamSource::ReadyStateMuted: |
| 194 return "muted"; | 190 return "muted"; |
| 195 case MediaStreamSource::ReadyStateEnded: | 191 case MediaStreamSource::ReadyStateEnded: |
| (...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 412 | 408 |
| 413 DEFINE_TRACE(MediaStreamTrack) { | 409 DEFINE_TRACE(MediaStreamTrack) { |
| 414 visitor->trace(m_registeredMediaStreams); | 410 visitor->trace(m_registeredMediaStreams); |
| 415 visitor->trace(m_component); | 411 visitor->trace(m_component); |
| 416 visitor->trace(m_imageCapture); | 412 visitor->trace(m_imageCapture); |
| 417 EventTargetWithInlineData::trace(visitor); | 413 EventTargetWithInlineData::trace(visitor); |
| 418 ContextLifecycleObserver::trace(visitor); | 414 ContextLifecycleObserver::trace(visitor); |
| 419 } | 415 } |
| 420 | 416 |
| 421 } // namespace blink | 417 } // namespace blink |
| OLD | NEW |