OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved. | 2 * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple 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 | 5 * modification, are permitted provided that the following conditions |
6 * are met: | 6 * are met: |
7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
(...skipping 371 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
382 m_textTracks->clearOwner(); | 382 m_textTracks->clearOwner(); |
383 m_audioTracks->shutdown(); | 383 m_audioTracks->shutdown(); |
384 m_videoTracks->shutdown(); | 384 m_videoTracks->shutdown(); |
385 | 385 |
386 if (m_mediaController) { | 386 if (m_mediaController) { |
387 m_mediaController->removeMediaElement(this); | 387 m_mediaController->removeMediaElement(this); |
388 m_mediaController = nullptr; | 388 m_mediaController = nullptr; |
389 } | 389 } |
390 #endif | 390 #endif |
391 | 391 |
392 closeMediaSource(); | 392 closeMediaSource(); |
haraken
2014/07/01 16:02:00
This looks problematic. You're touching m_mediaSou
sof
2014/07/01 16:14:11
I've reverted the HTMLMediaElement changes for now
| |
393 | 393 |
394 #if !ENABLE(OILPAN) | 394 #if !ENABLE(OILPAN) |
395 removeElementFromDocumentMap(this, &document()); | 395 removeElementFromDocumentMap(this, &document()); |
396 #endif | 396 #endif |
397 | 397 |
398 // Destroying the player may cause a resource load to be canceled, | 398 // Destroying the player may cause a resource load to be canceled, |
399 // which could result in userCancelledLoad() being called back. | 399 // which could result in userCancelledLoad() being called back. |
400 // Setting m_completelyLoaded ensures that such a call will not cause | 400 // Setting m_completelyLoaded ensures that such a call will not cause |
401 // us to dispatch an abort event, which would result in a crash. | 401 // us to dispatch an abort event, which would result in a crash. |
402 // See http://crbug.com/233654 for more details. | 402 // See http://crbug.com/233654 for more details. |
(...skipping 3500 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
3903 } | 3903 } |
3904 HTMLElement::defaultEventHandler(event); | 3904 HTMLElement::defaultEventHandler(event); |
3905 } | 3905 } |
3906 | 3906 |
3907 void HTMLMediaElement::trace(Visitor* visitor) | 3907 void HTMLMediaElement::trace(Visitor* visitor) |
3908 { | 3908 { |
3909 visitor->trace(m_asyncEventQueue); | 3909 visitor->trace(m_asyncEventQueue); |
3910 visitor->trace(m_error); | 3910 visitor->trace(m_error); |
3911 visitor->trace(m_currentSourceNode); | 3911 visitor->trace(m_currentSourceNode); |
3912 visitor->trace(m_nextChildNodeToConsider); | 3912 visitor->trace(m_nextChildNodeToConsider); |
3913 visitor->trace(m_mediaSource); | |
3913 visitor->trace(m_audioTracks); | 3914 visitor->trace(m_audioTracks); |
3914 visitor->trace(m_videoTracks); | 3915 visitor->trace(m_videoTracks); |
3915 visitor->trace(m_textTracks); | 3916 visitor->trace(m_textTracks); |
3916 visitor->trace(m_textTracksWhenResourceSelectionBegan); | 3917 visitor->trace(m_textTracksWhenResourceSelectionBegan); |
3917 visitor->trace(m_mediaController); | 3918 visitor->trace(m_mediaController); |
3918 #if ENABLE(WEB_AUDIO) | 3919 #if ENABLE(WEB_AUDIO) |
3919 visitor->registerWeakMembers<HTMLMediaElement, &HTMLMediaElement::clearWeakM embers>(this); | 3920 visitor->registerWeakMembers<HTMLMediaElement, &HTMLMediaElement::clearWeakM embers>(this); |
3920 #endif | 3921 #endif |
3921 WillBeHeapSupplementable<HTMLMediaElement>::trace(visitor); | 3922 WillBeHeapSupplementable<HTMLMediaElement>::trace(visitor); |
3922 HTMLElement::trace(visitor); | 3923 HTMLElement::trace(visitor); |
(...skipping 29 matching lines...) Expand all Loading... | |
3952 | 3953 |
3953 #if ENABLE(WEB_AUDIO) | 3954 #if ENABLE(WEB_AUDIO) |
3954 void HTMLMediaElement::clearWeakMembers(Visitor* visitor) | 3955 void HTMLMediaElement::clearWeakMembers(Visitor* visitor) |
3955 { | 3956 { |
3956 if (!visitor->isAlive(m_audioSourceNode) && audioSourceProvider()) | 3957 if (!visitor->isAlive(m_audioSourceNode) && audioSourceProvider()) |
3957 audioSourceProvider()->setClient(0); | 3958 audioSourceProvider()->setClient(0); |
3958 } | 3959 } |
3959 #endif | 3960 #endif |
3960 | 3961 |
3961 } | 3962 } |
OLD | NEW |