Diff
Modified: trunk/Source/WebCore/ChangeLog (95119 => 95120)
--- trunk/Source/WebCore/ChangeLog 2011-09-14 20:59:11 UTC (rev 95119)
+++ trunk/Source/WebCore/ChangeLog 2011-09-14 21:03:20 UTC (rev 95120)
@@ -1,3 +1,24 @@
+2011-09-14 Anders Carlsson <ander...@apple.com>
+
+ Get rid of ResourceHandle::bufferedData()
+ https://bugs.webkit.org/show_bug.cgi?id=68112
+
+ Reviewed by David Hyatt.
+
+ ResourceHandle::bufferedData() was only implemented on Mac, and the support in the underlying
+ NSURLConnection class hasn't been there for several OS releases.
+
+ * loader/ResourceLoader.cpp:
+ (WebCore::ResourceLoader::resourceData):
+ (WebCore::ResourceLoader::addData):
+ * platform/network/ResourceHandle.h:
+ * platform/network/cf/ResourceHandleCFNet.cpp:
+ * platform/network/curl/ResourceHandleCurl.cpp:
+ * platform/network/mac/ResourceHandleMac.mm:
+ * platform/network/qt/ResourceHandleQt.cpp:
+ * platform/network/soup/ResourceHandleSoup.cpp:
+ * platform/network/win/ResourceHandleWin.cpp:
+
2011-09-14 Mark Hahnenberg <mhahnenb...@apple.com>
REGRESSION: r95108 broke Qt Linux tests
Modified: trunk/Source/WebCore/loader/ResourceLoader.cpp (95119 => 95120)
--- trunk/Source/WebCore/loader/ResourceLoader.cpp 2011-09-14 20:59:11 UTC (rev 95119)
+++ trunk/Source/WebCore/loader/ResourceLoader.cpp 2011-09-14 21:03:20 UTC (rev 95120)
@@ -49,13 +49,7 @@
PassRefPtr<SharedBuffer> ResourceLoader::resourceData()
{
- if (m_resourceData)
- return m_resourceData;
-
- if (ResourceHandle::supportsBufferedData() && m_handle)
- return m_handle->bufferedData();
-
- return 0;
+ return m_resourceData;
}
ResourceLoader::ResourceLoader(Frame* frame, ResourceLoaderOptions options)
@@ -202,16 +196,10 @@
return;
}
- if (ResourceHandle::supportsBufferedData()) {
- // Buffer data only if the connection has handed us the data because is has stopped buffering it.
- if (m_resourceData)
- m_resourceData->append(data, length);
- } else {
- if (!m_resourceData)
- m_resourceData = SharedBuffer::create(data, length);
- else
- m_resourceData->append(data, length);
- }
+ if (!m_resourceData)
+ m_resourceData = SharedBuffer::create(data, length);
+ else
+ m_resourceData->append(data, length);
}
void ResourceLoader::clearResourceData()
Modified: trunk/Source/WebCore/platform/network/ResourceHandle.h (95119 => 95120)
--- trunk/Source/WebCore/platform/network/ResourceHandle.h 2011-09-14 20:59:11 UTC (rev 95119)
+++ trunk/Source/WebCore/platform/network/ResourceHandle.h 2011-09-14 21:03:20 UTC (rev 95120)
@@ -158,9 +158,6 @@
static void setClientCertificate(const String& host, CFDataRef);
#endif
- PassRefPtr<SharedBuffer> bufferedData();
- static bool supportsBufferedData();
-
bool shouldContentSniff() const;
static bool shouldContentSniffURL(const KURL&);
Modified: trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp (95119 => 95120)
--- trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp 2011-09-14 20:59:11 UTC (rev 95119)
+++ trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp 2011-09-14 21:03:20 UTC (rev 95120)
@@ -526,17 +526,6 @@
}
}
-PassRefPtr<SharedBuffer> ResourceHandle::bufferedData()
-{
- ASSERT_NOT_REACHED();
- return 0;
-}
-
-bool ResourceHandle::supportsBufferedData()
-{
- return false;
-}
-
void ResourceHandle::willSendRequest(ResourceRequest& request, const ResourceResponse& redirectResponse)
{
const KURL& url = ""
Modified: trunk/Source/WebCore/platform/network/curl/ResourceHandleCurl.cpp (95119 => 95120)
--- trunk/Source/WebCore/platform/network/curl/ResourceHandleCurl.cpp 2011-09-14 20:59:11 UTC (rev 95119)
+++ trunk/Source/WebCore/platform/network/curl/ResourceHandleCurl.cpp 2011-09-14 21:03:20 UTC (rev 95120)
@@ -114,16 +114,6 @@
ResourceHandleManager::sharedInstance()->cancel(this);
}
-PassRefPtr<SharedBuffer> ResourceHandle::bufferedData()
-{
- return 0;
-}
-
-bool ResourceHandle::supportsBufferedData()
-{
- return false;
-}
-
#if PLATFORM(WIN) && USE(CF)
static HashSet<String>& allowsAnyHTTPSCertificateHosts()
{
Modified: trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm (95119 => 95120)
--- trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm 2011-09-14 20:59:11 UTC (rev 95119)
+++ trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm 2011-09-14 21:03:20 UTC (rev 95120)
@@ -71,10 +71,6 @@
- (void)setDelegate:(id<NSURLConnectionDelegate>)delegate;
@end
-@interface NSURLConnection (NSURLConnectionTigerPrivate)
-- (NSData *)_bufferedData;
-@end
-
@interface NSURLConnection (Details)
-(id)_initWithRequest:(NSURLRequest *)request delegate:(id)delegate usesCache:(BOOL)usesCacheFlag maxContentLength:(long long)maxContentLength startImmediately:(BOOL)startImmediately connectionProperties:(NSDictionary *)connectionProperties;
@end
@@ -374,20 +370,6 @@
d->m_delegate = nil;
}
-bool ResourceHandle::supportsBufferedData()
-{
- static bool supportsBufferedData = [NSURLConnection instancesRespondToSelector:@selector(_bufferedData)];
- return supportsBufferedData;
-}
-
-PassRefPtr<SharedBuffer> ResourceHandle::bufferedData()
-{
- if (ResourceHandle::supportsBufferedData())
- return SharedBuffer::wrapNSData([d->m_connection.get() _bufferedData]);
-
- return 0;
-}
-
id ResourceHandle::releaseProxy()
{
id proxy = [[d->m_proxy.get() retain] autorelease];
Modified: trunk/Source/WebCore/platform/network/qt/ResourceHandleQt.cpp (95119 => 95120)
--- trunk/Source/WebCore/platform/network/qt/ResourceHandleQt.cpp 2011-09-14 20:59:11 UTC (rev 95119)
+++ trunk/Source/WebCore/platform/network/qt/ResourceHandleQt.cpp 2011-09-14 21:03:20 UTC (rev 95120)
@@ -150,17 +150,6 @@
return false;
}
-bool ResourceHandle::supportsBufferedData()
-{
- return false;
-}
-
-PassRefPtr<SharedBuffer> ResourceHandle::bufferedData()
-{
- ASSERT_NOT_REACHED();
- return 0;
-}
-
void ResourceHandle::loadResourceSynchronously(NetworkingContext* context, const ResourceRequest& request, StoredCredentials /*storedCredentials*/, ResourceError& error, ResourceResponse& response, Vector<char>& data)
{
WebCoreSynchronousLoader syncLoader(error, response, data);
Modified: trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp (95119 => 95120)
--- trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp 2011-09-14 20:59:11 UTC (rev 95119)
+++ trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp 2011-09-14 21:03:20 UTC (rev 95120)
@@ -685,17 +685,6 @@
g_cancellable_cancel(d->m_cancellable.get());
}
-PassRefPtr<SharedBuffer> ResourceHandle::bufferedData()
-{
- ASSERT_NOT_REACHED();
- return 0;
-}
-
-bool ResourceHandle::supportsBufferedData()
-{
- return false;
-}
-
void ResourceHandle::platformSetDefersLoading(bool defersLoading)
{
// Initial implementation of this method was required for bug #44157.
Modified: trunk/Source/WebCore/platform/network/win/ResourceHandleWin.cpp (95119 => 95120)
--- trunk/Source/WebCore/platform/network/win/ResourceHandleWin.cpp 2011-09-14 20:59:11 UTC (rev 95119)
+++ trunk/Source/WebCore/platform/network/win/ResourceHandleWin.cpp 2011-09-14 21:03:20 UTC (rev 95120)
@@ -439,17 +439,6 @@
notImplemented();
}
-PassRefPtr<SharedBuffer> ResourceHandle::bufferedData()
-{
- ASSERT_NOT_REACHED();
- return 0;
-}
-
-bool ResourceHandle::supportsBufferedData()
-{
- return false;
-}
-
bool ResourceHandle::loadsBlocked()
{
return false;
