Refactor TextTrackLoader to properly use the dataReceived callback

Source/core/loader/TextTrackLoader.cpp

 /*
  * Copyright (C) 2011 Google Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 27 matching lines @@
 #include "platform/SharedBuffer.h"
 #include "weborigin/SecurityOrigin.h"
 
 namespace WebCore {
 
 TextTrackLoader::TextTrackLoader(TextTrackLoaderClient* client, Document& document)
     : m_client(client)
     , m_document(document)
     , m_cueLoadTimer(this, &TextTrackLoader::cueLoadTimerFired)
     , m_state(Idle)
-    , m_parseOffset(0)
     , m_newCuesAvailable(false)
 {
 }
 
 TextTrackLoader::~TextTrackLoader()
 {
     if (m_resource)
         m_resource->removeClient(this);
 }
 
@@ skipping 11 matching lines @@
 }
 
 void TextTrackLoader::cancelLoad()
 {
     if (m_resource) {
         m_resource->removeClient(this);
         m_resource = 0;
     }
 }
 
-void TextTrackLoader::processNewCueData(Resource* resource)
+void TextTrackLoader::dataReceived(Resource* resource, const char* data, int length)
 {
     ASSERT(m_resource == resource);
 
-    if (m_state == Failed || !resource->resourceBuffer())
-        return;
-
-    SharedBuffer* buffer = resource->resourceBuffer();
-    if (m_parseOffset == buffer->size())
+    if (m_state == Failed)
         return;
 
     if (!m_cueParser)
         m_cueParser = WebVTTParser::create(this, m_document);
 
-    const char* data;
-    unsigned length;
-
-    while ((length = buffer->getSomeData(data, m_parseOffset))) {
-        m_cueParser->parseBytes(data, length);
-        m_parseOffset += length;
-    }
-}
-
-void TextTrackLoader::dataReceived(Resource* resource, const char*, int)
-{
-    ASSERT(m_resource == resource);
-
-    if (!resource->resourceBuffer())
-        return;
-
-    processNewCueData(resource);
+    m_cueParser->parseBytes(data, length);
 }
 
 void TextTrackLoader::corsPolicyPreventedLoad()
 {
     DEFINE_STATIC_LOCAL(String, consoleMessage, ("Cross-origin text track load denied by Cross-Origin Resource Sharing policy."));
     m_document.addConsoleMessage(SecurityMessageSource, ErrorMessageLevel, consoleMessage);
     m_state = Failed;
 }
 
 void TextTrackLoader::notifyFinished(Resource* resource)
 {
     ASSERT(m_resource == resource);
 
     if (!m_crossOriginMode.isNull()
         && !m_document.securityOrigin()->canRequest(resource->response().url())
         && !resource->passesAccessControlCheck(m_document.securityOrigin())) {
 
         corsPolicyPreventedLoad();
     }
 
-    if (m_state != Failed) {
-        processNewCueData(resource);
-        if (m_state != Failed)
-            m_state = resource->errorOccurred() ? Failed : Finished;
-    }
+    if (m_state != Failed)
+        m_state = resource->errorOccurred() ? Failed : Finished;
 
     if (!m_cueLoadTimer.isActive())
         m_cueLoadTimer.startOneShot(0);
 
     cancelLoad();
 }
 
 bool TextTrackLoader::load(const KURL& url, const String& crossOriginMode)
 {
     cancelLoad();
@@ skipping 59 matching lines @@
 }
 
 void TextTrackLoader::getNewRegions(Vector<RefPtr<TextTrackRegion> >& outputRegions)
 {
     ASSERT(m_cueParser);
     if (m_cueParser)
         m_cueParser->getNewRegions(outputRegions);
 }
 }