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

[darin at chromium.org]

The following commit has been merged in the webkit-1.2 branch:
commit 55facd2e82cb5fef57d9b73084c0555bed1926d6
Author: darin at chromium.org <darin at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 25 21:09:42 2009 +0000

    2009-11-25  Darin Fisher  <darin at chromium.org>
    
            Reviewed by Adam Barth.
    
            [Chromium] Unable to repost form data by hitting reload
            https://bugs.webkit.org/show_bug.cgi?id=31882
    
            * src/WebFrameImpl.cpp:
            (WebKit::WebFrameImpl::loadData):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51394 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 6b3130b..afec236 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,13 @@
+2009-11-25  Darin Fisher  <darin at chromium.org>
+
+        Reviewed by Adam Barth.
+
+        [Chromium] Unable to repost form data by hitting reload
+        https://bugs.webkit.org/show_bug.cgi?id=31882
+
+        * src/WebFrameImpl.cpp:
+        (WebKit::WebFrameImpl::loadData):
+
 2009-11-25  Dimitri Glazkov  <dglazkov at chromium.org>
 
         Reviewed by Darin Fisher.
diff --git a/WebKit/chromium/src/WebFrameImpl.cpp b/WebKit/chromium/src/WebFrameImpl.cpp
index 06d394f..f722860 100644
--- a/WebKit/chromium/src/WebFrameImpl.cpp
+++ b/WebKit/chromium/src/WebFrameImpl.cpp
@@ -743,8 +743,20 @@ void WebFrameImpl::loadData(const WebData& data,
     SubstituteData substData(data, mimeType, textEncoding, unreachableURL);
     ASSERT(substData.isValid());
 
+    // If we are loading substitute data to replace an existing load, then
+    // inherit all of the properties of that original request.  This way,
+    // reload will re-attempt the original request.  It is essential that
+    // we only do this when there is an unreachableURL since a non-empty
+    // unreachableURL informs FrameLoader::reload to load unreachableURL
+    // instead of the currently loaded URL.
+    ResourceRequest request;
+    if (replace && !unreachableURL.isEmpty())
+        request = m_frame->loader()->originalRequest();
+    request.setURL(baseURL);
+
     stopLoading();  // Make sure existing activity stops.
-    m_frame->loader()->load(ResourceRequest(baseURL), substData, false);
+
+    m_frame->loader()->load(request, substData, false);
     if (replace) {
         // Do this to force WebKit to treat the load as replacing the currently
         // loaded page.

-- 
WebKit Debian packaging