Use a TextTrackLoaderClient reference (not pointer)

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 21 matching lines @@
 #include "core/fetch/CrossOriginAccessControl.h"
 #include "core/fetch/FetchRequest.h"
 #include "core/fetch/ResourceFetcher.h"
 #include "core/html/track/WebVTTParser.h"
 #include "platform/Logging.h"
 #include "platform/SharedBuffer.h"
 #include "weborigin/SecurityOrigin.h"
 
 namespace WebCore {
 
-TextTrackLoader::TextTrackLoader(TextTrackLoaderClient* client, Document& document)
+TextTrackLoader::TextTrackLoader(TextTrackLoaderClient& client, Document& document)
     : m_client(client)
     , m_document(document)
     , m_cueLoadTimer(this, &TextTrackLoader::cueLoadTimerFired)
     , m_state(Idle)
     , m_newCuesAvailable(false)
 {
 }
 
 TextTrackLoader::~TextTrackLoader()
 {
     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);
+        m_client.newCuesAvailable(this);
     }
 
     if (m_state >= Finished)
-        m_client->cueLoadingCompleted(this, m_state == Failed);
+        m_client.cueLoadingCompleted(this, m_state == Failed);
 }
 
 void TextTrackLoader::cancelLoad()
 {
     if (m_resource) {
         m_resource->removeClient(this);
         m_resource = 0;
     }
 }
 
@@ skipping 34 matching lines @@
     if (!m_cueLoadTimer.isActive())
         m_cueLoadTimer.startOneShot(0);
 
     cancelLoad();
 }
 
 bool TextTrackLoader::load(const KURL& url, const String& crossOriginMode)
 {
     cancelLoad();
 
-    if (!m_client->shouldLoadCues(this))
+    if (!m_client.shouldLoadCues(this))
         return false;
 
     FetchRequest cueRequest(ResourceRequest(m_document.completeURL(url)), FetchInitiatorTypeNames::texttrack);
 
     if (!crossOriginMode.isNull()) {
         m_crossOriginMode = crossOriginMode;
         StoredCredentials allowCredentials = equalIgnoringCase(crossOriginMode, "use-credentials") ? AllowStoredCredentials : DoNotAllowStoredCredentials;
         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_resource = fetcher->fetchRawResource(cueRequest);
     if (m_resource)
         m_resource->addClient(this);
 
-    m_client->cueLoadingStarted(this);
+    m_client.cueLoadingStarted(this);
 
     return true;
 }
 
 void TextTrackLoader::newCuesParsed()
 {
     if (m_cueLoadTimer.isActive())
         return;
 
     m_newCuesAvailable = true;
     m_cueLoadTimer.startOneShot(0);
 }
 
 void TextTrackLoader::newRegionsParsed()
 {
-    m_client->newRegionsAvailable(this);
+    m_client.newRegionsAvailable(this);
 }
 
 void TextTrackLoader::fileFailedToParse()
 {
     LOG(Media, "TextTrackLoader::fileFailedToParse");
 
     m_state = Failed;
 
     if (!m_cueLoadTimer.isActive())
         m_cueLoadTimer.startOneShot(0);
 
     cancelLoad();
 }
 
 void TextTrackLoader::getNewCues(Vector<RefPtr<TextTrackCue> >& outputCues)
 {
     ASSERT(m_cueParser);
     if (m_cueParser)
         m_cueParser->getNewCues(outputCues);
 }
 
 void TextTrackLoader::getNewRegions(Vector<RefPtr<TextTrackRegion> >& outputRegions)
 {
     ASSERT(m_cueParser);
     if (m_cueParser)
         m_cueParser->getNewRegions(outputRegions);
 }
 }