Diff
Modified: trunk/Source/WebCore/ChangeLog (163904 => 163905)
--- trunk/Source/WebCore/ChangeLog 2014-02-11 21:28:51 UTC (rev 163904)
+++ trunk/Source/WebCore/ChangeLog 2014-02-11 21:28:55 UTC (rev 163905)
@@ -1,5 +1,20 @@
2014-02-11 Andy Estes <aes...@apple.com>
+ [Mac] connection:willStopBufferingData: no longer exists in NSURLConnectionDelegate
+ https://bugs.webkit.org/show_bug.cgi?id=128583
+
+ Reviewed by Anders Carlsson.
+
+ The delegate method was removed in Snow Leopard.
+
+ * loader/ResourceLoader.cpp:
+ * loader/ResourceLoader.h:
+ * platform/network/ResourceHandleClient.h:
+ * platform/network/mac/WebCoreResourceHandleAsDelegate.mm:
+ * platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm:
+
+2014-02-10 Andy Estes <aes...@apple.com>
+
[Content Filter] Check for NULL before calling dispatch_release()
https://bugs.webkit.org/show_bug.cgi?id=128576
Modified: trunk/Source/WebCore/loader/ResourceLoader.cpp (163904 => 163905)
--- trunk/Source/WebCore/loader/ResourceLoader.cpp 2014-02-11 21:28:51 UTC (rev 163904)
+++ trunk/Source/WebCore/loader/ResourceLoader.cpp 2014-02-11 21:28:55 UTC (rev 163905)
@@ -342,15 +342,6 @@
frameLoader()->notifier().didReceiveData(this, buffer ? buffer->data() : data, buffer ? buffer->size() : length, static_cast<int>(encodedDataLength));
}
-void ResourceLoader::willStopBufferingData(const char* data, unsigned length)
-{
- if (m_options.dataBufferingPolicy == DoNotBufferData)
- return;
-
- ASSERT(!m_resourceData);
- m_resourceData = ResourceBuffer::create(data, length);
-}
-
void ResourceLoader::didFinishLoading(double finishTime)
{
didFinishLoadingOnePart(finishTime);
Modified: trunk/Source/WebCore/loader/ResourceLoader.h (163904 => 163905)
--- trunk/Source/WebCore/loader/ResourceLoader.h 2014-02-11 21:28:51 UTC (rev 163904)
+++ trunk/Source/WebCore/loader/ResourceLoader.h 2014-02-11 21:28:55 UTC (rev 163905)
@@ -94,7 +94,6 @@
virtual void didReceiveResponse(const ResourceResponse&);
virtual void didReceiveData(const char*, unsigned, long long encodedDataLength, DataPayloadType);
virtual void didReceiveBuffer(PassRefPtr<SharedBuffer>, long long encodedDataLength, DataPayloadType);
- void willStopBufferingData(const char*, unsigned);
virtual void didFinishLoading(double finishTime);
virtual void didFail(const ResourceError&);
#if USE(NETWORK_CFDATA_ARRAY_CALLBACK)
@@ -120,9 +119,6 @@
virtual void didFail(ResourceHandle*, const ResourceError&) override;
virtual void wasBlocked(ResourceHandle*) override;
virtual void cannotShowURL(ResourceHandle*) override;
-#if PLATFORM(COCOA) && !USE(CFNETWORK)
- virtual void willStopBufferingData(ResourceHandle*, const char* data, unsigned length) override { willStopBufferingData(data, length); }
-#endif
virtual bool shouldUseCredentialStorage(ResourceHandle*) override { return shouldUseCredentialStorage(); }
virtual void didReceiveAuthenticationChallenge(ResourceHandle*, const AuthenticationChallenge& challenge) override { didReceiveAuthenticationChallenge(challenge); }
virtual void didCancelAuthenticationChallenge(ResourceHandle*, const AuthenticationChallenge& challenge) override { didCancelAuthenticationChallenge(challenge); }
Modified: trunk/Source/WebCore/platform/network/ResourceHandleClient.h (163904 => 163905)
--- trunk/Source/WebCore/platform/network/ResourceHandleClient.h 2014-02-11 21:28:51 UTC (rev 163904)
+++ trunk/Source/WebCore/platform/network/ResourceHandleClient.h 2014-02-11 21:28:55 UTC (rev 163905)
@@ -122,7 +122,6 @@
#elif PLATFORM(COCOA)
virtual NSCachedURLResponse *willCacheResponse(ResourceHandle*, NSCachedURLResponse *response) { return response; }
- virtual void willStopBufferingData(ResourceHandle*, const char*, unsigned) { }
#endif
};
Modified: trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsDelegate.mm (163904 => 163905)
--- trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsDelegate.mm 2014-02-11 21:28:51 UTC (rev 163904)
+++ trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsDelegate.mm 2014-02-11 21:28:55 UTC (rev 163905)
@@ -224,20 +224,6 @@
m_handle->client()->didReceiveBuffer(m_handle, SharedBuffer::wrapNSData(data), -1);
}
-- (void)connection:(NSURLConnection *)connection willStopBufferingData:(NSData *)data
-{
- UNUSED_PARAM(connection);
-
- LOG(Network, "Handle %p delegate connection:%p willStopBufferingData:%p", m_handle, connection, data);
-
- if (!m_handle || !m_handle->client())
- return;
- // FIXME: If we get a resource with more than 2B bytes, this code won't do the right thing.
- // However, with today's computers and networking speeds, this won't happen in practice.
- // Could be an issue with a giant local file.
- m_handle->client()->willStopBufferingData(m_handle, (const char*)[data bytes], static_cast<unsigned>([data length]));
-}
-
- (void)connection:(NSURLConnection *)connection didSendBodyData:(NSInteger)bytesWritten totalBytesWritten:(NSInteger)totalBytesWritten totalBytesExpectedToWrite:(NSInteger)totalBytesExpectedToWrite
{
UNUSED_PARAM(connection);
Modified: trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm (163904 => 163905)
--- trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm 2014-02-11 21:28:51 UTC (rev 163904)
+++ trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm 2014-02-11 21:28:55 UTC (rev 163905)
@@ -290,23 +290,6 @@
});
}
-- (void)connection:(NSURLConnection *)connection willStopBufferingData:(NSData *)data
-{
- ASSERT(!isMainThread());
- UNUSED_PARAM(connection);
-
- LOG(Network, "Handle %p delegate connection:%p willStopBufferingData:%p", m_handle, connection, data);
-
- dispatch_async(dispatch_get_main_queue(), ^{
- if (!m_handle || !m_handle->client())
- return;
- // FIXME: If we get a resource with more than 2B bytes, this code won't do the right thing.
- // However, with today's computers and networking speeds, this won't happen in practice.
- // Could be an issue with a giant local file.
- m_handle->client()->willStopBufferingData(m_handle, (const char*)[data bytes], static_cast<unsigned>([data length]));
- });
-}
-
- (void)connection:(NSURLConnection *)connection didSendBodyData:(NSInteger)bytesWritten totalBytesWritten:(NSInteger)totalBytesWritten totalBytesExpectedToWrite:(NSInteger)totalBytesExpectedToWrite
{
ASSERT(!isMainThread());
Modified: trunk/Source/WebKit/mac/ChangeLog (163904 => 163905)
--- trunk/Source/WebKit/mac/ChangeLog 2014-02-11 21:28:51 UTC (rev 163904)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-02-11 21:28:55 UTC (rev 163905)
@@ -1,3 +1,14 @@
+2014-02-11 Andy Estes <aes...@apple.com>
+
+ [Mac] connection:willStopBufferingData: no longer exists in NSURLConnectionDelegate
+ https://bugs.webkit.org/show_bug.cgi?id=128583
+
+ Reviewed by Anders Carlsson.
+
+ The delegate method was removed in Snow Leopard.
+
+ * Misc/WebDownload.mm:
+
2014-02-11 Alexey Proskuryakov <a...@apple.com>
iOS build fix.
Modified: trunk/Source/WebKit/mac/Misc/WebDownload.mm (163904 => 163905)
--- trunk/Source/WebKit/mac/Misc/WebDownload.mm 2014-02-11 21:28:51 UTC (rev 163904)
+++ trunk/Source/WebKit/mac/Misc/WebDownload.mm 2014-02-11 21:28:55 UTC (rev 163905)
@@ -262,13 +262,4 @@
return [super _initWithRequest:request delegate:_webInternal directory:directory];
}
-- (void)connection:(NSURLConnection *)connection willStopBufferingData:(NSData *)data
-{
- // NSURLConnection calls this method even if it is not implemented.
- // This happens because NSURLConnection caches the results of respondsToSelector.
- // Those results become invalid when the delegate of NSURLConnectionDelegateProxy is changed.
- // This is a workaround since this problem needs to be fixed in NSURLConnectionDelegateProxy.
- // <rdar://problem/3913270> NSURLConnection calls unimplemented delegate method in WebDownload
-}
-
@end
Modified: trunk/Source/WebKit2/ChangeLog (163904 => 163905)
--- trunk/Source/WebKit2/ChangeLog 2014-02-11 21:28:51 UTC (rev 163904)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-11 21:28:55 UTC (rev 163905)
@@ -1,3 +1,15 @@
+2014-02-11 Andy Estes <aes...@apple.com>
+
+ [Mac] connection:willStopBufferingData: no longer exists in NSURLConnectionDelegate
+ https://bugs.webkit.org/show_bug.cgi?id=128583
+
+ Reviewed by Anders Carlsson.
+
+ The delegate method was removed in Snow Leopard.
+
+ * NetworkProcess/NetworkResourceLoader.cpp:
+ * NetworkProcess/NetworkResourceLoader.h:
+
2014-02-11 Brady Eidson <beid...@apple.com>
IndexedDB tests on some bots are flakey (timeouts)
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp (163904 => 163905)
--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2014-02-11 21:28:51 UTC (rev 163904)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2014-02-11 21:28:55 UTC (rev 163905)
@@ -405,13 +405,6 @@
}
#endif
-#if PLATFORM(MAC) && !PLATFORM(IOS)
-void NetworkResourceLoader::willStopBufferingData(ResourceHandle*, const char*, unsigned)
-{
- notImplemented();
-}
-#endif // PLATFORM(MAC)
-
} // namespace WebKit
#endif // ENABLE(NETWORK_PROCESS)
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h (163904 => 163905)
--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h 2014-02-11 21:28:51 UTC (rev 163904)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h 2014-02-11 21:28:55 UTC (rev 163905)
@@ -108,7 +108,6 @@
static size_t fileBackedResourceMinimumSize();
#if !PLATFORM(IOS)
virtual void willCacheResponseAsync(WebCore::ResourceHandle*, NSCachedURLResponse *) override;
- virtual void willStopBufferingData(WebCore::ResourceHandle*, const char*, unsigned) override;
#endif
#endif // PLATFORM(MAC)
