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 3451 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3462 renderer()->updateFromElement(); | 3462 renderer()->updateFromElement(); |
3463 | 3463 |
3464 stopPeriodicTimers(); | 3464 stopPeriodicTimers(); |
3465 cancelPendingEventsAndCallbacks(); | 3465 cancelPendingEventsAndCallbacks(); |
3466 | 3466 |
3467 m_asyncEventQueue->close(); | 3467 m_asyncEventQueue->close(); |
3468 } | 3468 } |
3469 | 3469 |
3470 bool HTMLMediaElement::hasPendingActivity() const | 3470 bool HTMLMediaElement::hasPendingActivity() const |
3471 { | 3471 { |
3472 return (hasAudio() && isPlaying()) || m_asyncEventQueue->hasPendingEvents(); | 3472 return m_shouldDelayLoadEvent || (hasAudio() && isPlaying()) || m_asyncEvent
Queue->hasPendingEvents(); |
3473 } | 3473 } |
3474 | 3474 |
3475 void HTMLMediaElement::contextDestroyed() | 3475 void HTMLMediaElement::contextDestroyed() |
3476 { | 3476 { |
3477 // With Oilpan the ExecutionContext is weakly referenced from the media | 3477 // With Oilpan the ExecutionContext is weakly referenced from the media |
3478 // controller and so it will clear itself on destruction. | 3478 // controller and so it will clear itself on destruction. |
3479 #if !ENABLE(OILPAN) | 3479 #if !ENABLE(OILPAN) |
3480 if (m_mediaController) | 3480 if (m_mediaController) |
3481 m_mediaController->clearExecutionContext(); | 3481 m_mediaController->clearExecutionContext(); |
3482 #endif | 3482 #endif |
(...skipping 501 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3984 | 3984 |
3985 #if ENABLE(WEB_AUDIO) | 3985 #if ENABLE(WEB_AUDIO) |
3986 void HTMLMediaElement::clearWeakMembers(Visitor* visitor) | 3986 void HTMLMediaElement::clearWeakMembers(Visitor* visitor) |
3987 { | 3987 { |
3988 if (!visitor->isAlive(m_audioSourceNode) && audioSourceProvider()) | 3988 if (!visitor->isAlive(m_audioSourceNode) && audioSourceProvider()) |
3989 audioSourceProvider()->setClient(0); | 3989 audioSourceProvider()->setClient(0); |
3990 } | 3990 } |
3991 #endif | 3991 #endif |
3992 | 3992 |
3993 } | 3993 } |
OLD | NEW |