Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(178)

Side by Side Diff: Source/core/dom/Document.cpp

Issue 17419007: [HTML Imports] Implement sub-imports processing. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Updated to ToT. Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/dom/Document.h ('k') | Source/core/html/HTMLImportsController.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2001 Dirk Mueller (mueller@kde.org) 4 * (C) 2001 Dirk Mueller (mueller@kde.org)
5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org) 5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org)
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All r ights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All r ights reserved.
7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
8 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved. 8 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved.
9 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) 9 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
10 * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved. 10 * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved.
(...skipping 838 matching lines...) Expand 10 before | Expand all | Expand 10 after
849 849
850 CustomElementRegistry* Document::ensureCustomElementRegistry() 850 CustomElementRegistry* Document::ensureCustomElementRegistry()
851 { 851 {
852 if (!m_registry) { 852 if (!m_registry) {
853 ASSERT(isHTMLDocument() || isXHTMLDocument()); 853 ASSERT(isHTMLDocument() || isXHTMLDocument());
854 m_registry = adoptRef(new CustomElementRegistry(this)); 854 m_registry = adoptRef(new CustomElementRegistry(this));
855 } 855 }
856 return m_registry.get(); 856 return m_registry.get();
857 } 857 }
858 858
859 HTMLImportsController* Document::ensureImports() 859 void Document::setImports(PassRefPtr<HTMLImportsController> imports)
860 { 860 {
861 if (!m_imports) 861 ASSERT(!m_imports);
862 m_imports = HTMLImportsController::create(this); 862 m_imports = imports;
863 return m_imports.get();
864 } 863 }
865 864
866 void Document::didLoadAllImports() 865 void Document::didLoadAllImports()
867 { 866 {
868 executeScriptsWaitingForResourcesIfNeeded(); 867 executeScriptsWaitingForResourcesIfNeeded();
869 } 868 }
870 869
871 bool Document::haveImportsLoaded() const 870 bool Document::haveImportsLoaded() const
872 { 871 {
873 return !m_imports || m_imports->haveLoaded(); 872 return !m_imports || m_imports->haveLoaded();
(...skipping 4357 matching lines...) Expand 10 before | Expand all | Expand 10 after
5231 { 5230 {
5232 return DocumentLifecycleNotifier::create(this); 5231 return DocumentLifecycleNotifier::create(this);
5233 } 5232 }
5234 5233
5235 DocumentLifecycleNotifier* Document::lifecycleNotifier() 5234 DocumentLifecycleNotifier* Document::lifecycleNotifier()
5236 { 5235 {
5237 return static_cast<DocumentLifecycleNotifier*>(ScriptExecutionContext::lifec ycleNotifier()); 5236 return static_cast<DocumentLifecycleNotifier*>(ScriptExecutionContext::lifec ycleNotifier());
5238 } 5237 }
5239 5238
5240 } // namespace WebCore 5239 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/dom/Document.h ('k') | Source/core/html/HTMLImportsController.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698