| 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() {
|
|
|