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

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

Issue 2333263002: Document::haveImportsLoaded() should return true when ignoring pending sheets (Closed)
Patch Set: Tests really added... Created 4 years, 3 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
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 751 matching lines...) Expand 10 before | Expand all | Expand 10 after
762 762
763 HTMLImportLoader* Document::importLoader() const 763 HTMLImportLoader* Document::importLoader() const
764 { 764 {
765 if (!m_importsController) 765 if (!m_importsController)
766 return 0; 766 return 0;
767 return m_importsController->loaderFor(*this); 767 return m_importsController->loaderFor(*this);
768 } 768 }
769 769
770 bool Document::haveImportsLoaded() const 770 bool Document::haveImportsLoaded() const
771 { 771 {
772 if (m_styleEngine->ignoringPendingStylesheets())
773 return true;
772 if (!m_importsController) 774 if (!m_importsController)
773 return true; 775 return true;
774 return !m_importsController->shouldBlockScriptExecution(*this); 776 return !m_importsController->shouldBlockScriptExecution(*this);
775 } 777 }
776 778
777 LocalDOMWindow* Document::executingWindow() const 779 LocalDOMWindow* Document::executingWindow() const
778 { 780 {
779 if (LocalDOMWindow* owningWindow = domWindow()) 781 if (LocalDOMWindow* owningWindow = domWindow())
780 return owningWindow; 782 return owningWindow;
781 if (HTMLImportsController* import = this->importsController()) 783 if (HTMLImportsController* import = this->importsController())
(...skipping 5311 matching lines...) Expand 10 before | Expand all | Expand 10 after
6093 } 6095 }
6094 6096
6095 void showLiveDocumentInstances() 6097 void showLiveDocumentInstances()
6096 { 6098 {
6097 WeakDocumentSet& set = liveDocumentSet(); 6099 WeakDocumentSet& set = liveDocumentSet();
6098 fprintf(stderr, "There are %u documents currently alive:\n", set.size()); 6100 fprintf(stderr, "There are %u documents currently alive:\n", set.size());
6099 for (Document* document : set) 6101 for (Document* document : set)
6100 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().get String().utf8().data()); 6102 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().get String().utf8().data());
6101 } 6103 }
6102 #endif 6104 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698