Correct bad WebKit merge....

Correct bad WebKit merge.

BUG=12969
R=darin
TEST=I wish I could write a test, but I can't reproduce the issue.


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=20473

[darin (slow to review), 2009-07-12 03:45:39]

http://codereview.chromium.org/149510/diff/1/2
File webkit/glue/webframeloaderclient_impl.cc (right):

http://codereview.chromium.org/149510/diff/1/2#newcode248
Line 248: if (request.targetType() != ResourceRequest::TargetIsMainFrame &&
Shouldn't this kind of logic live in WebCore?  Or, is this really Chromium
specific?

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

http://codereview.chromium.org/149510/diff/1/2
File webkit/glue/webframeloaderclient_impl.cc (right):

http://codereview.chromium.org/149510/diff/1/2#newcode248
Line 248: if (request.targetType() != ResourceRequest::TargetIsMainFrame &&
On 2009/07/12 03:45:40, darin wrote:
> Shouldn't this kind of logic live in WebCore?  Or, is this really Chromium
> specific?

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]

http://codereview.chromium.org/149510/diff/1/2
File webkit/glue/webframeloaderclient_impl.cc (right):

http://codereview.chromium.org/149510/diff/1/2#newcode248
Line 248: if (request.targetType() != ResourceRequest::TargetIsMainFrame &&
OK,LGTM

[dhw, 2009-07-12 15:06:42]

Hi Adam,

So far, I'm just a Chromium contributor.  I also noticed the comment you entered
into http://crbug.com/12969, but unfortunately I don't have a Chromium build
environment yet.  I would like to get my hands on a copy of VStudio and try
compiling, but until then I cannot test compile the patch yet.

As you mention, you're just putting back the accidentally removed code, so LGTM.

Also, I just retested with r20466 and I can still consistently reproduce the
logging in problem when "restrict third party cookies" is selected
(understandable, as the patch is not yet applied).  If you want to try
reproducing again, make sure you are *completely logged out* of all Google
accounts and go to http://mail.google.com/  As well, I'm set for "Always use
HTTPS" in case it matters.

[dhw, 2009-07-12 15:21:11]

Also, have you ever logged into GMail with "Stay signed in"?  Maybe there's
already a stay signed in cookie helping you to login?  Perhaps try clearing all
cookies for mail.google.com and then you can reproduce the problem?