| 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 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 102 | 102 |
| 103 if (!ended()) | 103 if (!ended()) |
| 104 MediaStreamCenter::instance().didSetMediaStreamTrackEnabled(m_component.
get()); | 104 MediaStreamCenter::instance().didSetMediaStreamTrackEnabled(m_component.
get()); |
| 105 } | 105 } |
| 106 | 106 |
| 107 bool MediaStreamTrack::muted() const | 107 bool MediaStreamTrack::muted() const |
| 108 { | 108 { |
| 109 return m_component->muted(); | 109 return m_component->muted(); |
| 110 } | 110 } |
| 111 | 111 |
| 112 bool MediaStreamTrack::remote() const |
| 113 { |
| 114 return m_component->remote(); |
| 115 } |
| 116 |
| 112 String MediaStreamTrack::readyState() const | 117 String MediaStreamTrack::readyState() const |
| 113 { | 118 { |
| 114 if (ended()) | 119 if (ended()) |
| 115 return "ended"; | 120 return "ended"; |
| 116 | 121 |
| 117 switch (m_readyState) { | 122 switch (m_readyState) { |
| 118 case MediaStreamSource::ReadyStateLive: | 123 case MediaStreamSource::ReadyStateLive: |
| 119 return "live"; | 124 return "live"; |
| 120 case MediaStreamSource::ReadyStateMuted: | 125 case MediaStreamSource::ReadyStateMuted: |
| 121 return "muted"; | 126 return "muted"; |
| (...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 227 return ActiveDOMObject::executionContext(); | 232 return ActiveDOMObject::executionContext(); |
| 228 } | 233 } |
| 229 | 234 |
| 230 void MediaStreamTrack::trace(Visitor* visitor) | 235 void MediaStreamTrack::trace(Visitor* visitor) |
| 231 { | 236 { |
| 232 visitor->trace(m_registeredMediaStreams); | 237 visitor->trace(m_registeredMediaStreams); |
| 233 EventTargetWithInlineData::trace(visitor); | 238 EventTargetWithInlineData::trace(visitor); |
| 234 } | 239 } |
| 235 | 240 |
| 236 } // namespace blink | 241 } // namespace blink |
| OLD | NEW |