summaryrefslogtreecommitdiff
path: root/Source/WebCore/loader/TextTrackLoader.cpp
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@digia.com>2012-10-16 14:56:46 +0200
committerSimon Hausmann <simon.hausmann@digia.com>2012-10-16 14:57:30 +0200
commitb297e0fa5c217c9467033b7c8b46891a52870120 (patch)
tree43fc14689295e9e64f2719d05aad94e3049f6cd7 /Source/WebCore/loader/TextTrackLoader.cpp
parent69d517dbfa69903d8593cc1737f0474b21e3251e (diff)
downloadqtwebkit-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/TextTrackLoader.cpp')
-rw-r--r--Source/WebCore/loader/TextTrackLoader.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/WebCore/loader/TextTrackLoader.cpp b/Source/WebCore/loader/TextTrackLoader.cpp
index a9b7f960b..202570d1d 100644
--- a/Source/WebCore/loader/TextTrackLoader.cpp
+++ b/Source/WebCore/loader/TextTrackLoader.cpp
@@ -34,10 +34,10 @@
#include "CrossOriginAccessControl.h"
#include "Document.h"
#include "Logging.h"
-#include "ResourceBuffer.h"
#include "ResourceHandle.h"
#include "ScriptCallStack.h"
#include "SecurityOrigin.h"
+#include "SharedBuffer.h"
#include "WebVTTParser.h"
namespace WebCore {
@@ -83,10 +83,10 @@ void TextTrackLoader::processNewCueData(CachedResource* resource)
{
ASSERT(m_cachedCueData == resource);
- if (m_state == Failed || !resource->resourceBuffer())
+ if (m_state == Failed || !resource->data())
return;
- ResourceBuffer* buffer = resource->resourceBuffer();
+ SharedBuffer* buffer = resource->data();
if (m_parseOffset == buffer->size())
return;
@@ -106,7 +106,7 @@ void TextTrackLoader::didReceiveData(CachedResource* resource)
{
ASSERT(m_cachedCueData == resource);
- if (!resource->resourceBuffer())
+ if (!resource->data())
return;
processNewCueData(resource);