(Re)organize handling of CORS access control during resource loading.

Source/core/html/HTMLImportLoader.cpp

 /*
  * Copyright (C) 2013 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 24 matching lines @@
 #include "core/fetch/ResourceFetcher.h"
 #include "core/frame/ContentSecurityPolicyResponseHeaders.h"
 #include "core/html/HTMLDocument.h"
 #include "core/html/HTMLImport.h"
 #include "core/html/HTMLImportLoaderClient.h"
 #include "core/loader/DocumentWriter.h"
 
 
 namespace WebCore {
 
-PassRefPtr<HTMLImportLoader> HTMLImportLoader::create(HTMLImport* import, ResourceFetcher* fetcher)
-{
-    RefPtr<HTMLImportLoader> self = adoptRef(new HTMLImportLoader(import, fetcher));
-    return self.release();
-}
-
-HTMLImportLoader::HTMLImportLoader(HTMLImport* import, ResourceFetcher* fetcher)
+HTMLImportLoader::HTMLImportLoader(HTMLImport* import)
     : m_import(import)
-    , m_fetcher(fetcher)
     , m_state(StateLoading)
 {
 }
 
 HTMLImportLoader::~HTMLImportLoader()
 {
     if (m_importedDocument)
         m_importedDocument->setImport(0);
 }
 
 void HTMLImportLoader::startLoading(const ResourcePtr<RawResource>& resource)
 {
     setResource(resource);
 }
 
 void HTMLImportLoader::responseReceived(Resource* resource, const ResourceResponse& response)
 {
-    // Current canAccess() implementation isn't sufficient for catching cross-domain redirects: http://crbug.com/256976
-    if (!m_fetcher->canAccess(resource, PotentiallyCORSEnabled)) {
+    // Resource may already have been loaded with the import loader
+    // being added as a client later & now being notified. Fail early.
+    if (resource->loadFailedOrCanceled()) {
         setState(StateError);
         return;
     }
-
     setState(startWritingAndParsing(response));
 }
 
 void HTMLImportLoader::dataReceived(Resource*, const char* data, int length)
 {
     RefPtr<DocumentWriter> protectingWriter(m_writer);
     m_writer->addData(data, length);
 }
 
 void HTMLImportLoader::notifyFinished(Resource* resource)
@@ skipping 75 matching lines @@
     if (isDone())
         client->didFinishLoading();
 }
 
 void HTMLImportLoader::removeClient(HTMLImportLoaderClient* client)
 {
     ASSERT(kNotFound != m_clients.find(client));
     m_clients.remove(m_clients.find(client));
 }
 
-
 } // namespace WebCore