From 8995b83bcbfbb68245f779b64e5517627c6cc6ea Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@digia.com>
Date: Wed, 17 Oct 2012 16:21:14 +0200
Subject: Imported WebKit commit cf4f8fc6f19b0629f51860cb2d4b25e139d07e00
 (http://svn.webkit.org/repository/webkit/trunk@131592)

New snapshot that includes the build fixes for Mac OS X 10.6 and earlier as well
as the previously cherry-picked changes
---
 Source/WebKit/win/WebDataSource.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'Source/WebKit/win/WebDataSource.cpp')

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;
 }
 
-- 
cgit v1.2.1