From 48246856b3bd49d701fe394fea8b695f8fbc204d Mon Sep 17 00:00:00 2001 From: "darin@chromium.org" Date: Tue, 4 Nov 2008 19:40:56 +0000 Subject: [PATCH] 2008-11-04 Darin Fisher Reviewed by Anders Carlsson. No need to clobber all ResourceRequest fields in FrameLoader::reload() https://bugs.webkit.org/show_bug.cgi?id=21949 * loader/FrameLoader.cpp: (WebCore::FrameLoader::reload): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@38107 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- WebCore/ChangeLog | 10 ++++++++++ WebCore/loader/FrameLoader.cpp | 8 ++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog index 20597f285411..b005318d5e6e 100644 --- a/WebCore/ChangeLog +++ b/WebCore/ChangeLog @@ -1,3 +1,13 @@ +2008-11-04 Darin Fisher + + Reviewed by Anders Carlsson. + + No need to clobber all ResourceRequest fields in FrameLoader::reload() + https://bugs.webkit.org/show_bug.cgi?id=21949 + + * loader/FrameLoader.cpp: + (WebCore::FrameLoader::reload): + 2008-11-04 Darin Adler Reviewed by Tim Hatcher. diff --git a/WebCore/loader/FrameLoader.cpp b/WebCore/loader/FrameLoader.cpp index 8516adfe92f7..e8699e52ad65 100644 --- a/WebCore/loader/FrameLoader.cpp +++ b/WebCore/loader/FrameLoader.cpp @@ -2437,17 +2437,17 @@ void FrameLoader::reload() if (!m_documentLoader) return; - ResourceRequest& initialRequest = m_documentLoader->request(); - // If a window is created by javascript, its main frame can have an empty but non-nil URL. // Reloading in this case will lose the current contents (see 4151001). - if (initialRequest.url().isEmpty()) + if (m_documentLoader->request().url().isEmpty()) return; + ResourceRequest initialRequest = m_documentLoader->request(); + // Replace error-page URL with the URL we were trying to reach. KURL unreachableURL = m_documentLoader->unreachableURL(); if (!unreachableURL.isEmpty()) - initialRequest = ResourceRequest(unreachableURL); + initialRequest.setURL(unreachableURL); // Create a new document loader for the reload, this will become m_documentLoader eventually, // but first it has to be the "policy" document loader, and then the "provisional" document loader. -- 2.11.4.GIT