[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

Wed Apr 7 23:06:40 UTC 2010

The following commit has been merged in the webkit-1.2 branch:
commit bbdde431e73fa53b4f5a107061f1fac0a3ad92bf
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 26 21:02:10 2009 +0000

    2009-10-26  Nate Chapin  <japhet at chromium.org>
    
            Reviewed by Alexey Proskuryakov.
    
            Update no-referrer-reset for https://bugs.webkit.org/show_bug.cgi?id=30781.
    
            * http/tests/navigation/no-referrer-reset-expected.txt: Expect window.opener to still be set.
            * http/tests/navigation/no-referrer-reset.html: Update text to reflect what the test actually does.
    2009-10-26  Nate Chapin  <japhet at chromium.org>
    
            Reviewed by Alexey Proskuryakov.
    
            Don't set window.opener to 0 for the current FrameLoader if a noreferrer link was clicked, only suppress opener in a new frame.
            https://bugs.webkit.org/show_bug.cgi?id=30781
    
            * loader/FrameLoader.cpp:
            (WebCore::FrameLoader::urlSelected): Don't suppress opener in the current frame for noreferrer navigations.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50092 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 37ffa3a..39dcd3b 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2009-10-26  Nate Chapin  <japhet at chromium.org>
+
+        Reviewed by Alexey Proskuryakov.
+
+        Update no-referrer-reset for https://bugs.webkit.org/show_bug.cgi?id=30781.
+
+        * http/tests/navigation/no-referrer-reset-expected.txt: Expect window.opener to still be set.
+        * http/tests/navigation/no-referrer-reset.html: Update text to reflect what the test actually does.
+
 2009-10-26  Ryosuke Niwa  <rniwa at webkit.org>
 
         Reviewed by Eric Seidel.
diff --git a/LayoutTests/http/tests/navigation/no-referrer-reset-expected.txt b/LayoutTests/http/tests/navigation/no-referrer-reset-expected.txt
index ce6eae0..ada1d16 100644
--- a/LayoutTests/http/tests/navigation/no-referrer-reset-expected.txt
+++ b/LayoutTests/http/tests/navigation/no-referrer-reset-expected.txt
@@ -1,11 +1,11 @@
 This tests whether referrer information gets properly set and reset when "noreferrer" links are present. We do the following:
 1. Open a link in a new window: referrer is sent and window.opener is sent.
-2. Click a rel="noreferrer" link: referrer and window.opener are nulled.
-3. Click a link without rel="noreferrer": referrer is sent, but window.opener is still null (since it was nulled in the previous step). 
+2. Click a rel="noreferrer" link: referrer is null, but window.opener remains set since the link was not opened with target="_blank".
+3. Click a link without rel="noreferrer": referrer is sent, but window.opener is still set. 
 Start reset test
 Referrer: http://127.0.0.1:8000/navigation/no-referrer-reset.html
 window.opener: http://127.0.0.1:8000/navigation/no-referrer-reset.html
 Referrer:
-window.opener:
+window.opener: http://127.0.0.1:8000/navigation/no-referrer-reset.html
 Referrer: http://127.0.0.1:8000/navigation/resources/no-referrer-reset-helper.php
-window.opener:
+window.opener: http://127.0.0.1:8000/navigation/no-referrer-reset.html
diff --git a/LayoutTests/http/tests/navigation/no-referrer-reset.html b/LayoutTests/http/tests/navigation/no-referrer-reset.html
index abd394b..a4a8b3d 100644
--- a/LayoutTests/http/tests/navigation/no-referrer-reset.html
+++ b/LayoutTests/http/tests/navigation/no-referrer-reset.html
@@ -1,8 +1,8 @@
 <html><body>
 This tests whether referrer information gets properly set and reset when "noreferrer" links are present. We do the following:<br/>
 1. Open a link in a new window: referrer is sent and window.opener is sent.<br/>
-2. Click a rel="noreferrer" link: referrer and window.opener are nulled.<br/>
-3. Click a link without rel="noreferrer": referrer is sent, but window.opener is still null (since it was nulled in the previous step).
+2. Click a rel="noreferrer" link: referrer is null, but window.opener remains set since the link was not opened with target="_blank".<br/>
+3. Click a link without rel="noreferrer": referrer is sent, but window.opener is still set.
 <br/>
 <a id="link" href="resources/no-referrer-reset-helper.php" target="_blank">Start reset test</a>
 <script>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 3f6b39c..df1259d 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2009-10-26  Nate Chapin  <japhet at chromium.org>
+
+        Reviewed by Alexey Proskuryakov.
+
+        Don't set window.opener to 0 for the current FrameLoader if a noreferrer link was clicked, only suppress opener in a new frame.
+        https://bugs.webkit.org/show_bug.cgi?id=30781
+
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::urlSelected): Don't suppress opener in the current frame for noreferrer navigations.
+
 2009-10-26  Ryosuke Niwa  <rniwa at webkit.org>
 
         Reviewed by Eric Seidel.
diff --git a/WebCore/loader/FrameLoader.cpp b/WebCore/loader/FrameLoader.cpp
index 34a8f32..39d4900 100644
--- a/WebCore/loader/FrameLoader.cpp
+++ b/WebCore/loader/FrameLoader.cpp
@@ -337,10 +337,9 @@ void FrameLoader::urlSelected(const ResourceRequest& request, const String& pass
 
     FrameLoadRequest frameRequest(request, target);
 
-    if (referrerPolicy == NoReferrer) {
+    if (referrerPolicy == NoReferrer)
         m_suppressOpenerInNewFrame = true;
-        setOpener(0);
-    } else if (frameRequest.resourceRequest().httpReferrer().isEmpty())
+    else if (frameRequest.resourceRequest().httpReferrer().isEmpty())
         frameRequest.resourceRequest().setHTTPReferrer(m_outgoingReferrer);
     addHTTPOriginIfNeeded(frameRequest.resourceRequest(), outgoingOrigin());
 

-- 
WebKit Debian packaging

