extensions/renderer/resources/messaging.js - Issue 1136953017: Add fallback mechanism to release Extension ports if the JS context has been destroyed.

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: extensions/renderer/resources/messaging.js

Issue 1136953017: Add fallback mechanism to release Extension ports if the JS context has been destroyed. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: tweak Created 5 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

« extensions/renderer/messaging_bindings.cc ('K') | « extensions/renderer/resources/guest_view/web_view/web_view_action_requests.js ('k') | extensions/renderer/script_context.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: extensions/renderer/resources/messaging.js

diff --git a/extensions/renderer/resources/messaging.js b/extensions/renderer/resources/messaging.js

index 9fc29d49752b1e788edc7015cf1c8e4725e5f5e6..5ff748e3c5a2bf172ff6ca3d16bc033eb0758fa8 100644

--- a/extensions/renderer/resources/messaging.js

+++ b/extensions/renderer/resources/messaging.js

@@ -128,12 +128,18 @@

// doesn't keep a reference to it, we need to clean up the port. Do

// so by attaching to the garbage collection of the responseCallback

// using some native hackery.

+ //

+ // If the context is destroyed before this has a chance to execute,

+ // BindToGC knows to release |portId| (important for updating C++ state

+ // both in this renderer and on the other end). We don't need to clear

+ // any JavaScript state, as calling destroy_() would usually do - but

+ // the context has been destroyed, so there isn't any JS state to clear.

messagingNatives.BindToGC(responseCallback, function() {

if (port) {

privates(port).impl.destroy_();

port = null;

}

- });

+ }, portId);

var rv = requestEvent.dispatch(request, sender, responseCallback);

if (isSendMessage) {

responseCallbackPreserved =