| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "sky/engine/config.h" | 5 #include "sky/engine/config.h" |
| 6 #include "sky/engine/core/html/parser/HTMLScriptRunner.h" | 6 #include "sky/engine/core/html/parser/HTMLScriptRunner.h" |
| 7 | 7 |
| 8 #include "sky/engine/core/app/AbstractModule.h" | 8 #include "sky/engine/core/app/AbstractModule.h" |
| 9 #include "sky/engine/core/dom/Document.h" | 9 #include "sky/engine/core/dom/Document.h" |
| 10 #include "sky/engine/core/dom/Microtask.h" | 10 #include "sky/engine/core/dom/Microtask.h" |
| 11 #include "sky/engine/core/frame/LocalFrame.h" | 11 #include "sky/engine/core/frame/LocalFrame.h" |
| 12 #include "sky/engine/core/html/HTMLScriptElement.h" | 12 #include "sky/engine/core/html/HTMLScriptElement.h" |
| 13 #include "sky/engine/core/script/dart_controller.h" | 13 #include "sky/engine/core/script/dart_controller.h" |
| 14 | 14 |
| 15 namespace blink { | 15 namespace blink { |
| 16 | 16 |
| 17 HTMLScriptRunner::HTMLScriptRunner() | 17 HTMLScriptRunner::HTMLScriptRunner() |
| 18 : m_isExecutingScript(false) | 18 : m_isExecutingScript(false) |
| 19 { | 19 { |
| 20 } | 20 } |
| 21 | 21 |
| 22 HTMLScriptRunner::~HTMLScriptRunner() | 22 HTMLScriptRunner::~HTMLScriptRunner() |
| 23 { | 23 { |
| 24 } | 24 } |
| 25 | 25 |
| 26 void HTMLScriptRunner::runScript(PassRefPtr<HTMLScriptElement> element, TextPosi
tion textPosition) | 26 void HTMLScriptRunner::runScript(PassRefPtr<HTMLScriptElement> element, TextPosi
tion textPosition) |
| 27 { | 27 { |
| 28 ASSERT(!hasPendingScripts()); | 28 ASSERT(element->document().haveImportsLoaded()); |
| 29 | |
| 30 if (!element->document().isScriptExecutionReady()) { | |
| 31 m_pendingScript = element; | |
| 32 m_textPosition = textPosition; | |
| 33 return; | |
| 34 } | |
| 35 | |
| 36 executeScript(element, textPosition); | |
| 37 } | |
| 38 | |
| 39 void HTMLScriptRunner::executePendingScripts() | |
| 40 { | |
| 41 executeScript(m_pendingScript.release(), m_textPosition); | |
| 42 } | |
| 43 | |
| 44 void HTMLScriptRunner::executeScript(PassRefPtr<HTMLScriptElement> element, Text
Position textPosition) | |
| 45 { | |
| 46 Microtask::performCheckpoint(); | 29 Microtask::performCheckpoint(); |
| 47 | 30 |
| 48 Document& sourceDocument = element->document(); | 31 Document& sourceDocument = element->document(); |
| 49 String source = element->textContent(); | 32 String source = element->textContent(); |
| 50 | 33 |
| 51 RefPtr<Document> contextDocument = sourceDocument.contextDocument().get(); | 34 RefPtr<Document> contextDocument = sourceDocument.contextDocument().get(); |
| 52 if (!contextDocument) | 35 if (!contextDocument) |
| 53 return; | 36 return; |
| 54 | 37 |
| 55 LocalFrame* frame = contextDocument->frame(); | 38 LocalFrame* frame = contextDocument->frame(); |
| 56 if (!frame) | 39 if (!frame) |
| 57 return; | 40 return; |
| 58 | 41 |
| 59 ASSERT(!m_isExecutingScript); | 42 ASSERT(!m_isExecutingScript); |
| 60 TemporaryChange<bool> executingScript(m_isExecutingScript, true); | 43 TemporaryChange<bool> executingScript(m_isExecutingScript, true); |
| 61 | 44 |
| 62 ASSERT(sourceDocument.module()); | 45 ASSERT(sourceDocument.module()); |
| 63 frame->dart().LoadModule(sourceDocument.module(), source, textPosition); | 46 frame->dart().LoadModule(sourceDocument.module(), source, textPosition); |
| 64 } | 47 } |
| 65 | 48 |
| 66 } | 49 } |
| OLD | NEW |