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

Unified Diff: webkit/glue/webframeloaderclient_impl.cc

Issue 115717: Roll webkit DEPS and fix compile errors. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 years, 7 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
Index: webkit/glue/webframeloaderclient_impl.cc
===================================================================
--- webkit/glue/webframeloaderclient_impl.cc (revision 16750)
+++ webkit/glue/webframeloaderclient_impl.cc (working copy)
@@ -224,15 +224,16 @@
// first-party request.
if (request.targetType() != ResourceRequest::TargetIsMainFrame &&
webframe_->frame()->document()) {
- request.setPolicyURL(webframe_->frame()->document()->policyBaseURL());
+ request.setPolicyURL(
+ webframe_->frame()->document()->firstPartyForCookies());
}
// FrameLoader::loadEmptyDocumentSynchronously() creates an empty document
// with no URL. We don't like that, so we'll rename it to about:blank.
if (request.url().isEmpty())
request.setURL(KURL("about:blank"));
- if (request.mainDocumentURL().isEmpty())
- request.setMainDocumentURL(KURL("about:blank"));
+ if (request.firstPartyForCookies().isEmpty())
+ request.setFirstPartyForCookies(KURL("about:blank"));
// Give the delegate a crack at the request.
WebViewImpl* webview = webframe_->GetWebViewImpl();

Powered by Google App Engine
This is Rietveld 408576698