Modified: trunk/Source/WebKit2/ChangeLog (134089 => 134090)
--- trunk/Source/WebKit2/ChangeLog 2012-11-09 19:10:54 UTC (rev 134089)
+++ trunk/Source/WebKit2/ChangeLog 2012-11-09 19:15:32 UTC (rev 134090)
@@ -1,3 +1,33 @@
+2012-11-09 Brady Eidson <[email protected]>
+
+ NetworkRequest refactoring
+ https://bugs.webkit.org/show_bug.cgi?id=101777
+
+ Reviewed by Alexey Proskuryakov.
+
+ Move all of the ResourceHandleClient stubs from the .h to the .cpp in one patch
+ to make future patches cleaner.
+
+ Also completely remove the declaration for shouldCacheResponse() for now.
+
+ * NetworkProcess/NetworkRequest.cpp:
+ (WebKit::NetworkRequest::willSendRequest):
+ (WebKit::NetworkRequest::didSendData):
+ (WebKit::NetworkRequest::didReceiveCachedMetadata):
+ (WebKit::NetworkRequest::wasBlocked):
+ (WebKit::NetworkRequest::cannotShowURL):
+ (WebKit::NetworkRequest::willCacheResponse):
+ (WebKit::NetworkRequest::shouldUseCredentialStorage):
+ (WebKit::NetworkRequest::didReceiveAuthenticationChallenge):
+ (WebKit::NetworkRequest::didCancelAuthenticationChallenge):
+ (WebKit::NetworkRequest::receivedCancellation):
+ (WebKit::NetworkRequest::canAuthenticateAgainstProtectionSpace):
+ (WebKit::NetworkRequest::supportsDataArray):
+ (WebKit::NetworkRequest::didReceiveDataArray):
+ (WebKit::NetworkRequest::willStopBufferingData):
+ (WebKit::NetworkRequest::createAsyncFileStream):
+ * NetworkProcess/NetworkRequest.h:
+
2012-11-09 Alexey Proskuryakov <[email protected]>
CookieJar uses Document class, which is a layering violation
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkRequest.cpp (134089 => 134090)
--- trunk/Source/WebKit2/NetworkProcess/NetworkRequest.cpp 2012-11-09 19:10:54 UTC (rev 134089)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkRequest.cpp 2012-11-09 19:15:32 UTC (rev 134090)
@@ -35,6 +35,7 @@
#include "RemoteNetworkingContext.h"
#include "SharedMemory.h"
#include "WebCoreArgumentCoders.h"
+#include <WebCore/NotImplemented.h>
#include <WebCore/ResourceBuffer.h>
#include <WebCore/ResourceHandle.h>
#include <wtf/MainThread.h>
@@ -180,6 +181,110 @@
scheduleStopOnMainThread();
}
+// FIXME (NetworkProcess): Many of the following ResourceHandleClient methods definitely need implementations. A few will not.
+// Once we know what they are they can be removed.
+
+void NetworkRequest::willSendRequest(WebCore::ResourceHandle*, WebCore::ResourceRequest&, const WebCore::ResourceResponse& /*redirectResponse*/)
+{
+ notImplemented();
+}
+
+void NetworkRequest::didSendData(WebCore::ResourceHandle*, unsigned long long /*bytesSent*/, unsigned long long /*totalBytesToBeSent*/)
+{
+ notImplemented();
+}
+
+void NetworkRequest::didReceiveCachedMetadata(WebCore::ResourceHandle*, const char*, int)
+{
+ notImplemented();
+}
+
+void NetworkRequest::wasBlocked(WebCore::ResourceHandle*)
+{
+ notImplemented();
+}
+
+void NetworkRequest::cannotShowURL(WebCore::ResourceHandle*)
+{
+ notImplemented();
+}
+
+void NetworkRequest::willCacheResponse(WebCore::ResourceHandle*, WebCore::CacheStoragePolicy&)
+{
+ notImplemented();
+}
+
+bool NetworkRequest::shouldUseCredentialStorage(WebCore::ResourceHandle*)
+{
+ notImplemented();
+ return false;
+}
+
+void NetworkRequest::didReceiveAuthenticationChallenge(WebCore::ResourceHandle*, const WebCore::AuthenticationChallenge&)
+{
+ notImplemented();
+}
+
+void NetworkRequest::didCancelAuthenticationChallenge(WebCore::ResourceHandle*, const WebCore::AuthenticationChallenge&)
+{
+ notImplemented();
+}
+
+void NetworkRequest::receivedCancellation(WebCore::ResourceHandle*, const WebCore::AuthenticationChallenge&)
+{
+ notImplemented();
+}
+
+#if USE(PROTECTION_SPACE_AUTH_CALLBACK)
+bool NetworkRequest::canAuthenticateAgainstProtectionSpace(WebCore::ResourceHandle*, const WebCore::ProtectionSpace&)
+{
+ notImplemented();
+ return false;
+}
+#endif
+
+#if HAVE(NETWORK_CFDATA_ARRAY_CALLBACK)
+bool NetworkRequest::supportsDataArray()
+{
+ notImplemented();
+ return false;
+}
+
+void NetworkRequest::didReceiveDataArray(WebCore::ResourceHandle*, CFArrayRef)
+{
+ notImplemented();
+}
+#endif
+
+#if PLATFORM(MAC)
+#if USE(CFNETWORK)
+CFCachedURLResponseRef NetworkRequest::willCacheResponse(WebCore::ResourceHandle*, CFCachedURLResponseRef response)
+{
+ notImplemented();
+ return response;
+}
+#else
+NSCachedURLResponse* NetworkRequest::willCacheResponse(WebCore::ResourceHandle*, NSCachedURLResponse* response)
+{
+ notImplemented();
+ return response;
+}
+#endif
+
+void NetworkRequest::willStopBufferingData(WebCore::ResourceHandle*, const char*, int)
+{
+ notImplemented();
+}
+#endif // PLATFORM(MAC)
+
+#if ENABLE(BLOB)
+WebCore::AsyncFileStream* NetworkRequest::createAsyncFileStream(WebCore::FileStreamClient*)
+{
+ notImplemented();
+ return 0;
+}
+#endif
+
} // namespace WebKit
#endif // ENABLE(NETWORK_PROCESS)
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkRequest.h (134089 => 134090)
--- trunk/Source/WebKit2/NetworkProcess/NetworkRequest.h 2012-11-09 19:10:54 UTC (rev 134089)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkRequest.h 2012-11-09 19:15:32 UTC (rev 134090)
@@ -60,42 +60,41 @@
NetworkConnectionToWebProcess* connectionToWebProcess() { return m_connection.get(); }
// ResourceHandleClient methods
- virtual void willSendRequest(WebCore::ResourceHandle*, WebCore::ResourceRequest&, const WebCore::ResourceResponse& /*redirectResponse*/) OVERRIDE { }
- virtual void didSendData(WebCore::ResourceHandle*, unsigned long long /*bytesSent*/, unsigned long long /*totalBytesToBeSent*/) OVERRIDE { }
+ virtual void willSendRequest(WebCore::ResourceHandle*, WebCore::ResourceRequest&, const WebCore::ResourceResponse& /*redirectResponse*/) OVERRIDE;
+ virtual void didSendData(WebCore::ResourceHandle*, unsigned long long /*bytesSent*/, unsigned long long /*totalBytesToBeSent*/) OVERRIDE;
virtual void didReceiveResponse(WebCore::ResourceHandle*, const WebCore::ResourceResponse&) OVERRIDE;
virtual void didReceiveData(WebCore::ResourceHandle*, const char*, int, int /*encodedDataLength*/) OVERRIDE;
- virtual void didReceiveCachedMetadata(WebCore::ResourceHandle*, const char*, int) OVERRIDE { }
+ virtual void didReceiveCachedMetadata(WebCore::ResourceHandle*, const char*, int) OVERRIDE;
virtual void didFinishLoading(WebCore::ResourceHandle*, double /*finishTime*/) OVERRIDE;
virtual void didFail(WebCore::ResourceHandle*, const WebCore::ResourceError&) OVERRIDE;
- virtual void wasBlocked(WebCore::ResourceHandle*) OVERRIDE { }
- virtual void cannotShowURL(WebCore::ResourceHandle*) OVERRIDE { }
-#if HAVE(NETWORK_CFDATA_ARRAY_CALLBACK)
- virtual bool supportsDataArray() OVERRIDE { return false; }
- virtual void didReceiveDataArray(WebCore::ResourceHandle*, CFArrayRef) OVERRIDE { }
-#endif
- virtual void willCacheResponse(WebCore::ResourceHandle*, WebCore::CacheStoragePolicy&) OVERRIDE { }
- virtual bool shouldUseCredentialStorage(WebCore::ResourceHandle*) OVERRIDE { return false; }
- virtual void didReceiveAuthenticationChallenge(WebCore::ResourceHandle*, const WebCore::AuthenticationChallenge&) OVERRIDE { }
- virtual void didCancelAuthenticationChallenge(WebCore::ResourceHandle*, const WebCore::AuthenticationChallenge&) OVERRIDE { }
+ virtual void wasBlocked(WebCore::ResourceHandle*) OVERRIDE;
+ virtual void cannotShowURL(WebCore::ResourceHandle*) OVERRIDE;
+ virtual void willCacheResponse(WebCore::ResourceHandle*, WebCore::CacheStoragePolicy&) OVERRIDE;
+ virtual bool shouldUseCredentialStorage(WebCore::ResourceHandle*) OVERRIDE;
+ virtual void didReceiveAuthenticationChallenge(WebCore::ResourceHandle*, const WebCore::AuthenticationChallenge&) OVERRIDE;
+ virtual void didCancelAuthenticationChallenge(WebCore::ResourceHandle*, const WebCore::AuthenticationChallenge&) OVERRIDE;
+ virtual void receivedCancellation(WebCore::ResourceHandle*, const WebCore::AuthenticationChallenge&) OVERRIDE;
+
#if USE(PROTECTION_SPACE_AUTH_CALLBACK)
- virtual bool canAuthenticateAgainstProtectionSpace(WebCore::ResourceHandle*, const WebCore::ProtectionSpace&) OVERRIDE { return false; }
+ virtual bool canAuthenticateAgainstProtectionSpace(WebCore::ResourceHandle*, const WebCore::ProtectionSpace&) OVERRIDE;
#endif
- virtual void receivedCancellation(WebCore::ResourceHandle*, const WebCore::AuthenticationChallenge&) OVERRIDE { }
+
+#if HAVE(NETWORK_CFDATA_ARRAY_CALLBACK)
+ virtual bool supportsDataArray() OVERRIDE;
+ virtual void didReceiveDataArray(WebCore::ResourceHandle*, CFArrayRef) OVERRIDE;
+#endif
+
#if PLATFORM(MAC)
#if USE(CFNETWORK)
- virtual CFCachedURLResponseRef willCacheResponse(WebCore::ResourceHandle*, CFCachedURLResponseRef response) OVERRIDE { return response; }
+ virtual CFCachedURLResponseRef willCacheResponse(WebCore::ResourceHandle*, CFCachedURLResponseRef) OVERRIDE;
#else
- virtual NSCachedURLResponse* willCacheResponse(WebCore::ResourceHandle*, NSCachedURLResponse* response) OVERRIDE { return response; }
+ virtual NSCachedURLResponse* willCacheResponse(WebCore::ResourceHandle*, NSCachedURLResponse*) OVERRIDE;
#endif
- virtual void willStopBufferingData(WebCore::ResourceHandle*, const char*, int) OVERRIDE { }
+ virtual void willStopBufferingData(WebCore::ResourceHandle*, const char*, int) OVERRIDE;
#endif // PLATFORM(MAC)
-#if PLATFORM(WIN) && USE(CFNETWORK)
- virtual bool shouldCacheResponse(WebCore::ResourceHandle*, CFCachedURLResponseRef) OVERRIDE { return true; }
-#endif
-
#if ENABLE(BLOB)
- virtual WebCore::AsyncFileStream* createAsyncFileStream(WebCore::FileStreamClient*) OVERRIDE { return 0; }
+ virtual WebCore::AsyncFileStream* createAsyncFileStream(WebCore::FileStreamClient*) OVERRIDE;
#endif
private:
