chrome/renderer/plugins/chrome_plugin_placeholder.cc - Issue 1168913002: Use top frame's origin when checking content settings for plugins.

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/plugins/chrome_plugin_placeholder.cc

Issue 1168913002: Use top frame's origin when checking content settings for plugins. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rename object.html Created 5 years, 4 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/chrome_content_renderer_client.cc ('k') | chrome/renderer/plugins/shadow_dom_plugin_placeholder.cc » ('j') | chrome/renderer/plugins/shadow_dom_plugin_placeholder.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/renderer/plugins/chrome_plugin_placeholder.cc

diff --git a/chrome/renderer/plugins/chrome_plugin_placeholder.cc b/chrome/renderer/plugins/chrome_plugin_placeholder.cc

index 44df2ada30b0292ddaba658a7526b65ff48cf291..a3132cf132441d6cc74568409ff95642bf0aff80 100644

--- a/chrome/renderer/plugins/chrome_plugin_placeholder.cc

+++ b/chrome/renderer/plugins/chrome_plugin_placeholder.cc

@@ -247,12 +247,10 @@ void ChromePluginPlaceholder::PluginListChanged() {

ChromeViewHostMsg_GetPluginInfo_Output output;

std::string mime_type(GetPluginParams().mimeType.utf8());

- render_frame()->Send(

- new ChromeViewHostMsg_GetPluginInfo(routing_id(),

- GURL(GetPluginParams().url),

- document.url(),

- mime_type,

- &output));

+ blink::WebString top_origin = GetFrame()->top()->securityOrigin().toString();

+ render_frame()->Send(new ChromeViewHostMsg_GetPluginInfo(

+ routing_id(), GURL(GetPluginParams().url), GURL(top_origin), mime_type,

+ &output));

if (output.status == status_)

return;

blink::WebPlugin* new_plugin = ChromeContentRendererClient::CreatePlugin(