diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-15 16:08:57 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-15 16:08:57 +0200 |
| commit | 5466563f4b5b6b86523e3f89bb7f77e5b5270c78 (patch) | |
| tree | 8caccf7cd03a15207cde3ba282c88bf132482a91 /Source/WebKit/win/WebDataSource.cpp | |
| parent | 33b26980cb24288b5a9f2590ccf32a949281bb79 (diff) | |
| download | qtwebkit-5466563f4b5b6b86523e3f89bb7f77e5b5270c78.tar.gz | |
Imported WebKit commit 0dc6cd75e1d4836eaffbb520be96fac4847cc9d2 (http://svn.webkit.org/repository/webkit/trunk@131300)
WebKit update which introduces the QtWebKitWidgets module that contains the WK1
widgets based API. (In fact it renames QtWebKit to QtWebKitWidgets while we're
working on completing the entire split as part of
https://bugs.webkit.org/show_bug.cgi?id=99314
Diffstat (limited to 'Source/WebKit/win/WebDataSource.cpp')
| -rw-r--r-- | Source/WebKit/win/WebDataSource.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Source/WebKit/win/WebDataSource.cpp b/Source/WebKit/win/WebDataSource.cpp index 1498f6e5f..89f83ab64 100644 --- a/Source/WebKit/win/WebDataSource.cpp +++ b/Source/WebKit/win/WebDataSource.cpp @@ -44,6 +44,7 @@ #include <WebCore/Frame.h> #include <WebCore/FrameLoader.h> #include <WebCore/KURL.h> +#include <WebCore/ResourceBuffer.h> using namespace WebCore; @@ -179,7 +180,8 @@ HRESULT STDMETHODCALLTYPE WebDataSource::data( if (!m_loader) return E_FAIL; - return MemoryStream::createInstance(m_loader->mainResourceData()).copyRefTo(stream); + RefPtr<ResourceBuffer> buffer = m_loader->mainResourceData(); + return MemoryStream::createInstance(buffer ? buffer->sharedBuffer() : 0).copyRefTo(stream); } HRESULT STDMETHODCALLTYPE WebDataSource::representation( @@ -302,7 +304,8 @@ HRESULT STDMETHODCALLTYPE WebDataSource::subresourceForURL( if (!cachedResource) return E_FAIL; - *resource = WebResource::createInstance(cachedResource->data(), cachedResource->response()); + ResourceBuffer* buffer = cachedResource->resourceBuffer(); + *resource = WebResource::createInstance(buffer ? buffer->sharedBuffer() : 0, cachedResource->response()); return S_OK; } |