Merge 105226 - Ensure we don't cancel revalidation of a CachedResource

Source/WebCore/loader/SubresourceLoader.cpp

Index: Source/WebCore/loader/SubresourceLoader.cpp
===================================================================
--- Source/WebCore/loader/SubresourceLoader.cpp	(revision 105796)
+++ Source/WebCore/loader/SubresourceLoader.cpp	(working copy)
@@ -156,12 +156,9 @@
         if (response.httpStatusCode() == 304) {
             // 304 Not modified / Use local copy
             // Existing resource is ok, just use it updating the expiration time.
-            m_state = Revalidating;
             memoryCache()->revalidationSucceeded(m_resource, response);
-            if (!reachedTerminalState()) {
+            if (!reachedTerminalState())
                 ResourceLoader::didReceiveResponse(response);
-                didFinishLoading(monotonicallyIncreasingTime());
-            }
             return;
         }
         // Did not get 304 response, continue as a regular resource load.
@@ -244,7 +241,7 @@
 
 void SubresourceLoader::didFinishLoading(double finishTime)
 {
-    if (m_state != Initialized && m_state != Revalidating)
+    if (m_state != Initialized)
         return;
     ASSERT(!reachedTerminalState());
     ASSERT(!m_resource->resourceToRevalidate());