| Index: Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.cpp
|
| diff --git a/Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.cpp b/Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.cpp
|
| index 3f7a6a56a071e9ff6b9c860c236499c068047207..4f1c4d55f5bf5c14a71b73071632407fe7b4e0b7 100644
|
| --- a/Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.cpp
|
| +++ b/Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.cpp
|
| @@ -338,6 +338,12 @@ void HTMLMediaElementEncryptedMedia::keyNeeded(HTMLMediaElement& element, const
|
|
|
| void HTMLMediaElementEncryptedMedia::playerDestroyed(HTMLMediaElement& element)
|
| {
|
| +#if ENABLE(OILPAN)
|
| + // FIXME: Oilpan: remove this once the media player is on the heap. crbug.com/378229
|
| + if (element.isFinalizing())
|
| + return;
|
| +#endif
|
| +
|
| HTMLMediaElementEncryptedMedia& thisElement = HTMLMediaElementEncryptedMedia::from(element);
|
| thisElement.setMediaKeysInternal(element, 0);
|
| }
|
|
|