First step of HTMLImports

Source/core/dom/Document.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  *           (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved.
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved.
@@ skipping 105 matching lines @@
 #include "core/html/FormController.h"
 #include "core/html/HTMLAllCollection.h"
 #include "core/html/HTMLAnchorElement.h"
 #include "core/html/HTMLBodyElement.h"
 #include "core/html/HTMLCanvasElement.h"
 #include "core/html/HTMLCollection.h"
 #include "core/html/HTMLDocument.h"
 #include "core/html/HTMLFrameOwnerElement.h"
 #include "core/html/HTMLHeadElement.h"
 #include "core/html/HTMLIFrameElement.h"
+#include "core/html/HTMLImports.h"
 #include "core/html/HTMLLinkElement.h"
 #include "core/html/HTMLMapElement.h"
 #include "core/html/HTMLNameCollection.h"
 #include "core/html/HTMLStyleElement.h"
 #include "core/html/HTMLTitleElement.h"
 #include "core/html/PluginDocument.h"
 #include "core/html/parser/HTMLDocumentParser.h"
 #include "core/html/parser/HTMLParserIdioms.h"
 #include "core/html/parser/NestingLevelIncrementer.h"
 #include "core/inspector/InspectorCounters.h"
@@ skipping 495 matching lines @@
     m_titleElement = 0;
     m_documentElement = 0;
     m_contextFeatures = ContextFeatures::defaultSwitch();
     m_userActionElements.documentDidRemoveLastRef();
     m_fullScreenElement = 0;
     m_fullScreenElementStack.clear();
 
     detachParser();
 
     m_registry.clear();
+    m_imports.clear();
 
     // removeDetachedChildren() doesn't always unregister IDs,
     // so tear down scope information upfront to avoid having stale references in the map.
     destroyTreeScopeData();
     removeDetachedChildren();
     // removeDetachedChildren() can access FormController.
     m_formController.clear();
 
     m_markers->detach();
 
@@ skipping 205 matching lines @@
 
 CustomElementRegistry* Document::ensureCustomElementRegistry()
 {
     if (!m_registry) {
         ASSERT(isHTMLDocument() || isXHTMLDocument());
         m_registry = adoptRef(new CustomElementRegistry(this));
     }
     return m_registry.get();
 }
 
+HTMLImports* Document::imports()

[dglazkov, 2013/05/28 17:12:47]

Don't we usually use ensure* pattern for RIIA accessors?

[Hajime Morrita, 2013/05/29 01:36:00]

Done.

+{
+    if (!m_imports)
+        m_imports = HTMLImports::create(this);
+    return m_imports.get();
+}
+
+void Document::didLoadAllImports()
+{
+    executeScriptsWaitingForResourcesIfNeeded();
+}
+
+SecurityContext* Document::importsContext() OVERRIDE
+{
+    return this;
+}
+
+void Document::showSecurityErrorMessage(const String& message) OVERRIDE
+{
+    addConsoleMessage(JSMessageSource, ErrorMessageLevel, message);
+}
+
+bool Document::haveImportsLoaded() const
+{
+    return !m_imports || m_imports->haveLoaded();
+}
+
 PassRefPtr<DocumentFragment> Document::createDocumentFragment()
 {
     return DocumentFragment::create(document());
 }
 
 PassRefPtr<Text> Document::createTextNode(const String& data)
 {
     return Text::create(this, data);
 }
 
@@ skipping 1742 matching lines @@
 void Document::seamlessParentUpdatedStylesheets()
 {
     styleResolverChanged(RecalcStyleImmediately);
 }
 
 void Document::didRemoveAllPendingStylesheet()
 {
     m_needsNotifyRemoveAllPendingStylesheet = false;
 
     styleResolverChanged(RecalcStyleIfNeeded);
-
-    if (ScriptableDocumentParser* parser = scriptableDocumentParser())
-        parser->executeScriptsWaitingForStylesheets();
+    executeScriptsWaitingForResourcesIfNeeded();
 
     if (m_gotoAnchorNeededAfterStylesheetsLoad && view())
         view()->scrollToFragment(m_url);
 }
 
+void Document::executeScriptsWaitingForResourcesIfNeeded()
+{
+    if (!haveStylesheetsAndImportsLoaded())

[dglazkov, 2013/05/28 17:12:47]

Why is this check here now, but not in the old code?

+        return;
+    if (ScriptableDocumentParser* parser = scriptableDocumentParser())
+        parser->executeScriptsWaitingForResources();
+}
+
+
 CSSStyleSheet* Document::elementSheet()
 {
     if (!m_elemSheet)
         m_elemSheet = CSSStyleSheet::createInline(this, m_baseURL);
     return m_elemSheet.get();
 }
 
 int Document::nodeAbsIndex(Node *node)
 {
     ASSERT(node->document() == this);
@@ skipping 2975 matching lines @@
         return;
 
     Vector<RefPtr<Element> > associatedFormControls;
     copyToVector(m_associatedFormControls, associatedFormControls);
 
     frame()->page()->chrome().client()->didAssociateFormControls(associatedFormControls);
     m_associatedFormControls.clear();
 }
 
 } // namespace WebCore