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/WebKit2/WebProcess/WebPage/WebFrame.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/WebKit2/WebProcess/WebPage/WebFrame.cpp')
| -rw-r--r-- | Source/WebKit2/WebProcess/WebPage/WebFrame.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp b/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp index 8ae9ef028..d04f4db7f 100644 --- a/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp +++ b/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp @@ -54,7 +54,6 @@ #include <WebCore/JSRange.h> #include <WebCore/Page.h> #include <WebCore/RenderTreeAsText.h> -#include <WebCore/ResourceBuffer.h> #include <WebCore/SecurityOrigin.h> #include <WebCore/TextIterator.h> #include <WebCore/TextResourceDecoder.h> @@ -297,7 +296,7 @@ String WebFrame::source() const DocumentLoader* documentLoader = m_coreFrame->loader()->activeDocumentLoader(); if (!documentLoader) return String(); - RefPtr<ResourceBuffer> mainResourceData = documentLoader->mainResourceData(); + RefPtr<SharedBuffer> mainResourceData = documentLoader->mainResourceData(); if (!mainResourceData) return String(); return decoder->encoding().decode(mainResourceData->data(), mainResourceData->size()); @@ -514,7 +513,7 @@ String WebFrame::layerTreeAsText() const if (!m_coreFrame) return ""; - return m_coreFrame->layerTreeAsText(0); + return m_coreFrame->layerTreeAsText(); } unsigned WebFrame::pendingUnloadCount() const |