webkit/media/android/webmediaplayer_android.cc - Issue 15898002: Fix various MediaSource related crashes on Android.

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: webkit/media/android/webmediaplayer_android.cc

Issue 15898002: Fix various MediaSource related crashes on Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Make Destroy() public and remove friend decl to make compiler happy Created 7 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:

Index: webkit/media/android/webmediaplayer_android.cc

diff --git a/webkit/media/android/webmediaplayer_android.cc b/webkit/media/android/webmediaplayer_android.cc

index 973c5f29bbda113c9df61ffc16523e42cc356e09..acfeb5d9b5e3fe9d76edfb6821f92c5f1350a109 100644

--- a/webkit/media/android/webmediaplayer_android.cc

+++ b/webkit/media/android/webmediaplayer_android.cc

@@ -21,7 +21,6 @@

#include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayerClient.h"

#include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaSource.h"

#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"

-#include "webkit/media/android/media_source_delegate.h"

#include "webkit/media/android/webmediaplayer_manager_android.h"

#include "webkit/media/android/webmediaplayer_proxy_android.h"

#include "webkit/media/webmediaplayer_util.h"

@@ -552,6 +551,7 @@ void WebMediaPlayerAndroid::Detach() {

stream_id_ = 0;

}

+ media_source_delegate_.reset();

current_frame_ = NULL;

manager_ = NULL;

proxy_ = NULL;

« no previous file with comments | « webkit/media/android/webmediaplayer_android.h ('k') | no next file » | no next file with comments »