webkitgtk-2.4.11webkitgtk-2.4.11

1 files changed, 13 insertions, 14 deletions

diff --git a/Source/WebCore/loader/cache/CachedTextTrack.cpp b/Source/WebCore/loader/cache/CachedTextTrack.cpp
index 715592205..94974a591 100644
--- a/Source/WebCore/loader/cache/CachedTextTrack.cpp
+++ b/Source/WebCore/loader/cache/CachedTextTrack.cpp
@@ -32,37 +32,36 @@
 #include "CachedResourceClient.h"
 #include "CachedResourceClientWalker.h"
 #include "CachedResourceLoader.h"
+#include "ResourceBuffer.h"
 #include "SharedBuffer.h"
 #include "TextResourceDecoder.h"
 #include <wtf/Vector.h>
 
 namespace WebCore {
 
-CachedTextTrack::CachedTextTrack(const ResourceRequest& resourceRequest, SessionID sessionID)
-    : CachedResource(resourceRequest, TextTrackResource, sessionID)
+CachedTextTrack::CachedTextTrack(const ResourceRequest& resourceRequest)
+    : CachedResource(resourceRequest, TextTrackResource)
 {
 }
 
-void CachedTextTrack::updateData(SharedBuffer* data)
+CachedTextTrack::~CachedTextTrack()
 {
-    ASSERT(dataBufferingPolicy() == BufferData);
+}
+
+void CachedTextTrack::addDataBuffer(ResourceBuffer* data)
+{
+    ASSERT(m_options.dataBufferingPolicy == BufferData);
     m_data = data;
-    setEncodedSize(data ? data->size() : 0);
+    setEncodedSize(m_data.get() ? m_data->size() : 0);
 
     CachedResourceClientWalker<CachedResourceClient> walker(m_clients);
-    while (CachedResourceClient* client = walker.next())
+    while (CachedResourceClient *client = walker.next())
         client->deprecatedDidReceiveCachedResource(this);
 }
 
-void CachedTextTrack::addDataBuffer(SharedBuffer& data)
-{
-    updateData(&data);
-    CachedResource::addDataBuffer(data);
-}
-
-void CachedTextTrack::finishLoading(SharedBuffer* data)
+void CachedTextTrack::finishLoading(ResourceBuffer* data)
 {
-    updateData(data);
+    addDataBuffer(data);
     CachedResource::finishLoading(data);
 }