Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.cpp - Issue 302093011: Oilpan: move the MediaPlayer and MediaPlayerClient objects to the heap.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.cpp

Issue 302093011: Oilpan: move the MediaPlayer and MediaPlayerClient objects to the heap. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Have MediaController weakly track its media elements Created 6 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« Source/core/html/MediaController.h ('K') | « Source/core/html/MediaController.cpp ('k') | Source/platform/graphics/media/MediaPlayer.h » ('j') | Source/platform/graphics/media/MediaPlayer.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.cpp

diff --git a/Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.cpp b/Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.cpp

index 51b3a74db3ba15eac97d80a7de40703b424162ba..6bab1d081f8fe246c8027c8ecfa4ed480c8bbdf5 100644

--- a/Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.cpp

+++ b/Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.cpp

@@ -333,12 +333,6 @@ 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);

}