From 1bf1084f2b10c3b47fd1a588d85d21ed0eb41d0c Mon Sep 17 00:00:00 2001
From: Lorry Tar Creator <lorry-tar-importer@lorry>
Date: Tue, 27 Jun 2017 06:07:23 +0000
Subject: webkitgtk-2.16.5

---
 Source/WebCore/loader/cache/CachedTextTrack.cpp | 30 ++++++++++++-------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'Source/WebCore/loader/cache/CachedTextTrack.cpp')

diff --git a/Source/WebCore/loader/cache/CachedTextTrack.cpp b/Source/WebCore/loader/cache/CachedTextTrack.cpp
index 94974a591..1d82bd71b 100644
--- a/Source/WebCore/loader/cache/CachedTextTrack.cpp
+++ b/Source/WebCore/loader/cache/CachedTextTrack.cpp
@@ -32,36 +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)
-    : CachedResource(resourceRequest, TextTrackResource)
+CachedTextTrack::CachedTextTrack(CachedResourceRequest&& request, SessionID sessionID)
+    : CachedResource(WTFMove(request), TextTrackResource, sessionID)
 {
 }
 
-CachedTextTrack::~CachedTextTrack()
+void CachedTextTrack::updateData(SharedBuffer* data)
 {
-}
-
-void CachedTextTrack::addDataBuffer(ResourceBuffer* data)
-{
-    ASSERT(m_options.dataBufferingPolicy == BufferData);
+    ASSERT(dataBufferingPolicy() == BufferData);
     m_data = data;
-    setEncodedSize(m_data.get() ? m_data->size() : 0);
+    setEncodedSize(data ? data->size() : 0);
 
     CachedResourceClientWalker<CachedResourceClient> walker(m_clients);
-    while (CachedResourceClient *client = walker.next())
-        client->deprecatedDidReceiveCachedResource(this);
+    while (CachedResourceClient* client = walker.next())
+        client->deprecatedDidReceiveCachedResource(*this);
+}
+
+void CachedTextTrack::addDataBuffer(SharedBuffer& data)
+{
+    updateData(&data);
+    CachedResource::addDataBuffer(data);
 }
 
-void CachedTextTrack::finishLoading(ResourceBuffer* data)
+void CachedTextTrack::finishLoading(SharedBuffer* data)
 {
-    addDataBuffer(data);
+    updateData(data);
     CachedResource::finishLoading(data);
 }
 
-- 
cgit v1.2.1