Index: sky/engine/core/script/dart_debugger.h |
diff --git a/mojo/dart/embedder/dart_debugger.h b/sky/engine/core/script/dart_debugger.h |
similarity index 75% |
copy from mojo/dart/embedder/dart_debugger.h |
copy to sky/engine/core/script/dart_debugger.h |
index fe7ef2d84f31c1cffe796fda4dc6cf9074d5e896..8c93b6cecb866204ab5c8b5723106259e5400d55 100644 |
--- a/mojo/dart/embedder/dart_debugger.h |
+++ b/sky/engine/core/script/dart_debugger.h |
@@ -2,20 +2,22 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#ifndef MOJO_DART_EMBEDDER_DART_DEBUGGER_H_ |
-#define MOJO_DART_EMBEDDER_DART_DEBUGGER_H_ |
+#ifndef SKY_ENGINE_CORE_SCRIPT_DART_DEBUGGER_H_ |
+#define SKY_ENGINE_CORE_SCRIPT_DART_DEBUGGER_H_ |
+ |
+#include <memory> |
+#include <vector> |
#include "dart/runtime/include/dart_api.h" |
#include "dart/runtime/include/dart_debugger_api.h" |
#include "dart/runtime/include/dart_native_api.h" |
-#include "mojo/dart/embedder/monitor.h" |
+#include "sky/engine/core/script/monitor.h" |
namespace base { |
class Lock; |
} |
-namespace mojo { |
-namespace dart { |
+namespace blink { |
class DartDebuggerIsolate { |
public: |
@@ -60,21 +62,20 @@ class DartDebugger { |
static void NotifyIsolate(Dart_Isolate isolate); |
- static DartDebuggerIsolate* FindIsolateById(Dart_IsolateId id); |
+ static intptr_t FindIsolateIndexById(Dart_IsolateId id); |
- static DartDebuggerIsolate* FindIsolateByIdLocked(Dart_IsolateId id); |
+ static intptr_t FindIsolateIndexByIdLocked(Dart_IsolateId id); |
- static DartDebuggerIsolate* AddIsolate(Dart_IsolateId id); |
+ static void AddIsolate(Dart_IsolateId id); |
static void RemoveIsolate(Dart_IsolateId id); |
static base::Lock* lock_; |
- static std::vector<DartDebuggerIsolate*> isolates_; |
+ static std::vector<std::unique_ptr<DartDebuggerIsolate>>* isolates_; |
friend class DartDebuggerIsolate; |
}; |
-} // namespace dart |
-} // namespace mojo |
+} // namespace blink |
-#endif // MOJO_DART_EMBEDDER_DART_DEBUGGER_H_ |
+#endif // SKY_ENGINE_CORE_SCRIPT_DART_DEBUGGER_H_ |