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/WebCore/loader/ResourceLoader.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/WebCore/loader/ResourceLoader.cpp')
| -rw-r--r-- | Source/WebCore/loader/ResourceLoader.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Source/WebCore/loader/ResourceLoader.cpp b/Source/WebCore/loader/ResourceLoader.cpp index 7752579ce..f0a6c335c 100644 --- a/Source/WebCore/loader/ResourceLoader.cpp +++ b/Source/WebCore/loader/ResourceLoader.cpp @@ -39,7 +39,6 @@ #include "InspectorInstrumentation.h" #include "Page.h" #include "ProgressTracker.h" -#include "ResourceBuffer.h" #include "ResourceError.h" #include "ResourceHandle.h" #include "ResourceLoadScheduler.h" @@ -49,7 +48,7 @@ namespace WebCore { -PassRefPtr<ResourceBuffer> ResourceLoader::resourceData() +PassRefPtr<SharedBuffer> ResourceLoader::resourceData() { return m_resourceData; } @@ -199,12 +198,12 @@ void ResourceLoader::addData(const char* data, int length, bool allAtOnce) return; if (allAtOnce) { - m_resourceData = ResourceBuffer::create(data, length); + m_resourceData = SharedBuffer::create(data, length); return; } if (!m_resourceData) - m_resourceData = ResourceBuffer::create(data, length); + m_resourceData = SharedBuffer::create(data, length); else m_resourceData->append(data, length); } @@ -289,7 +288,7 @@ void ResourceLoader::willStopBufferingData(const char* data, int length) return; ASSERT(!m_resourceData); - m_resourceData = ResourceBuffer::create(data, length); + m_resourceData = SharedBuffer::create(data, length); } void ResourceLoader::didFinishLoading(double finishTime) |