Changeset 195399 in webkit

Timestamp:

Jan 20, 2016, 11:11:18 PM (11 years ago)

Author:

bshafiei@apple.com

Message:

Merged r195162. rdar://problem/23978912

Location:

branches/safari-601.1.46-branch

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/loading/resources/server-redirect-result.html (copied) (copied from trunk/LayoutTests/http/tests/loading/resources/server-redirect-result.html )
• LayoutTests/http/tests/loading/resources/server-redirect.php (copied) (copied from trunk/LayoutTests/http/tests/loading/resources/server-redirect.php )
• LayoutTests/http/tests/loading/server-redirect-for-provisional-load-caching-expected.txt (copied) (copied from trunk/LayoutTests/http/tests/loading/server-redirect-for-provisional-load-caching-expected.txt )
• LayoutTests/http/tests/loading/server-redirect-for-provisional-load-caching.html (copied) (copied from trunk/LayoutTests/http/tests/loading/server-redirect-for-provisional-load-caching.html )
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/loader/DocumentLoader.cpp (modified) (1 diff)
• Source/WebCore/loader/cache/CachedRawResource.h (modified) (1 diff)

branches/safari-601.1.46-branch/LayoutTests/ChangeLog

@@ +1 @@
+2016-01-20  Babak Shafiei  <bshafiei@apple.com>
+
+        Merge r195162.
+
+    2016-01-15  Jiewen Tan  <jiewen_tan@apple.com>
+
+            FrameLoaderClient::didReceiveServerRedirectForProvisionalLoadForFrame() is never called when loading a main resource from the memory cache
+            https://bugs.webkit.org/show_bug.cgi?id=152520
+            <rdar://problem/23305737>
+
+            Reviewed by Andy Estes.
+
+            * http/tests/loading/resources/server-redirect-result.html: Added.
+            * http/tests/loading/resources/server-redirect.php: Added.
+            * http/tests/loading/server-redirect-for-provisional-load-caching-expected.txt: Added.
+            * http/tests/loading/server-redirect-for-provisional-load-caching.html: Added.
+
 2016-01-20  Matthew Hanson  <matthew_hanson@apple.com>
 

branches/safari-601.1.46-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2016-01-20  Babak Shafiei  <bshafiei@apple.com>
+
+        Merge r195162.
+
+    2016-01-15  Jiewen Tan  <jiewen_tan@apple.com>
+
+            FrameLoaderClient::didReceiveServerRedirectForProvisionalLoadForFrame() is never called when loading a main resource from the memory cache
+            https://bugs.webkit.org/show_bug.cgi?id=152520
+            <rdar://problem/23305737>
+
+            Reviewed by Andy Estes.
+
+            Test: http/tests/loading/server-redirect-for-provisional-load-caching.html
+
+            * loader/DocumentLoader.cpp:
+            (WebCore::DocumentLoader::responseReceived):
+            Dispatch message to notify client that a cached resource was redirected. So,
+            client can make proper actions to treat server side redirection.
+            * loader/cache/CachedRawResource.h:
+            Add a method to tell whether the cached resource was redirected.
+
 2016-01-20  Timothy Hatcher  <timothy@apple.com>
 

branches/safari-601.1.46-branch/Source/WebCore/loader/DocumentLoader.cpp

@@ -664 +664 @@
 
     if (m_identifierForLoadWithoutResourceLoader) {
+        if (m_mainResource && m_mainResource->wasRedirected()) {
+            ASSERT(m_mainResource->status() == CachedResource::Status::Cached);
+            frameLoader()->client().dispatchDidReceiveServerRedirectForProvisionalLoad();
+        }
         addResponse(m_response);
         frameLoader()->notifier().dispatchDidReceiveResponse(this, m_identifierForLoadWithoutResourceLoader, m_response, 0);

branches/safari-601.1.46-branch/Source/WebCore/loader/cache/CachedRawResource.h

@@ -46 +46 @@
 
     void clear();
+
+    bool wasRedirected() const { return !m_redirectChain.isEmpty(); };
 
 private: