OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 Google Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * 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 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
273 m_attachedElement->setCloseMediaSourceWhenFinalizing(); | 273 m_attachedElement->setCloseMediaSourceWhenFinalizing(); |
274 m_attachedElement.clear(); | 274 m_attachedElement.clear(); |
275 } | 275 } |
276 #endif | 276 #endif |
277 } | 277 } |
278 | 278 |
279 DEFINE_TRACE(MediaSource) | 279 DEFINE_TRACE(MediaSource) |
280 { | 280 { |
281 #if ENABLE(OILPAN) | 281 #if ENABLE(OILPAN) |
282 visitor->trace(m_asyncEventQueue); | 282 visitor->trace(m_asyncEventQueue); |
283 visitor->trace(m_attachedElement); | |
sof
2015/03/03 08:50:36
the weak callback handles this weak member; we sho
| |
283 #endif | 284 #endif |
284 visitor->trace(m_sourceBuffers); | 285 visitor->trace(m_sourceBuffers); |
285 visitor->trace(m_activeSourceBuffers); | 286 visitor->trace(m_activeSourceBuffers); |
286 visitor->template registerWeakMembers<MediaSource, &MediaSource::clearWeakMe mbers>(this); | 287 visitor->template registerWeakMembers<MediaSource, &MediaSource::clearWeakMe mbers>(this); |
287 RefCountedGarbageCollectedEventTargetWithInlineData<MediaSource>::trace(visi tor); | 288 RefCountedGarbageCollectedEventTargetWithInlineData<MediaSource>::trace(visi tor); |
288 ActiveDOMObject::trace(visitor); | 289 ActiveDOMObject::trace(visitor); |
289 } | 290 } |
290 | 291 |
291 void MediaSource::setWebMediaSourceAndOpen(PassOwnPtr<WebMediaSource> webMediaSo urce) | 292 void MediaSource::setWebMediaSourceAndOpen(PassOwnPtr<WebMediaSource> webMediaSo urce) |
292 { | 293 { |
(...skipping 320 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
613 | 614 |
614 m_asyncEventQueue->enqueueEvent(event.release()); | 615 m_asyncEventQueue->enqueueEvent(event.release()); |
615 } | 616 } |
616 | 617 |
617 URLRegistry& MediaSource::registry() const | 618 URLRegistry& MediaSource::registry() const |
618 { | 619 { |
619 return MediaSourceRegistry::registry(); | 620 return MediaSourceRegistry::registry(); |
620 } | 621 } |
621 | 622 |
622 } // namespace blink | 623 } // namespace blink |
OLD | NEW |