chrome/renderer/resources/renderer_extension_bindings.js - Issue 2754014: Merge 48667 - Prevent extensions from clobbering JSON implementation that ext...

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: chrome/renderer/resources/renderer_extension_bindings.js

Issue 2754014: Merge 48667 - Prevent extensions from clobbering JSON implementation that ext... (Closed) Base URL: svn://svn.chromium.org/chrome/branches/375/src/

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

« no previous file with comments | « chrome/renderer/resources/extension_process_bindings.js ('k') | chrome/test/data/extensions/api_test/messaging/connect/page.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/renderer/resources/renderer_extension_bindings.js

===================================================================

--- chrome/renderer/resources/renderer_extension_bindings.js (revision 49570)

+++ chrome/renderer/resources/renderer_extension_bindings.js (working copy)

@@ -75,7 +75,7 @@

var isExternal = sourceExtensionId != chromeHidden.extensionId;

if (tab)

- tab = JSON.parse(tab);

+ tab = chromeHidden.JSON.parse(tab);

var sender = {tab: tab, id: sourceExtensionId};

// Special case for sendRequest/onRequest.

@@ -119,7 +119,7 @@

var port = ports[portId];

if (port) {

if (msg) {

- msg = JSON.parse(msg);

+ msg = chromeHidden.JSON.parse(msg);

}

port.onMessage.dispatch(msg, port);

}

@@ -131,7 +131,7 @@

// JSON.stringify doesn't support a root object which is undefined.

if (msg === undefined)

msg = null;

- PostMessage(this.portId_, JSON.stringify(msg));

+ PostMessage(this.portId_, chromeHidden.JSON.stringify(msg));

};

// Disconnects the port from the other end.