| 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 356 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 367 // | 367 // |
| 368 // FIXME: Oilpan: move the media player to the heap instead and | 368 // FIXME: Oilpan: move the media player to the heap instead and |
| 369 // avoid having to finalize it from here; this whole #if block | 369 // avoid having to finalize it from here; this whole #if block |
| 370 // could then be removed (along with the state bit it depends on.) | 370 // could then be removed (along with the state bit it depends on.) |
| 371 // crbug.com/378229 | 371 // crbug.com/378229 |
| 372 m_isFinalizing = true; | 372 m_isFinalizing = true; |
| 373 #endif | 373 #endif |
| 374 | 374 |
| 375 // The m_audioSourceNode is either dead already or it is dying together with | 375 // The m_audioSourceNode is either dead already or it is dying together with |
| 376 // this HTMLMediaElement which it strongly keeps alive. | 376 // this HTMLMediaElement which it strongly keeps alive. |
| 377 #if !ENABLE(OILPAN) | 377 #if ENABLE(WEB_AUDIO) && !ENABLE(OILPAN) |
| 378 ASSERT(!m_audioSourceNode); | 378 ASSERT(!m_audioSourceNode); |
| 379 #endif | 379 #endif |
| 380 clearMediaPlayerAndAudioSourceProviderClientWithoutLocking(); | 380 clearMediaPlayerAndAudioSourceProviderClientWithoutLocking(); |
| 381 | 381 |
| 382 #if !ENABLE(OILPAN) | 382 #if !ENABLE(OILPAN) |
| 383 document().decrementLoadEventDelayCount(); | 383 document().decrementLoadEventDelayCount(); |
| 384 #endif | 384 #endif |
| 385 } | 385 } |
| 386 | 386 |
| 387 void HTMLMediaElement::didMoveToNewDocument(Document& oldDocument) | 387 void HTMLMediaElement::didMoveToNewDocument(Document& oldDocument) |
| (...skipping 3289 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3677 | 3677 |
| 3678 #if ENABLE(WEB_AUDIO) | 3678 #if ENABLE(WEB_AUDIO) |
| 3679 void HTMLMediaElement::clearWeakMembers(Visitor* visitor) | 3679 void HTMLMediaElement::clearWeakMembers(Visitor* visitor) |
| 3680 { | 3680 { |
| 3681 if (!visitor->isAlive(m_audioSourceNode) && audioSourceProvider()) | 3681 if (!visitor->isAlive(m_audioSourceNode) && audioSourceProvider()) |
| 3682 audioSourceProvider()->setClient(0); | 3682 audioSourceProvider()->setClient(0); |
| 3683 } | 3683 } |
| 3684 #endif | 3684 #endif |
| 3685 | 3685 |
| 3686 } | 3686 } |
| OLD | NEW |