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

Unified Diff: sky/engine/core/script/dart_controller.h

Issue 938623005: Allow multiple dart <script> tags in .sky files (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: All works! 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
Index: sky/engine/core/script/dart_controller.h
diff --git a/sky/engine/core/script/dart_controller.h b/sky/engine/core/script/dart_controller.h
index 0da2a3dd2a4ee3a6430f659f584503f023be3f86..1fdd40895079c11a3c8ed60c8b61d2de9bef63be 100644
--- a/sky/engine/core/script/dart_controller.h
+++ b/sky/engine/core/script/dart_controller.h
@@ -5,8 +5,8 @@
#ifndef SKY_ENGINE_CORE_SCRIPT_DART_CONTROLLER_H_
#define SKY_ENGINE_CORE_SCRIPT_DART_CONTROLLER_H_
+#include "base/callback_forward.h"
#include "base/macros.h"
-#include "base/memory/weak_ptr.h"
#include "dart/runtime/include/dart_api.h"
#include "sky/engine/wtf/OwnPtr.h"
#include "sky/engine/wtf/text/AtomicString.h"
@@ -17,6 +17,7 @@ class AbstractModule;
class BuiltinSky;
class DOMDartState;
class Document;
+class DartValue;
class DartController {
public:
@@ -25,22 +26,29 @@ class DartController {
static void InitVM();
- void LoadModule(RefPtr<AbstractModule> module,
- const String& source,
- const TextPosition& textPosition);
+ typedef base::Callback<void(RefPtr<AbstractModule>, RefPtr<DartValue>)>
+ LoadFinishedCallback;
+
+ void LoadScriptInModule(AbstractModule* module,
+ const String& source,
+ const TextPosition& textPosition,
+ const LoadFinishedCallback& load_finished_callback);
+ void ExecuteLibraryInModule(AbstractModule* module, Dart_Handle library);
+
void ClearForClose();
- void CreateIsolateFor(Document*);
+ void CreateIsolateFor(Document* document);
DOMDartState* dart_state() const { return dom_dart_state_.get(); }
private:
- void ExecuteModule(RefPtr<AbstractModule> module);
+ bool ImportChildLibraries(AbstractModule* module, Dart_Handle library);
+ Dart_Handle CreateLibrary(AbstractModule* module,
+ const String& source,
+ const TextPosition& position);
OwnPtr<DOMDartState> dom_dart_state_;
OwnPtr<BuiltinSky> builtin_sky_;
- base::WeakPtrFactory<DartController> weak_factory_;
-
DISALLOW_COPY_AND_ASSIGN(DartController);
};

Powered by Google App Engine
This is Rietveld 408576698