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

Side by Side Diff: Source/core/html/parser/HTMLScriptRunner.cpp

Issue 1161823002: Correctly keep track of isolates for microtask execution (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 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 | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2010 Google, Inc. All Rights Reserved. 2 * Copyright (C) 2010 Google, Inc. All Rights Reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #include "config.h" 26 #include "config.h"
27 #include "core/html/parser/HTMLScriptRunner.h" 27 #include "core/html/parser/HTMLScriptRunner.h"
28 28
29 #include "bindings/core/v8/ScriptSourceCode.h" 29 #include "bindings/core/v8/ScriptSourceCode.h"
30 #include "bindings/core/v8/V8PerIsolateData.h"
30 #include "core/dom/Element.h" 31 #include "core/dom/Element.h"
31 #include "core/events/Event.h" 32 #include "core/events/Event.h"
32 #include "core/dom/IgnoreDestructiveWriteCountIncrementer.h" 33 #include "core/dom/IgnoreDestructiveWriteCountIncrementer.h"
33 #include "core/dom/Microtask.h" 34 #include "core/dom/Microtask.h"
34 #include "core/dom/ScriptLoader.h" 35 #include "core/dom/ScriptLoader.h"
35 #include "core/fetch/ScriptResource.h" 36 #include "core/fetch/ScriptResource.h"
36 #include "core/frame/LocalFrame.h" 37 #include "core/frame/LocalFrame.h"
37 #include "core/html/parser/HTMLInputStream.h" 38 #include "core/html/parser/HTMLInputStream.h"
38 #include "core/html/parser/HTMLScriptRunnerHost.h" 39 #include "core/html/parser/HTMLScriptRunnerHost.h"
39 #include "core/html/parser/NestingLevelIncrementer.h" 40 #include "core/html/parser/NestingLevelIncrementer.h"
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 void HTMLScriptRunner::executePendingScriptAndDispatchEvent(PendingScript& pendi ngScript, PendingScript::Type pendingScriptType) 127 void HTMLScriptRunner::executePendingScriptAndDispatchEvent(PendingScript& pendi ngScript, PendingScript::Type pendingScriptType)
127 { 128 {
128 bool errorOccurred = false; 129 bool errorOccurred = false;
129 double loadFinishTime = pendingScript.resource() && pendingScript.resource() ->url().protocolIsInHTTPFamily() ? pendingScript.resource()->loadFinishTime() : 0; 130 double loadFinishTime = pendingScript.resource() && pendingScript.resource() ->url().protocolIsInHTTPFamily() ? pendingScript.resource()->loadFinishTime() : 0;
130 ScriptSourceCode sourceCode = pendingScript.getSource(documentURLForScriptEx ecution(m_document), errorOccurred); 131 ScriptSourceCode sourceCode = pendingScript.getSource(documentURLForScriptEx ecution(m_document), errorOccurred);
131 132
132 // Stop watching loads before executeScript to prevent recursion if the scri pt reloads itself. 133 // Stop watching loads before executeScript to prevent recursion if the scri pt reloads itself.
133 pendingScript.stopWatchingForLoad(this); 134 pendingScript.stopWatchingForLoad(this);
134 135
135 if (!isExecutingScript()) { 136 if (!isExecutingScript()) {
136 Microtask::performCheckpoint(); 137 Microtask::performCheckpoint(V8PerIsolateData::mainThreadIsolate());
137 if (pendingScriptType == PendingScript::ParsingBlocking) { 138 if (pendingScriptType == PendingScript::ParsingBlocking) {
138 m_hasScriptsWaitingForResources = !m_document->isScriptExecutionRead y(); 139 m_hasScriptsWaitingForResources = !m_document->isScriptExecutionRead y();
139 // The parser cannot be unblocked as a microtask requested another r esource 140 // The parser cannot be unblocked as a microtask requested another r esource
140 if (m_hasScriptsWaitingForResources) 141 if (m_hasScriptsWaitingForResources)
141 return; 142 return;
142 } 143 }
143 } 144 }
144 145
145 // Clear the pending script before possible rentrancy from executeScript() 146 // Clear the pending script before possible rentrancy from executeScript()
146 RefPtrWillBeRawPtr<Element> element = pendingScript.releaseElementAndClear() ; 147 RefPtrWillBeRawPtr<Element> element = pendingScript.releaseElementAndClear() ;
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
330 // be getting into the case of a null script element, but seem to be fro m 331 // be getting into the case of a null script element, but seem to be fro m
331 // time to time. The assertion is left in to help find those cases and 332 // time to time. The assertion is left in to help find those cases and
332 // is being tracked by <https://bugs.webkit.org/show_bug.cgi?id=60559>. 333 // is being tracked by <https://bugs.webkit.org/show_bug.cgi?id=60559>.
333 ASSERT(scriptLoader); 334 ASSERT(scriptLoader);
334 if (!scriptLoader) 335 if (!scriptLoader)
335 return; 336 return;
336 337
337 ASSERT(scriptLoader->isParserInserted()); 338 ASSERT(scriptLoader->isParserInserted());
338 339
339 if (!isExecutingScript()) 340 if (!isExecutingScript())
340 Microtask::performCheckpoint(); 341 Microtask::performCheckpoint(V8PerIsolateData::mainThreadIsolate());
341 342
342 InsertionPointRecord insertionPointRecord(m_host->inputStream()); 343 InsertionPointRecord insertionPointRecord(m_host->inputStream());
343 NestingLevelIncrementer nestingLevelIncrementer(m_scriptNestingLevel); 344 NestingLevelIncrementer nestingLevelIncrementer(m_scriptNestingLevel);
344 345
345 scriptLoader->prepareScript(scriptStartPosition); 346 scriptLoader->prepareScript(scriptStartPosition);
346 347
347 if (!scriptLoader->willBeParserExecuted()) 348 if (!scriptLoader->willBeParserExecuted())
348 return; 349 return;
349 350
350 if (scriptLoader->willExecuteWhenDocumentFinishedParsing()) { 351 if (scriptLoader->willExecuteWhenDocumentFinishedParsing()) {
(...skipping 16 matching lines...) Expand all
367 { 368 {
368 visitor->trace(m_document); 369 visitor->trace(m_document);
369 visitor->trace(m_host); 370 visitor->trace(m_host);
370 visitor->trace(m_parserBlockingScript); 371 visitor->trace(m_parserBlockingScript);
371 #if ENABLE(OILPAN) 372 #if ENABLE(OILPAN)
372 visitor->trace(m_scriptsToExecuteAfterParsing); 373 visitor->trace(m_scriptsToExecuteAfterParsing);
373 #endif 374 #endif
374 } 375 }
375 376
376 } // namespace blink 377 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698