Rename TextTrackLoader::m_cachedCueData to m_resource

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 34 matching lines @@
     , m_document(document)
     , m_cueLoadTimer(this, &TextTrackLoader::cueLoadTimerFired)
     , m_state(Idle)
     , m_parseOffset(0)
     , m_newCuesAvailable(false)
 {
 }
 
 TextTrackLoader::~TextTrackLoader()
 {
-    if (m_cachedCueData)
-        m_cachedCueData->removeClient(this);
+    if (m_resource)
+        m_resource->removeClient(this);
 }
 
 void TextTrackLoader::cueLoadTimerFired(Timer<TextTrackLoader>* timer)
 {
     ASSERT_UNUSED(timer, timer == &m_cueLoadTimer);
 
     if (m_newCuesAvailable) {
         m_newCuesAvailable = false;
         m_client->newCuesAvailable(this);
     }
 
     if (m_state >= Finished)
         m_client->cueLoadingCompleted(this, m_state == Failed);
 }
 
 void TextTrackLoader::cancelLoad()
 {
-    if (m_cachedCueData) {
-        m_cachedCueData->removeClient(this);
-        m_cachedCueData = 0;
+    if (m_resource) {
+        m_resource->removeClient(this);
+        m_resource = 0;
     }
 }
 
 void TextTrackLoader::processNewCueData(Resource* resource)
 {
-    ASSERT(m_cachedCueData == resource);
+    ASSERT(m_resource == resource);
 
     if (m_state == Failed || !resource->resourceBuffer())
         return;
 
     SharedBuffer* buffer = resource->resourceBuffer();
     if (m_parseOffset == buffer->size())
         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_cachedCueData == resource);
+    ASSERT(m_resource == resource);
 
     if (!resource->resourceBuffer())
         return;
 
     processNewCueData(resource);
 }
 
 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_cachedCueData == 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);
@@ skipping 22 matching lines @@
         updateRequestForAccessControl(cueRequest.mutableResourceRequest(), m_document.securityOrigin(), allowCredentials);
     } else {
         // Cross-origin resources that are not suitably CORS-enabled may not load.
         if (!m_document.securityOrigin()->canRequest(url)) {
             corsPolicyPreventedLoad();
             return false;
         }
     }
 
     ResourceFetcher* fetcher = m_document.fetcher();
-    m_cachedCueData = fetcher->fetchTextTrack(cueRequest);
-    if (m_cachedCueData)
-        m_cachedCueData->addClient(this);
+    m_resource = fetcher->fetchTextTrack(cueRequest);
+    if (m_resource)
+        m_resource->addClient(this);
 
     m_client->cueLoadingStarted(this);
 
     return true;
 }
 
 void TextTrackLoader::newCuesParsed()
 {
     if (m_cueLoadTimer.isActive())
         return;
@@ skipping 27 matching lines @@
 }
 
 void TextTrackLoader::getNewRegions(Vector<RefPtr<TextTrackRegion> >& outputRegions)
 {
     ASSERT(m_cueParser);
     if (m_cueParser)
         m_cueParser->getNewRegions(outputRegions);
 }
 }