Merge 102602 - Source/WebCore: A SubresourceLoader in the middle of revalidating

Source/WebCore/loader/SubresourceLoader.cpp

 /*
  * Copyright (C) 2006, 2007, 2009 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer. 
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 138 matching lines @@
     ASSERT(!response.isNull());
 
     // Reference the object in this method since the additional processing can do
     // anything including removing the last reference to this object; one example of this is 3266216.
     RefPtr<SubresourceLoader> protect(this);
 
     if (m_resource->resourceToRevalidate()) {
         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);
-            ResourceLoader::didReceiveResponse(response);
+            if (!reachedTerminalState()) {
+                ResourceLoader::didReceiveResponse(response);
+                didFinishLoading(currentTime());
+            }
             return;
         } 
         // Did not get 304 response, continue as a regular resource load.
         memoryCache()->revalidationFailed(m_resource);
     }
 
     m_resource->setResponse(response);
     if (reachedTerminalState())
         return;
     ResourceLoader::didReceiveResponse(response);
@@ skipping 62 matching lines @@
 }
 
 void SubresourceLoader::didReceiveCachedMetadata(const char* data, int length)
 {
     ASSERT(!m_resource->resourceToRevalidate());
     m_resource->setSerializedCachedMetadata(data, length);
 }
 
 void SubresourceLoader::didFinishLoading(double finishTime)
 {
-    if (m_state != Initialized)
+    if (m_state != Initialized && m_state != Revalidating)
         return;
     ASSERT(!reachedTerminalState());
     ASSERT(!m_resource->resourceToRevalidate());
     ASSERT(!m_resource->errorOccurred());
     LOG(ResourceLoading, "Received '%s'.", m_resource->url().string().latin1().data());
 
     RefPtr<SubresourceLoader> protect(this);
     CachedResourceHandle<CachedResource> protectResource(m_resource);
     m_state = Finishing;
     m_resource->setLoadFinishTime(finishTime);
@@ skipping 44 matching lines @@
         if (reachedTerminalState())
             return;
         m_resource->stopLoading();
         m_documentLoader->removeSubresourceLoader(this);
     }
     m_document = 0;
     ResourceLoader::releaseResources();
 }
 
 }