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/bindings/core/v8/ScriptController.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 | 14 |
14 namespace blink { | 15 namespace blink { |
15 | 16 |
16 HTMLScriptRunner::HTMLScriptRunner() | 17 HTMLScriptRunner::HTMLScriptRunner() |
17 : m_isExecutingScript(false) | 18 : m_isExecutingScript(false) |
18 { | 19 { |
19 } | 20 } |
20 | 21 |
21 HTMLScriptRunner::~HTMLScriptRunner() | 22 HTMLScriptRunner::~HTMLScriptRunner() |
22 { | 23 { |
(...skipping 28 matching lines...) Expand all Loading... |
51 if (!contextDocument) | 52 if (!contextDocument) |
52 return; | 53 return; |
53 | 54 |
54 LocalFrame* frame = contextDocument->frame(); | 55 LocalFrame* frame = contextDocument->frame(); |
55 if (!frame) | 56 if (!frame) |
56 return; | 57 return; |
57 | 58 |
58 ASSERT(!m_isExecutingScript); | 59 ASSERT(!m_isExecutingScript); |
59 TemporaryChange<bool> executingScript(m_isExecutingScript, true); | 60 TemporaryChange<bool> executingScript(m_isExecutingScript, true); |
60 | 61 |
61 contextDocument->pushCurrentScript(element); | |
62 ASSERT(sourceDocument.module()); | 62 ASSERT(sourceDocument.module()); |
63 frame->script().executeModuleScript(*sourceDocument.module(), source, textPo
sition); | 63 frame->dart().LoadModule(sourceDocument.module(), source, textPosition); |
64 contextDocument->popCurrentScript(); | |
65 } | 64 } |
66 | 65 |
67 } | 66 } |
OLD | NEW |