Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1262)

Unified Diff: chrome/renderer/plugins/shadow_dom_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/plugins/chrome_plugin_placeholder.cc ('k') | chrome/test/data/flash_object.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/plugins/shadow_dom_plugin_placeholder.cc
diff --git a/chrome/renderer/plugins/shadow_dom_plugin_placeholder.cc b/chrome/renderer/plugins/shadow_dom_plugin_placeholder.cc
index 9175a103401b32d38b627624e6829697e7e2ad83..77d2394e416b689c9d87703f65d24eab3a857344 100644
--- a/chrome/renderer/plugins/shadow_dom_plugin_placeholder.cc
+++ b/chrome/renderer/plugins/shadow_dom_plugin_placeholder.cc
@@ -46,12 +46,10 @@ scoped_ptr<blink::WebPluginPlaceholder> CreateShadowDOMPlaceholderForPluginInfo(
// TODO(jbroman): Investigate whether browser plugin needs special handling.
ChromeViewHostMsg_GetPluginInfo_Output output;
#if defined(ENABLE_PLUGINS)
- render_frame->Send(
- new ChromeViewHostMsg_GetPluginInfo(render_frame->GetRoutingID(),
- GURL(orig_params.url),
- frame->top()->document().url(),
- orig_mime_type,
- &output));
+ blink::WebString top_origin = frame->top()->securityOrigin().toString();
+ render_frame->Send(new ChromeViewHostMsg_GetPluginInfo(
+ render_frame->GetRoutingID(), GURL(orig_params.url), GURL(top_origin),
Lei Zhang 2015/08/20 21:33:28 nit: Can you keep the old formatting if it fits in
alexmos 2015/08/20 21:45:07 Done.
+ orig_mime_type, &output));
#else
output.status = Status::kNotFound;
#endif
« no previous file with comments | « chrome/renderer/plugins/chrome_plugin_placeholder.cc ('k') | chrome/test/data/flash_object.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698