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

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

Issue 2729493002: 'haveImportsLoaded' shouldn't block rendering, if ignoringPendingStylesheets. (Closed)
Patch Set: call EXPECT_TRUE twice Created 3 years, 9 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 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All
7 * rights reserved. 7 * rights reserved.
8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. 8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
9 * (http://www.torchmobile.com/) 9 * (http://www.torchmobile.com/)
10 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved. 10 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved.
(...skipping 5619 matching lines...) Expand 10 before | Expand all | Expand 10 after
5630 if (!client->allowScript(settings && settings->getScriptEnabled())) { 5630 if (!client->allowScript(settings && settings->getScriptEnabled())) {
5631 if (reason == AboutToExecuteScript) 5631 if (reason == AboutToExecuteScript)
5632 client->didNotAllowScript(); 5632 client->didNotAllowScript();
5633 5633
5634 return false; 5634 return false;
5635 } 5635 }
5636 5636
5637 return true; 5637 return true;
5638 } 5638 }
5639 5639
5640 bool Document::isRenderingReady() const {
5641 return m_styleEngine->ignoringPendingStylesheets() ||
5642 (haveImportsLoaded() && haveRenderBlockingStylesheetsLoaded());
5643 }
5644
5640 bool Document::allowInlineEventHandler(Node* node, 5645 bool Document::allowInlineEventHandler(Node* node,
5641 EventListener* listener, 5646 EventListener* listener,
5642 const String& contextURL, 5647 const String& contextURL,
5643 const WTF::OrdinalNumber& contextLine) { 5648 const WTF::OrdinalNumber& contextLine) {
5644 Element* element = node && node->isElementNode() ? toElement(node) : nullptr; 5649 Element* element = node && node->isElementNode() ? toElement(node) : nullptr;
5645 if (!ContentSecurityPolicy::shouldBypassMainWorld(this) && 5650 if (!ContentSecurityPolicy::shouldBypassMainWorld(this) &&
5646 !contentSecurityPolicy()->allowInlineEventHandler( 5651 !contentSecurityPolicy()->allowInlineEventHandler(
5647 element, listener->code(), contextURL, contextLine)) 5652 element, listener->code(), contextURL, contextLine))
5648 return false; 5653 return false;
5649 5654
(...skipping 1001 matching lines...) Expand 10 before | Expand all | Expand 10 after
6651 } 6656 }
6652 6657
6653 void showLiveDocumentInstances() { 6658 void showLiveDocumentInstances() {
6654 WeakDocumentSet& set = liveDocumentSet(); 6659 WeakDocumentSet& set = liveDocumentSet();
6655 fprintf(stderr, "There are %u documents currently alive:\n", set.size()); 6660 fprintf(stderr, "There are %u documents currently alive:\n", set.size());
6656 for (blink::Document* document : set) 6661 for (blink::Document* document : set)
6657 fprintf(stderr, "- Document %p URL: %s\n", document, 6662 fprintf(stderr, "- Document %p URL: %s\n", document,
6658 document->url().getString().utf8().data()); 6663 document->url().getString().utf8().data());
6659 } 6664 }
6660 #endif 6665 #endif
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/dom/Document.h ('k') | third_party/WebKit/Source/web/tests/DocumentLoadingRenderingTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698