[HTML Imports] Implement sub-imports processing.

Source/core/html/HTMLImportsController.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 53 matching lines @@
 }
 
 void LinkImport::process()
 {
     if (m_loader)
         return;
     if (!m_owner)
         return;
 
     // FIXME(morrita): Should take care of sub-imports whose document doesn't have frame.
-    if (!m_owner->document()->frame())
+    if (!m_owner->document()->frame() && !m_owner->document()->imports())
         return;
 
     LinkRequestBuilder builder(m_owner);
     if (!builder.isValid())
         return;
 
-    HTMLImportsController* controller = m_owner->document()->ensureImports();
+    HTMLImportsController* controller = m_owner->document()->imports();
+    if (!controller) {
+        ASSERT(m_owner->document()->frame()); // The document should be the master.
+        m_owner->document()->setImports(HTMLImportsController::create(m_owner->document()));
+        controller = m_owner->document()->imports();
+    }
+
     if (RefPtr<HTMLImportLoader> found = controller->findLinkFor(builder.url())) {
         m_loader = found;
         return;
     }
 
     CachedResourceRequest request = builder.build(true);
-    CachedResourceHandle<CachedScript> resource = m_owner->document()->cachedResourceLoader()->requestScript(request);
+    CachedResourceHandle<CachedScript> resource = controller->cachedResourceLoader()->requestScript(request);
+    if (!resource)
+        return;
+
     m_loader = HTMLImportLoader::create(controller, builder.url(), resource);
 }
 
 void LinkImport::ownerRemoved()
 {
     m_owner = 0;
     m_loader.clear();
 }
 
 
@@ skipping 44 matching lines @@
 
     String error;
     if (!m_controller->securityOrigin()->canRequest(m_resource->response().url())
         && !m_resource->passesAccessControlCheck(m_controller->securityOrigin(), error)) {
         m_controller->showSecurityErrorMessage("Import from origin '" + SecurityOrigin::create(m_resource->response().url())->toString() + "' has been blocked from loading by Cross-Origin Resource Sharing policy: " + error);
         return StateError;
     }
 
     // FIXME(morrita): This should be done in incremental way.
     m_importedDocument = HTMLDocument::create(0, m_resource->response().url());
+    m_importedDocument->setImports(m_controller);
     m_importedDocument->setContent(m_resource->script());
 
     return StateReady;
 }
 
 Document* HTMLImportLoader::importedDocument() const
 {
     if (m_state != StateReady)
         return 0;
     return m_importedDocument.get();
 }
 
 void HTMLImportLoader::importDestroyed()
 {
     m_controller = 0;
     m_importedDocument.clear();
 }
 
 
-PassOwnPtr<HTMLImportsController> HTMLImportsController::create(Document* master)
+PassRefPtr<HTMLImportsController> HTMLImportsController::create(Document* master)
 {
-    return adoptPtr(new HTMLImportsController(master));
+    return adoptRef(new HTMLImportsController(master));
 }
 
 HTMLImportsController::HTMLImportsController(Document* master)
     : m_master(master)
 {
 }
 
 HTMLImportsController::~HTMLImportsController()
 {
     for (size_t i = 0; i < m_imports.size(); ++i)
@@ skipping 13 matching lines @@
 
 void HTMLImportsController::didLoad()
 {
     if (haveLoaded())
         m_master->didLoadAllImports();
 }
 
 PassRefPtr<HTMLImportLoader> HTMLImportsController::findLinkFor(const KURL& url) const
 {
     for (size_t i = 0; i < m_imports.size(); ++i) {
-        if (m_imports[i]->url() == url)
+        if (equalIgnoringFragmentIdentifier(m_imports[i]->url(), url))
             return m_imports[i];
     }
 
     return 0;
 }
 
 SecurityOrigin* HTMLImportsController::securityOrigin() const
 {
     return m_master->securityOrigin();
 }
 
+CachedResourceLoader* HTMLImportsController::cachedResourceLoader() const
+{
+    return m_master->cachedResourceLoader();
+}
+
 bool HTMLImportsController::haveLoaded() const
 {
     for (size_t i = 0; i < m_imports.size(); ++i) {
         if (!m_imports[i]->isDone())
             return false;
     }
 
     return true;
 }
 
 } // namespace WebCore