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

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

Issue 2353243002: Revert "Document::haveImportsLoaded() should return true when ignoring pending sheets" (Closed)
Patch Set: Mark the layout test TIMEOUT on Mac 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 747 matching lines...) Expand 10 before | Expand all | Expand 10 after
758 758
759 HTMLImportLoader* Document::importLoader() const 759 HTMLImportLoader* Document::importLoader() const
760 { 760 {
761 if (!m_importsController) 761 if (!m_importsController)
762 return 0; 762 return 0;
763 return m_importsController->loaderFor(*this); 763 return m_importsController->loaderFor(*this);
764 } 764 }
765 765
766 bool Document::haveImportsLoaded() const 766 bool Document::haveImportsLoaded() const
767 { 767 {
768 if (m_styleEngine->ignoringPendingStylesheets())
769 return true;
770 if (!m_importsController) 768 if (!m_importsController)
771 return true; 769 return true;
772 return !m_importsController->shouldBlockScriptExecution(*this); 770 return !m_importsController->shouldBlockScriptExecution(*this);
773 } 771 }
774 772
775 LocalDOMWindow* Document::executingWindow() const 773 LocalDOMWindow* Document::executingWindow() const
776 { 774 {
777 if (LocalDOMWindow* owningWindow = domWindow()) 775 if (LocalDOMWindow* owningWindow = domWindow())
778 return owningWindow; 776 return owningWindow;
779 if (HTMLImportsController* import = this->importsController()) 777 if (HTMLImportsController* import = this->importsController())
(...skipping 5307 matching lines...) Expand 10 before | Expand all | Expand 10 after
6087 } 6085 }
6088 6086
6089 void showLiveDocumentInstances() 6087 void showLiveDocumentInstances()
6090 { 6088 {
6091 WeakDocumentSet& set = liveDocumentSet(); 6089 WeakDocumentSet& set = liveDocumentSet();
6092 fprintf(stderr, "There are %u documents currently alive:\n", set.size()); 6090 fprintf(stderr, "There are %u documents currently alive:\n", set.size());
6093 for (Document* document : set) 6091 for (Document* document : set)
6094 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().get String().utf8().data()); 6092 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().get String().utf8().data());
6095 } 6093 }
6096 #endif 6094 #endif
OLDNEW
« no previous file with comments | « third_party/WebKit/LayoutTests/TestExpectations ('k') | third_party/WebKit/Source/web/tests/DocumentLoadingRenderingTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698