Correct bad WebKit merge....

webkit/glue/webframeloaderclient_impl.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
 
@@ skipping 223 matching lines @@
 void WebFrameLoaderClient::dispatchWillSendRequest(
     DocumentLoader* loader, unsigned long identifier, ResourceRequest& request,
     const ResourceResponse& redirectResponse) {
 
   if (loader) {
     // We want to distinguish between a request for a document to be loaded into
     // the main frame, a sub-frame, or the sub-objects in that document.
     request.setTargetType(DetermineTargetTypeFromLoader(loader));
   }
 
+  // Inherit the first party for cookies from the request's frame.  However, if
+  // the request is for a main frame, the current document's
+  // firstPartyForCookies is the old document, so we leave firstPartyForCookies
+  // empty to indicate that the request is a first-party request.
+  if (request.targetType() != ResourceRequest::TargetIsMainFrame &&

[darin (slow to review), 2009/07/12 03:45:40]

Shouldn't this kind of logic live in WebCore?  Or, is this really Chromium
specific?

[abarth-chromium, 2009/07/12 08:10:51]

This patch is just added back some code I accidentally deleted in a previous
patch.  If this fixes the regression, I'd be inclined to land the patch as is
(to fix the Mstone-3 P1) and then file a followup bug to move to logic to
WebCore.

[darin (slow to review), 2009/07/12 13:05:04]

OK,LGTM

+      webframe_->frame()->document()) {
+    request.setFirstPartyForCookies(
+        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.firstPartyForCookies().isEmpty())
     request.setFirstPartyForCookies(KURL("about:blank"));
 
   // Give the delegate a crack at the request.
   WebViewImpl* webview = webframe_->GetWebViewImpl();
   WebViewDelegate* d = webview->delegate();
@@ skipping 1253 matching lines @@
 
   std::string offset_str = url.ExtractFileName();
   int offset;
   if (!StringToInt(offset_str, &offset))
     return;
 
   WebViewDelegate* d = webframe_->GetWebViewImpl()->delegate();
   if (d)
     d->NavigateBackForwardSoon(offset);
 }