Changeset 79110 in webkit

Timestamp:

Feb 19, 2011 12:39:38 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-02-19 Bill Budge <​bbudge@chromium.org>

Reviewed by David Levin.

ThreadableLoaderClient needs willSendRequest method
​https://bugs.webkit.org/show_bug.cgi?id=54688

No new tests. Exposes no new functionality

• WebCore.gypi:
• loader/DocumentThreadableLoader.cpp: (WebCore::DocumentThreadableLoader::willSendRequest): (WebCore::DocumentThreadableLoader::didReceiveData): (WebCore::DocumentThreadableLoader::didReceiveCachedMetadata):
• loader/DocumentThreadableLoaderClient.h: Added. (WebCore::DocumentThreadableLoaderClient::isDocumentThreadableLoaderClient): (WebCore::DocumentThreadableLoaderClient::willSendRequest):
• loader/ThreadableLoaderClient.h: (WebCore::ThreadableLoaderClient::isDocumentThreadableLoaderClient):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• WebCore.gypi (modified) (1 diff)
• loader/DocumentThreadableLoader.cpp (modified) (6 diffs)
• loader/DocumentThreadableLoaderClient.h (copied) (copied from trunk/Source/WebCore/loader/ThreadableLoaderClient.h) (2 diffs)
• loader/ThreadableLoaderClient.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-02-19  Bill Budge  <bbudge@chromium.org>
+
+        Reviewed by David Levin.
+
+        ThreadableLoaderClient needs willSendRequest method
+        https://bugs.webkit.org/show_bug.cgi?id=54688
+
+        No new tests. Exposes no new functionality
+
+        * WebCore.gypi:
+        * loader/DocumentThreadableLoader.cpp:
+        (WebCore::DocumentThreadableLoader::willSendRequest):
+        (WebCore::DocumentThreadableLoader::didReceiveData):
+        (WebCore::DocumentThreadableLoader::didReceiveCachedMetadata):
+        * loader/DocumentThreadableLoaderClient.h: Added.
+        (WebCore::DocumentThreadableLoaderClient::isDocumentThreadableLoaderClient):
+        (WebCore::DocumentThreadableLoaderClient::willSendRequest):
+        * loader/ThreadableLoaderClient.h:
+        (WebCore::ThreadableLoaderClient::isDocumentThreadableLoaderClient):
+
 2011-02-19  Charlie Reis  <creis@chromium.org>
 

trunk/Source/WebCore/WebCore.gypi

@@ -2161 +2161 @@
             'loader/DocumentThreadableLoader.cpp',
             'loader/DocumentThreadableLoader.h',
+            'loader/DocumentThreadableLoaderClient.h',
             'loader/DocumentWriter.cpp',
             'loader/DocumentWriter.h',

trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2009 Google Inc. All rights reserved.
+ * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -36 +36 @@
 #include "CrossOriginPreflightResultCache.h"
 #include "Document.h"
+#include "DocumentThreadableLoaderClient.h"
 #include "Frame.h"
 #include "FrameLoader.h"
@@ -173 +174 @@
 }
 
-void DocumentThreadableLoader::willSendRequest(SubresourceLoader* loader, ResourceRequest& request, const ResourceResponse&)
+void DocumentThreadableLoader::willSendRequest(SubresourceLoader* loader, ResourceRequest& request, const ResourceResponse& redirectResponse)
 {
     ASSERT(m_client);
@@ -182 +183 @@
         m_client->didFailRedirectCheck();
         request = ResourceRequest();
+    } else {
+        if (m_client->isDocumentThreadableLoaderClient())
+            static_cast<DocumentThreadableLoaderClient*>(m_client)->willSendRequest(request, redirectResponse);
     }
 }
@@ -231 +235 @@
     ASSERT_UNUSED(loader, loader == m_loader);
 
-    // Ignore response body of preflight requests.
+    // Preflight data should be invisible to clients.
     if (m_actualRequest)
         return;
@@ -243 +247 @@
     ASSERT_UNUSED(loader, loader == m_loader);
 
-    // Ignore response body of preflight requests.
-    if (!m_actualRequest)
-        m_client->didReceiveCachedMetadata(data, lengthReceived);
+    // Preflight data should be invisible to clients.
+    if (m_actualRequest)
+        return;
+
+    m_client->didReceiveCachedMetadata(data, lengthReceived);
 }
 

trunk/Source/WebCore/loader/DocumentThreadableLoaderClient.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2009 Google Inc. All rights reserved.
+ * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -29 +29 @@
  */
 
-#ifndef ThreadableLoaderClient_h
-#define ThreadableLoaderClient_h
+#ifndef DocumentThreadableLoaderClient_h
+#define DocumentThreadableLoaderClient_h
 
+#include "ThreadableLoaderClient.h"
 
 namespace WebCore {
 
-    class ResourceError;
-    class ResourceResponse;
+class ResourceRequest;
+class ResourceResponse;
 
-    class ThreadableLoaderClient {
-        WTF_MAKE_NONCOPYABLE(ThreadableLoaderClient); WTF_MAKE_FAST_ALLOCATED;
-    public:
-        virtual void didSendData(unsigned long long /*bytesSent*/, unsigned long long /*totalBytesToBeSent*/) { }
+class DocumentThreadableLoaderClient : public ThreadableLoaderClient {
+    WTF_MAKE_NONCOPYABLE(DocumentThreadableLoaderClient);
+    WTF_MAKE_FAST_ALLOCATED;
+public:
+    virtual bool isDocumentThreadableLoaderClient() { return true; }
 
-        virtual void didReceiveResponse(const ResourceResponse&) { }
-        virtual void didReceiveData(const char*, int /*dataLength*/) { }
-        virtual void didReceiveCachedMetadata(const char*, int /*dataLength*/) { }
-        virtual void didFinishLoading(unsigned long /*identifier*/, double /*finishTime*/) { }
-        virtual void didFail(const ResourceError&) { }
-        virtual void didFailRedirectCheck() { }
-
-        virtual void didReceiveAuthenticationCancellation(const ResourceResponse&) { }
-
-    protected:
-        ThreadableLoaderClient() { }
-        virtual ~ThreadableLoaderClient() { }
-    };
+    virtual void willSendRequest(ResourceRequest& /*newRequest*/, const ResourceResponse& /*redirectResponse*/) { }
+};
 
 } // namespace WebCore
 
-#endif // ThreadableLoaderClient_h
+#endif // DocumentThreadableLoaderClient_h

trunk/Source/WebCore/loader/ThreadableLoaderClient.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2009 Google Inc. All rights reserved.
+ * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -52 +52 @@
         virtual void didReceiveAuthenticationCancellation(const ResourceResponse&) { }
 
+        virtual bool isDocumentThreadableLoaderClient() { return false; }
+
     protected:
         ThreadableLoaderClient() { }