| 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 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 104 } | 104 } |
| 105 | 105 |
| 106 bool MediaStreamTrack::muted() const { | 106 bool MediaStreamTrack::muted() const { |
| 107 return m_component->muted(); | 107 return m_component->muted(); |
| 108 } | 108 } |
| 109 | 109 |
| 110 bool MediaStreamTrack::remote() const { | 110 bool MediaStreamTrack::remote() const { |
| 111 return m_component->source()->remote(); | 111 return m_component->source()->remote(); |
| 112 } | 112 } |
| 113 | 113 |
| 114 String MediaStreamTrack::readyState() const { | 114 String MediaStreamTrack::getReadyState() const { |
| 115 if (ended()) | 115 if (ended()) |
| 116 return "ended"; | 116 return "ended"; |
| 117 | 117 |
| 118 switch (m_readyState) { | 118 switch (m_readyState) { |
| 119 case MediaStreamSource::ReadyStateLive: | 119 case MediaStreamSource::ReadyStateLive: |
| 120 return "live"; | 120 return "live"; |
| 121 case MediaStreamSource::ReadyStateMuted: | 121 case MediaStreamSource::ReadyStateMuted: |
| 122 return "muted"; | 122 return "muted"; |
| 123 case MediaStreamSource::ReadyStateEnded: | 123 case MediaStreamSource::ReadyStateEnded: |
| 124 return "ended"; | 124 return "ended"; |
| (...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 254 } | 254 } |
| 255 | 255 |
| 256 DEFINE_TRACE(MediaStreamTrack) { | 256 DEFINE_TRACE(MediaStreamTrack) { |
| 257 visitor->trace(m_registeredMediaStreams); | 257 visitor->trace(m_registeredMediaStreams); |
| 258 visitor->trace(m_component); | 258 visitor->trace(m_component); |
| 259 EventTargetWithInlineData::trace(visitor); | 259 EventTargetWithInlineData::trace(visitor); |
| 260 ActiveDOMObject::trace(visitor); | 260 ActiveDOMObject::trace(visitor); |
| 261 } | 261 } |
| 262 | 262 |
| 263 } // namespace blink | 263 } // namespace blink |
| OLD | NEW |