commit 9288333e7b5e05ccdba9f14844b6afcf8d0d1e29
author weinig <weinig@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Tue Feb 20 01:05:27 2007 +0000
committer weinig <weinig@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Tue Feb 20 01:05:27 2007 +0000
tree 13d5c52ebc8d73d8bd97a17b33a8557ec6040b53
parent 980ceda717ca81dec5b75f71402a708c10ece79d

        Reviewed by Adam.

        - fix http://bugs.webkit.org/show_bug.cgi?id=11518
          REGRESSION (r14376): View Source not available after Back navigation from a non-HTML page

        The FrameLoader's responseMIMEType was not being updated when a page was
        brought back from the page cache.
        
        Moved the line that updates the MIME type from commitProvisionalLoad() to
        transitionToCommitted().

        * loader/FrameLoader.cpp:
        (WebCore::FrameLoader::commitProvisionalLoad):
        (WebCore::FrameLoader::transitionToCommitted):



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@19715 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d3959cb..ea31fb2 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2007-02-19  Mitz Pettel  <mitz@webkit.org>
+
+        Reviewed by Adam.
+
+        - fix http://bugs.webkit.org/show_bug.cgi?id=11518
+          REGRESSION (r14376): View Source not available after Back navigation from a non-HTML page
+
+        The FrameLoader's responseMIMEType was not being updated when a page was
+        brought back from the page cache.
+        
+        Moved the line that updates the MIME type from commitProvisionalLoad() to
+        transitionToCommitted().
+
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::commitProvisionalLoad):
+        (WebCore::FrameLoader::transitionToCommitted):
+
 2007-02-19  Anders Carlsson  <acarlsson@apple.com>
 
         Reviewed by Oliver.

WebCore/loader/FrameLoader.cpp

diff --git a/WebCore/loader/FrameLoader.cpp b/WebCore/loader/FrameLoader.cpp
index faec3b8..a8e0279 100644
--- a/WebCore/loader/FrameLoader.cpp
+++ b/WebCore/loader/FrameLoader.cpp
@@ -2310,8 +2310,6 @@
         if (url.isEmpty())
             url = "about:blank";
 
-        m_responseMIMEType = pdl->responseMIMEType();
-
         if (didOpenURL(url)) {
             m_responseRefreshHeader = pdl->response().httpHeaderField("Refresh");
             if (!pdl->getResponseModifiedHeader(m_responseModifiedHeader))
@@ -2389,6 +2387,8 @@
             ASSERT_NOT_REACHED();
     }
 
+    m_responseMIMEType = dl->responseMIMEType();
+
     // Tell the client we've committed this URL.
     ASSERT(m_client->hasFrameView());
     m_client->dispatchDidCommitLoad();