diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-16 14:56:46 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-16 14:57:30 +0200 |
| commit | b297e0fa5c217c9467033b7c8b46891a52870120 (patch) | |
| tree | 43fc14689295e9e64f2719d05aad94e3049f6cd7 /Source/WebKit/win/WebDataSource.cpp | |
| parent | 69d517dbfa69903d8593cc1737f0474b21e3251e (diff) | |
| download | qtwebkit-b297e0fa5c217c9467033b7c8b46891a52870120.tar.gz | |
Revert "Imported WebKit commit 0dc6cd75e1d4836eaffbb520be96fac4847cc9d2 (http://svn.webkit.org/repository/webkit/trunk@131300)"
This reverts commit 5466563f4b5b6b86523e3f89bb7f77e5b5270c78.
Caused OOM issues on some CI machines :(
Diffstat (limited to 'Source/WebKit/win/WebDataSource.cpp')
| -rw-r--r-- | Source/WebKit/win/WebDataSource.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Source/WebKit/win/WebDataSource.cpp b/Source/WebKit/win/WebDataSource.cpp index 89f83ab64..1498f6e5f 100644 --- a/Source/WebKit/win/WebDataSource.cpp +++ b/Source/WebKit/win/WebDataSource.cpp @@ -44,7 +44,6 @@ #include <WebCore/Frame.h> #include <WebCore/FrameLoader.h> #include <WebCore/KURL.h> -#include <WebCore/ResourceBuffer.h> using namespace WebCore; @@ -180,8 +179,7 @@ HRESULT STDMETHODCALLTYPE WebDataSource::data( if (!m_loader) return E_FAIL; - RefPtr<ResourceBuffer> buffer = m_loader->mainResourceData(); - return MemoryStream::createInstance(buffer ? buffer->sharedBuffer() : 0).copyRefTo(stream); + return MemoryStream::createInstance(m_loader->mainResourceData()).copyRefTo(stream); } HRESULT STDMETHODCALLTYPE WebDataSource::representation( @@ -304,8 +302,7 @@ HRESULT STDMETHODCALLTYPE WebDataSource::subresourceForURL( if (!cachedResource) return E_FAIL; - ResourceBuffer* buffer = cachedResource->resourceBuffer(); - *resource = WebResource::createInstance(buffer ? buffer->sharedBuffer() : 0, cachedResource->response()); + *resource = WebResource::createInstance(cachedResource->data(), cachedResource->response()); return S_OK; } |