Chromium Code Reviews| 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 345 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 356 #if !ENABLE(OILPAN) | 356 #if !ENABLE(OILPAN) |
| 357 // Destroying the player may cause a resource load to be canceled, | 357 // Destroying the player may cause a resource load to be canceled, |
| 358 // which could result in Document::dispatchWindowLoadEvent() being | 358 // which could result in Document::dispatchWindowLoadEvent() being |
| 359 // called via ResourceFetch::didLoadResource() then | 359 // called via ResourceFetch::didLoadResource() then |
| 360 // FrameLoader::loadDone(). To prevent load event dispatching during | 360 // FrameLoader::loadDone(). To prevent load event dispatching during |
| 361 // object destruction, we use Document::incrementLoadEventDelayCount(). | 361 // object destruction, we use Document::incrementLoadEventDelayCount(). |
| 362 // See http://crbug.com/275223 for more details. | 362 // See http://crbug.com/275223 for more details. |
| 363 document().incrementLoadEventDelayCount(); | 363 document().incrementLoadEventDelayCount(); |
| 364 #endif | 364 #endif |
| 365 | 365 |
| 366 #if ENABLE(OILPAN) | |
| 367 // Oilpan: the player must be released, but it cannot safely access | |
|
haraken
2014/05/27 23:09:09
but => because ?
| |
| 368 // this client any longer as parts of it may have been finalized | |
| 369 // already (like the media element's supplementable table.) | |
| 370 // Detach and render the client inaccessible first. | |
| 371 if (m_player) | |
| 372 m_player->detach(); | |
| 373 #endif | |
| 366 clearMediaPlayerAndAudioSourceProviderClient(); | 374 clearMediaPlayerAndAudioSourceProviderClient(); |
| 367 | 375 |
| 368 #if !ENABLE(OILPAN) | 376 #if !ENABLE(OILPAN) |
| 369 document().decrementLoadEventDelayCount(); | 377 document().decrementLoadEventDelayCount(); |
| 370 #endif | 378 #endif |
| 371 } | 379 } |
| 372 | 380 |
| 373 void HTMLMediaElement::didMoveToNewDocument(Document& oldDocument) | 381 void HTMLMediaElement::didMoveToNewDocument(Document& oldDocument) |
| 374 { | 382 { |
| 375 WTF_LOG(Media, "HTMLMediaElement::didMoveToNewDocument"); | 383 WTF_LOG(Media, "HTMLMediaElement::didMoveToNewDocument"); |
| (...skipping 3278 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3654 visitor->trace(m_error); | 3662 visitor->trace(m_error); |
| 3655 visitor->trace(m_currentSourceNode); | 3663 visitor->trace(m_currentSourceNode); |
| 3656 visitor->trace(m_nextChildNodeToConsider); | 3664 visitor->trace(m_nextChildNodeToConsider); |
| 3657 visitor->trace(m_textTracks); | 3665 visitor->trace(m_textTracks); |
| 3658 visitor->trace(m_textTracksWhenResourceSelectionBegan); | 3666 visitor->trace(m_textTracksWhenResourceSelectionBegan); |
| 3659 WillBeHeapSupplementable<HTMLMediaElement>::trace(visitor); | 3667 WillBeHeapSupplementable<HTMLMediaElement>::trace(visitor); |
| 3660 HTMLElement::trace(visitor); | 3668 HTMLElement::trace(visitor); |
| 3661 } | 3669 } |
| 3662 | 3670 |
| 3663 } | 3671 } |
| OLD | NEW |