android_webview/native/aw_contents.cc - Issue 545963002: Android WebView: clean up the AwContentsClientBridge webcontents userdata.

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: android_webview/native/aw_contents.cc

Issue 545963002: Android WebView: clean up the AwContentsClientBridge webcontents userdata. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 3 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

« android_webview/browser/aw_contents_client_bridge_base.cc ('K') | « android_webview/browser/aw_javascript_dialog_manager.cc ('k') | android_webview/native/aw_contents_client_bridge.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: android_webview/native/aw_contents.cc

diff --git a/android_webview/native/aw_contents.cc b/android_webview/native/aw_contents.cc

index 2155f578200d14ae75af6d1584b2709ebfa183c0..e38fd5e1fc4131ffcba3c909295bde4f6367611a 100644

--- a/android_webview/native/aw_contents.cc

+++ b/android_webview/native/aw_contents.cc

@@ -297,6 +297,7 @@ void AwContents::Destroy(JNIEnv* env, jobject obj) {

// the java peer. This is important for the popup window case, where we are

// swapping AwContents out that share the same java AwContentsClientBridge.

// See b/15074651.

+ AwContentsClientBridgeBase::Disassociate(web_contents_.get());

contents_client_bridge_.reset();

// We do not delete AwContents immediately. Some applications try to delete