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

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

Issue 21182004: [HTML Imports] Make import loading in order. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Addressed feedback. Created 7 years, 4 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
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 761 matching lines...) Expand 10 before | Expand all | Expand 10 after
772 m_import = import; 772 m_import = import;
773 } 773 }
774 774
775 void Document::didLoadAllImports() 775 void Document::didLoadAllImports()
776 { 776 {
777 executeScriptsWaitingForResourcesIfNeeded(); 777 executeScriptsWaitingForResourcesIfNeeded();
778 } 778 }
779 779
780 bool Document::haveImportsLoaded() const 780 bool Document::haveImportsLoaded() const
781 { 781 {
782 return !m_import || m_import->haveChildrenLoaded(); 782 return !m_import || !m_import->isBlocked();
783 } 783 }
784 784
785 PassRefPtr<DocumentFragment> Document::createDocumentFragment() 785 PassRefPtr<DocumentFragment> Document::createDocumentFragment()
786 { 786 {
787 return DocumentFragment::create(document()); 787 return DocumentFragment::create(document());
788 } 788 }
789 789
790 PassRefPtr<Text> Document::createTextNode(const String& data) 790 PassRefPtr<Text> Document::createTextNode(const String& data)
791 { 791 {
792 return Text::create(this, data); 792 return Text::create(this, data);
(...skipping 4294 matching lines...) Expand 10 before | Expand all | Expand 10 after
5087 { 5087 {
5088 return DocumentLifecycleNotifier::create(this); 5088 return DocumentLifecycleNotifier::create(this);
5089 } 5089 }
5090 5090
5091 DocumentLifecycleNotifier* Document::lifecycleNotifier() 5091 DocumentLifecycleNotifier* Document::lifecycleNotifier()
5092 { 5092 {
5093 return static_cast<DocumentLifecycleNotifier*>(ScriptExecutionContext::lifec ycleNotifier()); 5093 return static_cast<DocumentLifecycleNotifier*>(ScriptExecutionContext::lifec ycleNotifier());
5094 } 5094 }
5095 5095
5096 } // namespace WebCore 5096 } // namespace WebCore
OLDNEW
« no previous file with comments | « LayoutTests/http/tests/htmlimports/resources/import-blocking-nested-child-2.html ('k') | Source/core/html/HTMLImport.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698