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

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

Issue 1903803002: Do not block painting for in-body CSS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed merge conflict Created 4 years, 7 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 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserv ed. 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserv ed.
6 * Copyright (C) 2008 Nikolas Zimmermann <zimmermann@kde.org> 6 * Copyright (C) 2008 Nikolas Zimmermann <zimmermann@kde.org>
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
242 defer = FetchRequest::LazyLoad; 242 defer = FetchRequest::LazyLoad;
243 if (!fetchScript(client->sourceAttributeValue(), defer)) 243 if (!fetchScript(client->sourceAttributeValue(), defer))
244 return false; 244 return false;
245 } 245 }
246 246
247 if (client->hasSourceAttribute() && client->deferAttributeValue() && m_parse rInserted && !client->asyncAttributeValue()) { 247 if (client->hasSourceAttribute() && client->deferAttributeValue() && m_parse rInserted && !client->asyncAttributeValue()) {
248 m_willExecuteWhenDocumentFinishedParsing = true; 248 m_willExecuteWhenDocumentFinishedParsing = true;
249 m_willBeParserExecuted = true; 249 m_willBeParserExecuted = true;
250 } else if (client->hasSourceAttribute() && m_parserInserted && !client->asyn cAttributeValue()) { 250 } else if (client->hasSourceAttribute() && m_parserInserted && !client->asyn cAttributeValue()) {
251 m_willBeParserExecuted = true; 251 m_willBeParserExecuted = true;
252 } else if (!client->hasSourceAttribute() && m_parserInserted && !elementDocu ment.isRenderingReady()) { 252 } else if (!client->hasSourceAttribute() && m_parserInserted && !elementDocu ment.isScriptExecutionReady()) {
253 m_willBeParserExecuted = true; 253 m_willBeParserExecuted = true;
254 m_readyToBeParserExecuted = true; 254 m_readyToBeParserExecuted = true;
255 } else if (client->hasSourceAttribute() && !client->asyncAttributeValue() && !m_forceAsync) { 255 } else if (client->hasSourceAttribute() && !client->asyncAttributeValue() && !m_forceAsync) {
256 m_pendingScript = PendingScript::create(m_element, m_resource.get()); 256 m_pendingScript = PendingScript::create(m_element, m_resource.get());
257 m_willExecuteInOrder = true; 257 m_willExecuteInOrder = true;
258 contextDocument->scriptRunner()->queueScriptForExecution(this, ScriptRun ner::IN_ORDER_EXECUTION); 258 contextDocument->scriptRunner()->queueScriptForExecution(this, ScriptRun ner::IN_ORDER_EXECUTION);
259 // Note that watchForLoad can immediately call notifyFinished. 259 // Note that watchForLoad can immediately call notifyFinished.
260 m_pendingScript->watchForLoad(this); 260 m_pendingScript->watchForLoad(this);
261 } else if (client->hasSourceAttribute()) { 261 } else if (client->hasSourceAttribute()) {
262 m_pendingScript = PendingScript::create(m_element, m_resource.get()); 262 m_pendingScript = PendingScript::create(m_element, m_resource.get());
(...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after
522 if (isHTMLScriptLoader(element)) 522 if (isHTMLScriptLoader(element))
523 return toHTMLScriptElement(element)->loader(); 523 return toHTMLScriptElement(element)->loader();
524 524
525 if (isSVGScriptLoader(element)) 525 if (isSVGScriptLoader(element))
526 return toSVGScriptElement(element)->loader(); 526 return toSVGScriptElement(element)->loader();
527 527
528 return 0; 528 return 0;
529 } 529 }
530 530
531 } // namespace blink 531 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/dom/ProcessingInstruction.cpp ('k') | third_party/WebKit/Source/core/dom/StyleElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698