| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 #ifndef SKY_ENGINE_CORE_SCRIPT_DART_LOADER_H_ | 5 #ifndef SKY_ENGINE_CORE_SCRIPT_DART_LOADER_H_ |
| 6 #define SKY_ENGINE_CORE_SCRIPT_DART_LOADER_H_ | 6 #define SKY_ENGINE_CORE_SCRIPT_DART_LOADER_H_ |
| 7 | 7 |
| 8 #include "base/callback_forward.h" | 8 #include "base/callback_forward.h" |
| 9 #include "base/macros.h" | 9 #include "base/macros.h" |
| 10 #include "base/memory/weak_ptr.h" | 10 #include "base/memory/weak_ptr.h" |
| 11 #include "dart/runtime/include/dart_api.h" | 11 #include "dart/runtime/include/dart_api.h" |
| 12 #include "mojo/services/network/public/interfaces/url_loader.mojom.h" |
| 12 #include "sky/engine/wtf/HashMap.h" | 13 #include "sky/engine/wtf/HashMap.h" |
| 13 #include "sky/engine/wtf/HashSet.h" | 14 #include "sky/engine/wtf/HashSet.h" |
| 14 #include "sky/engine/wtf/OwnPtr.h" | 15 #include "sky/engine/wtf/OwnPtr.h" |
| 15 #include "sky/engine/wtf/Vector.h" | 16 #include "sky/engine/wtf/Vector.h" |
| 16 #include "sky/engine/wtf/text/WTFString.h" | 17 #include "sky/engine/wtf/text/WTFString.h" |
| 17 | 18 |
| 18 namespace blink { | 19 namespace blink { |
| 19 class DartState; | 20 class DartState; |
| 20 class DartDependency; | 21 class DartDependency; |
| 21 class DartDependencyCatcher; | 22 class DartDependencyCatcher; |
| 22 class KURL; | 23 class KURL; |
| 23 | 24 |
| 24 // TODO(abarth): This class seems more complicated than it needs to be. Is | 25 // TODO(abarth): This class seems more complicated than it needs to be. Is |
| 25 // there some way of simplifying this system? For example, we have a bunch | 26 // there some way of simplifying this system? For example, we have a bunch |
| 26 // of inner classes that could potentially be factored out in some other way. | 27 // of inner classes that could potentially be factored out in some other way. |
| 27 class DartLoader { | 28 class DartLoader { |
| 28 public: | 29 public: |
| 29 explicit DartLoader(DartState* dart_state); | 30 explicit DartLoader(DartState* dart_state); |
| 30 ~DartLoader(); | 31 ~DartLoader(); |
| 31 | 32 |
| 32 // TODO(dart): This can be called both on the main thread from application iso
lates | 33 // TODO(dart): This can be called both on the main thread from application iso
lates |
| 33 // or from the handle watcher isolate thread. | 34 // or from the handle watcher isolate thread. |
| 34 static Dart_Handle HandleLibraryTag(Dart_LibraryTag tag, | 35 static Dart_Handle HandleLibraryTag(Dart_LibraryTag tag, |
| 35 Dart_Handle library, | 36 Dart_Handle library, |
| 36 Dart_Handle url); | 37 Dart_Handle url); |
| 37 | 38 |
| 38 void LoadLibrary(const KURL& url); | 39 void LoadLibrary(const KURL& url, mojo::URLResponsePtr response = nullptr); |
| 39 | 40 |
| 40 void WaitForDependencies(const HashSet<DartDependency*>& dependencies, | 41 void WaitForDependencies(const HashSet<DartDependency*>& dependencies, |
| 41 const base::Closure& callback); | 42 const base::Closure& callback); |
| 42 | 43 |
| 43 void set_dependency_catcher(DartDependencyCatcher* dependency_catcher) { | 44 void set_dependency_catcher(DartDependencyCatcher* dependency_catcher) { |
| 44 DCHECK(!dependency_catcher_ || !dependency_catcher); | 45 DCHECK(!dependency_catcher_ || !dependency_catcher); |
| 45 dependency_catcher_ = dependency_catcher; | 46 dependency_catcher_ = dependency_catcher; |
| 46 } | 47 } |
| 47 | 48 |
| 48 DartState* dart_state() const { return dart_state_.get(); } | 49 DartState* dart_state() const { return dart_state_.get(); } |
| (...skipping 16 matching lines...) Expand all Loading... |
| 65 HashSet<OwnPtr<Job>> jobs_; | 66 HashSet<OwnPtr<Job>> jobs_; |
| 66 HashSet<OwnPtr<DependencyWatcher>> dependency_watchers_; | 67 HashSet<OwnPtr<DependencyWatcher>> dependency_watchers_; |
| 67 DartDependencyCatcher* dependency_catcher_; | 68 DartDependencyCatcher* dependency_catcher_; |
| 68 | 69 |
| 69 DISALLOW_COPY_AND_ASSIGN(DartLoader); | 70 DISALLOW_COPY_AND_ASSIGN(DartLoader); |
| 70 }; | 71 }; |
| 71 | 72 |
| 72 } // namespace blink | 73 } // namespace blink |
| 73 | 74 |
| 74 #endif // SKY_ENGINE_CORE_SCRIPT_DART_LOADER_H_ | 75 #endif // SKY_ENGINE_CORE_SCRIPT_DART_LOADER_H_ |
| OLD | NEW |