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

Unified Diff: sky/engine/core/html/parser/HTMLScriptRunner.cpp

Issue 922893002: Merge the Sky Engine changes from the SkyDart branch (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sky/engine/core/html/parser/HTMLDocumentParser.h ('k') | sky/engine/core/html/parser/HTMLTreeBuilder.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/html/parser/HTMLScriptRunner.cpp
diff --git a/sky/engine/core/html/parser/HTMLScriptRunner.cpp b/sky/engine/core/html/parser/HTMLScriptRunner.cpp
index ab06897e7210fd378e70a636aba9da03f772cb37..83ff303dadb850307826b90b8b38ec38f02b0435 100644
--- a/sky/engine/core/html/parser/HTMLScriptRunner.cpp
+++ b/sky/engine/core/html/parser/HTMLScriptRunner.cpp
@@ -5,11 +5,12 @@
#include "sky/engine/config.h"
#include "sky/engine/core/html/parser/HTMLScriptRunner.h"
-#include "sky/engine/bindings/core/v8/ScriptController.h"
+#include "sky/engine/core/app/AbstractModule.h"
#include "sky/engine/core/dom/Document.h"
#include "sky/engine/core/dom/Microtask.h"
#include "sky/engine/core/frame/LocalFrame.h"
#include "sky/engine/core/html/HTMLScriptElement.h"
+#include "sky/engine/core/script/dart_controller.h"
namespace blink {
@@ -58,10 +59,8 @@ void HTMLScriptRunner::executeScript(PassRefPtr<HTMLScriptElement> element, Text
ASSERT(!m_isExecutingScript);
TemporaryChange<bool> executingScript(m_isExecutingScript, true);
- contextDocument->pushCurrentScript(element);
ASSERT(sourceDocument.module());
- frame->script().executeModuleScript(*sourceDocument.module(), source, textPosition);
- contextDocument->popCurrentScript();
+ frame->dart().LoadModule(sourceDocument.module(), source, textPosition);
}
}
« no previous file with comments | « sky/engine/core/html/parser/HTMLDocumentParser.h ('k') | sky/engine/core/html/parser/HTMLTreeBuilder.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698