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

Unified Diff: chrome/renderer/renderer_glue.cc

Issue 48038: SSL Fix: Step 3.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 years, 9 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/plugin/chrome_plugin_host.cc ('k') | webkit/glue/resource_handle_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/renderer_glue.cc
===================================================================
--- chrome/renderer/renderer_glue.cc (revision 11701)
+++ chrome/renderer/renderer_glue.cc (working copy)
@@ -238,8 +238,7 @@
const std::string& headers,
int load_flags,
int origin_pid,
- ResourceType::Type resource_type,
- bool mixed_content) {
+ ResourceType::Type resource_type) {
// TODO(darin): we need to eliminate the webframe parameter because webkit
// does not always supply it (see ResourceHandle::loadResourceSynchronously).
// Instead we should add context to ResourceRequest, which will be easy to do
@@ -252,12 +251,16 @@
if (!webframe->GetView()->GetDelegate())
return NULL;
+ std::string frame_origin = webframe->GetSecurityOrigin();
+ std::string main_frame_origin = webframe->GetTop()->GetSecurityOrigin();
+
RenderView* rv = static_cast<RenderView*>(webframe->GetView()->GetDelegate());
int route_id = rv->routing_id();
ResourceDispatcher* dispatch = RenderThread::current()->resource_dispatcher();
- return dispatch->CreateBridge(method, url, policy_url, referrer, headers,
- load_flags, origin_pid, resource_type,
- mixed_content, 0, route_id);
+ return dispatch->CreateBridge(method, url, policy_url, referrer,
+ frame_origin, main_frame_origin, headers,
+ load_flags, origin_pid, resource_type, 0,
+ route_id);
}
void NotifyCacheStats() {
« no previous file with comments | « chrome/plugin/chrome_plugin_host.cc ('k') | webkit/glue/resource_handle_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698