| 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 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 103 | 103 |
| 104 if (!ended()) | 104 if (!ended()) |
| 105 MediaStreamCenter::instance().didSetMediaStreamTrackEnabled( | 105 MediaStreamCenter::instance().didSetMediaStreamTrackEnabled( |
| 106 m_component.get()); | 106 m_component.get()); |
| 107 } | 107 } |
| 108 | 108 |
| 109 bool MediaStreamTrack::muted() const { | 109 bool MediaStreamTrack::muted() const { |
| 110 return m_component->muted(); | 110 return m_component->muted(); |
| 111 } | 111 } |
| 112 | 112 |
| 113 bool MediaStreamTrack::remote() const { | |
| 114 return m_component->source()->remote(); | |
| 115 } | |
| 116 | |
| 117 String MediaStreamTrack::readyState() const { | 113 String MediaStreamTrack::readyState() const { |
| 118 if (ended()) | 114 if (ended()) |
| 119 return "ended"; | 115 return "ended"; |
| 120 | 116 |
| 121 switch (m_readyState) { | 117 switch (m_readyState) { |
| 122 case MediaStreamSource::ReadyStateLive: | 118 case MediaStreamSource::ReadyStateLive: |
| 123 return "live"; | 119 return "live"; |
| 124 case MediaStreamSource::ReadyStateMuted: | 120 case MediaStreamSource::ReadyStateMuted: |
| 125 return "muted"; | 121 return "muted"; |
| 126 case MediaStreamSource::ReadyStateEnded: | 122 case MediaStreamSource::ReadyStateEnded: |
| (...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 274 } | 270 } |
| 275 | 271 |
| 276 DEFINE_TRACE(MediaStreamTrack) { | 272 DEFINE_TRACE(MediaStreamTrack) { |
| 277 visitor->trace(m_registeredMediaStreams); | 273 visitor->trace(m_registeredMediaStreams); |
| 278 visitor->trace(m_component); | 274 visitor->trace(m_component); |
| 279 EventTargetWithInlineData::trace(visitor); | 275 EventTargetWithInlineData::trace(visitor); |
| 280 ActiveDOMObject::trace(visitor); | 276 ActiveDOMObject::trace(visitor); |
| 281 } | 277 } |
| 282 | 278 |
| 283 } // namespace blink | 279 } // namespace blink |
| OLD | NEW |