Changeset 195162 in webkit

Timestamp:

Jan 15, 2016, 6:08:08 PM (11 years ago)

Author:

jiewen_tan@apple.com

Message:

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.

Source/WebCore:

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.

LayoutTests:

• 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.

Location:

trunk

Files:

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

trunk/LayoutTests/ChangeLog

@@ +1 @@
+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-15  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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-15  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/loader/DocumentLoader.cpp

@@ -663 +663 @@
 
     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);

trunk/Source/WebCore/loader/cache/CachedRawResource.h

@@ -49 +49 @@
     bool canReuse(const ResourceRequest&) const;
 
+    bool wasRedirected() const { return !m_redirectChain.isEmpty(); };
+
 private:
     virtual void didAddClient(CachedResourceClient*) override;