Reviewed by Maciej.

        Get the Refresh header directly from the ResourceResponse.
        
        * loader/DocumentLoader.h:
        * loader/FrameLoader.cpp:
        (WebCore::FrameLoader::commitProvisionalLoad):
        * loader/mac/DocumentLoaderMac.mm:
        (WebCore::DocumentLoader::getResponseModifiedHeader):



git-svn-id: svn://svn.chromium.org/blink/trunk@18751 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/WebCore/ChangeLog

+2007-01-10  Anders Carlsson  <acarlsson@apple.com>
+
+        Reviewed by Maciej.
+
+        Get the Refresh header directly from the ResourceResponse.
+        
+        * loader/DocumentLoader.h:
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::commitProvisionalLoad):
+        * loader/mac/DocumentLoaderMac.mm:
+        (WebCore::DocumentLoader::getResponseModifiedHeader):
+
 2007-01-10  Beth Dakin  <bdakin@apple.com>
 
         Reviewed by John.

third_party/WebKit/WebCore/loader/DocumentLoader.h

@@ -90,7 +90,7 @@ namespace WebCore {
         String responseMIMEType() const;
         
         // FIXME: After we have a ResourceResponse in the mix, this method can go away and we can use it directly
-        bool getResponseRefreshAndModifiedHeaders(String& refresh, String& modified) const;
+        bool getResponseModifiedHeader(String& modified) const;
         
         void replaceRequestURLForAnchorScroll(const KURL&);
         bool isStopping() const;

third_party/WebKit/WebCore/loader/FrameLoader.cpp

@@ -2302,11 +2302,11 @@ void FrameLoader::commitProvisionalLoad(PassRefPtr<PageCache> prpPageCache)
 
         m_responseMIMEType = pdl->responseMIMEType();
 
-        if (didOpenURL(url))
-            if (!pdl->getResponseRefreshAndModifiedHeaders(m_responseRefreshHeader, m_responseModifiedHeader)) {
-                m_responseRefreshHeader = "";
+        if (didOpenURL(url)) {
+            m_responseRefreshHeader = pdl->response().httpHeaderField("Refresh");
+            if (!pdl->getResponseModifiedHeader(m_responseModifiedHeader))
                 m_responseModifiedHeader = "";
-            }
+        }
     }
     opened();
 }

third_party/WebKit/WebCore/loader/mac/DocumentLoaderMac.mm

@@ -39,14 +39,12 @@ const KURL DocumentLoader::unreachableURL() const
     return [m_originalRequest.nsURLRequest() _webDataRequestUnreachableURL];
 }
 
-bool DocumentLoader::getResponseRefreshAndModifiedHeaders(String& refreshOut, String& modified) const
+bool DocumentLoader::getResponseModifiedHeader(String& modified) const
 {
     NSURLResponse *response = m_response.nsURLResponse();
     if (![response isKindOfClass:[NSHTTPURLResponse class]])
         return false;
         
-    if (NSString *refresh = [[(NSHTTPURLResponse *)response allHeaderFields] objectForKey:@"Refresh"])
-        refreshOut = refresh;
     modified = [wkGetNSURLResponseLastModifiedDate(response)
                 descriptionWithCalendarFormat:@"%a %b %d %Y %H:%M:%S" timeZone:nil locale:nil];
     return true;