| 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 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 150 } | 150 } |
| 151 | 151 |
| 152 MediaStreamComponent* MediaStreamTrack::component() | 152 MediaStreamComponent* MediaStreamTrack::component() |
| 153 { | 153 { |
| 154 return m_component.get(); | 154 return m_component.get(); |
| 155 } | 155 } |
| 156 | 156 |
| 157 void MediaStreamTrack::stop() | 157 void MediaStreamTrack::stop() |
| 158 { | 158 { |
| 159 m_stopped = true; | 159 m_stopped = true; |
| 160 didEndTrack(); | |
| 161 } | 160 } |
| 162 | 161 |
| 163 const AtomicString& MediaStreamTrack::interfaceName() const | 162 const AtomicString& MediaStreamTrack::interfaceName() const |
| 164 { | 163 { |
| 165 return eventNames().interfaceForMediaStreamTrack; | 164 return eventNames().interfaceForMediaStreamTrack; |
| 166 } | 165 } |
| 167 | 166 |
| 168 ScriptExecutionContext* MediaStreamTrack::scriptExecutionContext() const | 167 ScriptExecutionContext* MediaStreamTrack::scriptExecutionContext() const |
| 169 { | 168 { |
| 170 return ActiveDOMObject::scriptExecutionContext(); | 169 return ActiveDOMObject::scriptExecutionContext(); |
| 171 } | 170 } |
| 172 | 171 |
| 173 EventTargetData* MediaStreamTrack::eventTargetData() | 172 EventTargetData* MediaStreamTrack::eventTargetData() |
| 174 { | 173 { |
| 175 return &m_eventTargetData; | 174 return &m_eventTargetData; |
| 176 } | 175 } |
| 177 | 176 |
| 178 EventTargetData* MediaStreamTrack::ensureEventTargetData() | 177 EventTargetData* MediaStreamTrack::ensureEventTargetData() |
| 179 { | 178 { |
| 180 return &m_eventTargetData; | 179 return &m_eventTargetData; |
| 181 } | 180 } |
| 182 | 181 |
| 183 } // namespace WebCore | 182 } // namespace WebCore |
| 184 | 183 |
| 185 #endif // ENABLE(MEDIA_STREAM) | 184 #endif // ENABLE(MEDIA_STREAM) |
| OLD | NEW |