Almost remove //flutter/tonic (flutter#2916)

All that's left is two task runners, which should be statics somewhere.
dattto · Aug 12, 2016 · 855e471 · 855e471
1 parent 40dfdbc
commit 855e471
Show file tree

Hide file tree

Showing 14 changed files with 38 additions and 235 deletions.
diff --git a/DEPS b/DEPS
@@ -55,7 +55,7 @@ deps = {
    Var('fuchsia_git') + '/ftl' + '@' + '0bb3a02301c8a88b494e58c6636fa509525adaa8',
 
   'src/lib/tonic':
-   Var('fuchsia_git') + '/tonic' + '@' + '66fc8a71ae54c628537e7f4b2e8bf9304788c19d',
+   Var('fuchsia_git') + '/tonic' + '@' + 'e559b5fab4bad0fb528c68497a02df280f526c66',
 
   'src/third_party/gtest':
    Var('fuchsia_git') + '/third_party/gtest' + '@' + 'c00f82917331efbbd27124b537e4ccc915a02b72',

diff --git a/lib/io/BUILD.gn b/lib/io/BUILD.gn
@@ -0,0 +1,17 @@
+# Copyright 2016 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+source_set("io") {
+  sources = [
+    "dart_io.cc",
+    "dart_io.h",
+  ]
+
+  deps = [
+    "//dart/runtime:libdart",
+    "//dart/runtime/bin:embedded_dart_io",
+    "//lib/ftl",
+    "//lib/tonic/converter",
+  ]
+}
diff --git a/tonic/dart_io.cc → lib/io/dart_io.cc b/tonic/dart_io.cc → lib/io/dart_io.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "flutter/tonic/dart_io.h"
+#include "flutter/lib/io/dart_io.h"
 
 #include "dart/runtime/bin/io_natives.h"
 #include "dart/runtime/include/dart_api.h"

diff --git a/tonic/dart_io.h → lib/io/dart_io.h b/tonic/dart_io.h → lib/io/dart_io.h
diff --git a/lib/ui/BUILD.gn b/lib/ui/BUILD.gn
@@ -46,5 +46,6 @@ source_set("ui") {
     "//flutter/skia",
     "//flutter/tonic",
     "//lib/tonic",
+    "//lib/tonic/mojo",
   ]
 }
diff --git a/lib/ui/painting/image_decoding.cc b/lib/ui/painting/image_decoding.cc
@@ -14,7 +14,7 @@
 #include "lib/ftl/tasks/task_runner.h"
 #include "lib/tonic/dart_persistent_value.h"
 #include "lib/tonic/logging/dart_invoke.h"
-#include "lib/tonic/mojo_converter.h"
+#include "lib/tonic/mojo/mojo_converter.h"
 #include "lib/tonic/typed_data/uint8_list.h"
 #include "third_party/skia/include/core/SkImageGenerator.h"
 

diff --git a/sky/engine/core/BUILD.gn b/sky/engine/core/BUILD.gn
@@ -11,11 +11,13 @@ source_set("libraries") {
   public_deps = [
     "//base",
     "//flutter/flow",
+    "//flutter/glue",
+    "//flutter/lib/io",
     "//flutter/lib/ui",
     "//flutter/tonic",
-    "//flutter/glue",
     "//lib/ftl",
     "//lib/tonic",
+    "//lib/tonic/debugger",
     "//mojo/application",
     "//mojo/data_pipe_utils",
     "//mojo/public/c/system",

diff --git a/sky/engine/core/script/dart_controller.cc b/sky/engine/core/script/dart_controller.cc
@@ -8,6 +8,7 @@
 
 #include "dart/runtime/include/dart_tools_api.h"
 #include "flutter/glue/trace_event.h"
+#include "flutter/lib/io/dart_io.h"
 #include "flutter/sky/engine/bindings/dart_mojo_internal.h"
 #include "flutter/sky/engine/bindings/dart_runtime_hooks.h"
 #include "flutter/sky/engine/bindings/dart_ui.h"
@@ -17,14 +18,13 @@
 #include "flutter/sky/engine/public/platform/Platform.h"
 #include "flutter/sky/engine/public/platform/sky_settings.h"
 #include "flutter/sky/engine/wtf/MakeUnique.h"
-#include "flutter/tonic/dart_debugger.h"
-#include "flutter/tonic/dart_io.h"
 #include "flutter/tonic/dart_state.h"
 #include "lib/ftl/files/directory.h"
 #include "lib/ftl/files/path.h"
 #include "lib/tonic/dart_class_library.h"
 #include "lib/tonic/dart_message_handler.h"
 #include "lib/tonic/dart_wrappable.h"
+#include "lib/tonic/debugger/dart_debugger.h"
 #include "lib/tonic/file_loader/file_loader.h"
 #include "lib/tonic/logging/dart_error.h"
 #include "lib/tonic/logging/dart_invoke.h"

diff --git a/sky/engine/core/script/dart_init.cc b/sky/engine/core/script/dart_init.cc
@@ -15,30 +15,30 @@
 #include "dart/runtime/bin/embedded_dart_io.h"
 #include "dart/runtime/include/dart_mirrors_api.h"
 #include "flutter/assets/zip_asset_store.h"
-#include "flutter/tonic/dart_debugger.h"
-#include "flutter/tonic/dart_io.h"
-#include "flutter/tonic/dart_state.h"
 #include "flutter/glue/trace_event.h"
+#include "flutter/lib/io/dart_io.h"
+#include "flutter/sky/engine/bindings/dart_mojo_internal.h"
+#include "flutter/sky/engine/bindings/dart_runtime_hooks.h"
+#include "flutter/sky/engine/bindings/dart_ui.h"
+#include "flutter/sky/engine/core/script/dart_service_isolate.h"
+#include "flutter/sky/engine/core/script/ui_dart_state.h"
+#include "flutter/sky/engine/core/start_up.h"
+#include "flutter/sky/engine/public/platform/sky_settings.h"
+#include "flutter/sky/engine/wtf/MakeUnique.h"
+#include "flutter/tonic/dart_state.h"
 #include "lib/ftl/files/eintr_wrapper.h"
 #include "lib/ftl/files/unique_fd.h"
 #include "lib/ftl/logging.h"
 #include "lib/ftl/time/time_delta.h"
 #include "lib/tonic/dart_class_library.h"
 #include "lib/tonic/dart_wrappable.h"
+#include "lib/tonic/debugger/dart_debugger.h"
 #include "lib/tonic/logging/dart_error.h"
 #include "lib/tonic/logging/dart_invoke.h"
 #include "lib/tonic/scopes/dart_api_scope.h"
 #include "lib/tonic/scopes/dart_isolate_scope.h"
 #include "lib/tonic/typed_data/uint8_list.h"
 #include "mojo/public/platform/dart/dart_handle_watcher.h"
-#include "flutter/sky/engine/bindings/dart_mojo_internal.h"
-#include "flutter/sky/engine/bindings/dart_runtime_hooks.h"
-#include "flutter/sky/engine/bindings/dart_ui.h"
-#include "flutter/sky/engine/core/script/dart_service_isolate.h"
-#include "flutter/sky/engine/core/script/ui_dart_state.h"
-#include "flutter/sky/engine/core/start_up.h"
-#include "flutter/sky/engine/public/platform/sky_settings.h"
-#include "flutter/sky/engine/wtf/MakeUnique.h"
 
 #ifdef OS_ANDROID
 #include "flutter/lib/jni/dart_jni.h"
@@ -561,7 +561,7 @@ void InitDartVM() {
   {
     TRACE_EVENT0("flutter", "DartDebugger::InitDebugger");
     // This should be called before calling Dart_Initialize.
-    DartDebugger::InitDebugger();
+    tonic::DartDebugger::InitDebugger();
   }
 #endif
 

diff --git a/sky/shell/ui/engine.cc b/sky/shell/ui/engine.cc
@@ -20,7 +20,6 @@
 #include "flutter/sky/engine/core/script/ui_dart_state.h"
 #include "flutter/sky/engine/public/platform/Platform.h"
 #include "flutter/sky/engine/public/web/Sky.h"
-#include "flutter/sky/shell/shell.h"
 #include "flutter/sky/shell/ui/animator.h"
 #include "flutter/sky/shell/ui/flutter_font_selector.h"
 #include "flutter/sky/shell/ui/platform_impl.h"

diff --git a/sky/shell/ui/engine.h b/sky/shell/ui/engine.h
@@ -11,7 +11,6 @@
 #include "flutter/services/rasterizer/rasterizer.mojom.h"
 #include "flutter/sky/engine/public/sky/sky_view_client.h"
 #include "flutter/sky/engine/public/sky/sky_view.h"
-#include "flutter/sky/shell/rasterizer.h"
 #include "flutter/sky/shell/ui_delegate.h"
 #include "lib/ftl/macros.h"
 #include "lib/ftl/memory/weak_ptr.h"

diff --git a/tonic/BUILD.gn b/tonic/BUILD.gn
@@ -4,10 +4,6 @@
 
 source_set("tonic") {
   sources = [
-    "dart_debugger.cc",
-    "dart_debugger.h",
-    "dart_io.cc",
-    "dart_io.h",
     "dart_state.cc",
     "dart_state.h",
   ]

diff --git a/tonic/dart_debugger.cc b/tonic/dart_debugger.cc
diff --git a/tonic/dart_debugger.h b/tonic/dart_debugger.h