Ensure //flutter/fml is dependency free.

assets/BUILD.gn

@@ -14,6 +14,7 @@ source_set("assets") {
   deps = [
     "//flutter/common",
     "//flutter/fml",
+    "//flutter/fml/trace",
   ]
 
   public_configs = [ "//flutter:config" ]

assets/asset_manager.cc

@@ -5,7 +5,7 @@
 #include "flutter/assets/asset_manager.h"
 
 #include "flutter/assets/directory_asset_bundle.h"
-#include "flutter/fml/trace_event.h"
+#include "flutter/fml/trace/trace_event.h"
 
 namespace flutter {
 

assets/directory_asset_bundle.cc

@@ -10,7 +10,7 @@
 #include "flutter/fml/eintr_wrapper.h"
 #include "flutter/fml/file.h"
 #include "flutter/fml/mapping.h"
-#include "flutter/fml/trace_event.h"
+#include "flutter/fml/trace/trace_event.h"
 
 namespace flutter {
 

benchmarking/BUILD.gn

@@ -16,6 +16,7 @@ source_set("benchmarking") {
 
   public_deps = [
     "//flutter/fml",
+    "//flutter/runtime:libdart",
     "//third_party/benchmark",
   ]
 

ci/licenses_golden/licenses_flutter

@@ -288,8 +288,8 @@ FILE: ../../../flutter/fml/time/time_point.cc
 FILE: ../../../flutter/fml/time/time_point.h
 FILE: ../../../flutter/fml/time/time_point_unittest.cc
 FILE: ../../../flutter/fml/time/time_unittest.cc
-FILE: ../../../flutter/fml/trace_event.cc
-FILE: ../../../flutter/fml/trace_event.h
+FILE: ../../../flutter/fml/trace/trace_event.cc
+FILE: ../../../flutter/fml/trace/trace_event.h
 FILE: ../../../flutter/fml/unique_fd.cc
 FILE: ../../../flutter/fml/unique_fd.h
 FILE: ../../../flutter/fml/unique_object.h

common/graphics/BUILD.gn

@@ -21,6 +21,7 @@ source_set("graphics") {
   deps = [
     "//flutter/assets",
     "//flutter/fml",
+    "//flutter/fml/trace",
     "//flutter/shell/version:version",
     "//third_party/rapidjson",
     "//third_party/skia",

common/graphics/persistent_cache.cc

@@ -15,7 +15,7 @@
 #include "flutter/fml/make_copyable.h"
 #include "flutter/fml/mapping.h"
 #include "flutter/fml/paths.h"
-#include "flutter/fml/trace_event.h"
+#include "flutter/fml/trace/trace_event.h"
 #include "flutter/shell/version/version.h"
 #include "rapidjson/document.h"
 #include "third_party/skia/include/gpu/GrDirectContext.h"

flow/BUILD.gn

@@ -76,6 +76,7 @@ source_set("flow") {
     "//flutter/common",
     "//flutter/common/graphics",
     "//flutter/fml",
+    "//flutter/fml/trace",
     "//third_party/skia",
   ]
 
@@ -177,9 +178,9 @@ if (enable_unittests) {
       ":flow_testing",
       "//flutter/common/graphics",
       "//flutter/fml",
+      "//flutter/fml/trace",
       "//flutter/testing:skia",
       "//flutter/testing:testing_lib",
-      "//third_party/dart/runtime:libdart_jit",  # for tracing
       "//third_party/googletest:gtest",
       "//third_party/skia",
     ]

flow/layers/layer.h

@@ -17,7 +17,7 @@
 #include "flutter/fml/compiler_specific.h"
 #include "flutter/fml/logging.h"
 #include "flutter/fml/macros.h"
-#include "flutter/fml/trace_event.h"
+#include "flutter/fml/trace/trace_event.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkColorFilter.h"

flow/layers/layer_tree.cc

@@ -5,7 +5,7 @@
 #include "flutter/flow/layers/layer_tree.h"
 
 #include "flutter/flow/layers/layer.h"
-#include "flutter/fml/trace_event.h"
+#include "flutter/fml/trace/trace_event.h"
 #include "third_party/skia/include/core/SkPictureRecorder.h"
 #include "third_party/skia/include/utils/SkNWayCanvas.h"
 

flow/layers/opacity_layer.cc

@@ -4,7 +4,7 @@
 
 #include "flutter/flow/layers/opacity_layer.h"
 
-#include "flutter/fml/trace_event.h"
+#include "flutter/fml/trace/trace_event.h"
 #include "third_party/skia/include/core/SkPaint.h"
 
 namespace flutter {

flow/raster_cache.cc

@@ -10,7 +10,7 @@
 #include "flutter/flow/layers/layer.h"
 #include "flutter/flow/paint_utils.h"
 #include "flutter/fml/logging.h"
-#include "flutter/fml/trace_event.h"
+#include "flutter/fml/trace/trace_event.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkImage.h"
 #include "third_party/skia/include/core/SkPicture.h"

flow/scene_update_context.cc

@@ -10,7 +10,7 @@
 #include "flutter/flow/layers/layer.h"
 #include "flutter/flow/matrix_decomposition.h"
 #include "flutter/flow/view_holder.h"
-#include "flutter/fml/trace_event.h"
+#include "flutter/fml/trace/trace_event.h"
 #include "include/core/SkColor.h"
 
 namespace flutter {

flow/skia_gpu_object.cc

@@ -5,7 +5,7 @@
 #include "flutter/flow/skia_gpu_object.h"
 
 #include "flutter/fml/message_loop.h"
-#include "flutter/fml/trace_event.h"
+#include "flutter/fml/trace/trace_event.h"
 
 namespace flutter {
 

fml/BUILD.gn

@@ -82,8 +82,6 @@ source_set("fml") {
     "time/time_delta.h",
     "time/time_point.cc",
     "time/time_point.h",
-    "trace_event.cc",
-    "trace_event.h",
     "unique_fd.cc",
     "unique_fd.h",
     "unique_object.h",
@@ -193,6 +191,9 @@ source_set("fml") {
       "$fuchsia_sdk_root/pkg:trace-engine",
       "$fuchsia_sdk_root/pkg:zx",
     ]
+
+    libs +=
+        [ "${fuchsia_sdk_path}/arch/${target_cpu}/sysroot/lib/libzircon.so" ]
   }
 
   if (is_win) {
@@ -237,7 +238,6 @@ if (enable_unittests) {
     deps = [
       "//flutter/benchmarking",
       "//flutter/fml",
-      "//flutter/runtime:libdart",
     ]
   }
 
@@ -283,13 +283,7 @@ if (enable_unittests) {
       ":fml_fixtures",
       "//flutter/fml",
       "//flutter/fml/dart",
-      "//flutter/runtime:libdart",
       "//flutter/testing",
     ]
-
-    if (is_fuchsia) {
-      libs =
-          [ "${fuchsia_sdk_path}/arch/${target_cpu}/sysroot/lib/libzircon.so" ]
-    }
   }
 }

fml/concurrent_message_loop.cc

@@ -7,7 +7,6 @@
 #include <algorithm>
 
 #include "flutter/fml/thread.h"
-#include "flutter/fml/trace_event.h"
 
 namespace fml {
 
@@ -100,7 +99,6 @@ void ConcurrentMessageLoop::WorkerMain() {
     // themselves try to post more tasks to the message loop.
     lock.unlock();
 
-    TRACE_EVENT0("flutter", "ConcurrentWorkerWake");
     // Execute the primary task we woke up for.
     if (task) {
       task();

fml/message_loop_impl.cc

@@ -11,7 +11,6 @@
 
 #include "flutter/fml/build_config.h"
 #include "flutter/fml/logging.h"
-#include "flutter/fml/trace_event.h"
 
 #if OS_MACOSX
 #include "flutter/fml/platform/darwin/message_loop_darwin.h"
@@ -118,8 +117,6 @@ void MessageLoopImpl::DoTerminate() {
 }
 
 void MessageLoopImpl::FlushTasks(FlushType type) {
-  TRACE_EVENT0("fml", "MessageLoop::FlushTasks");
-
   const auto now = fml::TimePoint::Now();
   fml::closure invocation;
   do {

fml/platform/posix/file_posix.cc

@@ -16,7 +16,6 @@
 #include "flutter/fml/eintr_wrapper.h"
 #include "flutter/fml/logging.h"
 #include "flutter/fml/mapping.h"
-#include "flutter/fml/trace_event.h"
 #include "flutter/fml/unique_fd.h"
 
 namespace fml {
@@ -73,7 +72,6 @@ fml::UniqueFD OpenFile(const fml::UniqueFD& base_directory,
                        const char* path,
                        bool create_if_necessary,
                        FilePermission permission) {
-  TRACE_EVENT0("flutter", "fml::OpenFile");
   if (path == nullptr) {
     return {};
   }

fml/trace/BUILD.gn

@@ -0,0 +1,15 @@
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# Utilities for tracing to the timeline. The timeline is a Dart utility and
+# including this dependency will cause the Dart runtime to be included within
+#  the target.
+source_set("trace") {
+  sources = [
+    "trace_event.cc",
+    "trace_event.h",
+  ]
+
+  public_deps = [ "//flutter/fml/dart" ]
+}

fml/trace_event.cc → fml/trace/trace_event.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/fml/trace_event.h"
+#include "flutter/fml/trace/trace_event.h"
 
 #include <algorithm>
 #include <atomic>

lib/ui/compositing/scene.cc

@@ -4,7 +4,7 @@
 
 #include "flutter/lib/ui/compositing/scene.h"
 
-#include "flutter/fml/trace_event.h"
+#include "flutter/fml/trace/trace_event.h"
 #include "flutter/lib/ui/painting/image.h"
 #include "flutter/lib/ui/painting/picture.h"
 #include "flutter/lib/ui/ui_dart_state.h"

lib/ui/painting/image_decoder.h

@@ -13,7 +13,7 @@
 #include "flutter/fml/concurrent_message_loop.h"
 #include "flutter/fml/macros.h"
 #include "flutter/fml/mapping.h"
-#include "flutter/fml/trace_event.h"
+#include "flutter/fml/trace/trace_event.h"
 #include "flutter/lib/ui/io_manager.h"
 #include "flutter/lib/ui/painting/image_descriptor.h"
 #include "third_party/skia/include/core/SkData.h"

lib/ui/painting/image_descriptor.cc

@@ -6,7 +6,7 @@
 
 #include "flutter/fml/build_config.h"
 #include "flutter/fml/logging.h"
-#include "flutter/fml/trace_event.h"
+#include "flutter/fml/trace/trace_event.h"
 #include "flutter/lib/ui/painting/codec.h"
 #include "flutter/lib/ui/painting/image_decoder.h"
 #include "flutter/lib/ui/painting/multi_frame_codec.h"

lib/ui/painting/image_encoding.cc

@@ -10,7 +10,7 @@
 #include "flutter/common/task_runners.h"
 #include "flutter/fml/build_config.h"
 #include "flutter/fml/make_copyable.h"
-#include "flutter/fml/trace_event.h"
+#include "flutter/fml/trace/trace_event.h"
 #include "flutter/lib/ui/painting/image.h"
 #include "flutter/lib/ui/ui_dart_state.h"
 #include "third_party/skia/include/core/SkCanvas.h"

lib/ui/volatile_path_tracker.h

@@ -11,7 +11,7 @@
 
 #include "flutter/fml/macros.h"
 #include "flutter/fml/task_runner.h"
-#include "flutter/fml/trace_event.h"
+#include "flutter/fml/trace/trace_event.h"
 #include "third_party/skia/include/core/SkPath.h"
 
 namespace flutter {

runtime/dart_isolate.cc

@@ -9,7 +9,7 @@
 
 #include "flutter/fml/paths.h"
 #include "flutter/fml/posix_wrappers.h"
-#include "flutter/fml/trace_event.h"
+#include "flutter/fml/trace/trace_event.h"
 #include "flutter/lib/io/dart_io.h"
 #include "flutter/lib/ui/dart_runtime_hooks.h"
 #include "flutter/lib/ui/dart_ui.h"

runtime/dart_snapshot.cc

@@ -8,7 +8,7 @@
 
 #include "flutter/fml/native_library.h"
 #include "flutter/fml/paths.h"
-#include "flutter/fml/trace_event.h"
+#include "flutter/fml/trace/trace_event.h"
 #include "flutter/lib/snapshot/snapshot.h"
 #include "flutter/runtime/dart_vm.h"
 #include "third_party/dart/runtime/include/dart_api.h"

runtime/dart_vm.cc

@@ -18,7 +18,7 @@
 #include "flutter/fml/size.h"
 #include "flutter/fml/synchronization/count_down_latch.h"
 #include "flutter/fml/time/time_delta.h"
-#include "flutter/fml/trace_event.h"
+#include "flutter/fml/trace/trace_event.h"
 #include "flutter/lib/io/dart_io.h"
 #include "flutter/lib/ui/dart_runtime_hooks.h"
 #include "flutter/lib/ui/dart_ui.h"

runtime/dart_vm_initializer.cc

@@ -8,7 +8,7 @@
 
 #include "flutter/fml/logging.h"
 #include "flutter/fml/synchronization/shared_mutex.h"
-#include "flutter/fml/trace_event.h"
+#include "flutter/fml/trace/trace_event.h"
 
 // Tracks whether Dart has been initialized and if it is safe to call Dart
 // APIs.

runtime/runtime_controller.cc

@@ -5,7 +5,7 @@
 #include "flutter/runtime/runtime_controller.h"
 
 #include "flutter/fml/message_loop.h"
-#include "flutter/fml/trace_event.h"
+#include "flutter/fml/trace/trace_event.h"
 #include "flutter/lib/ui/compositing/scene.h"
 #include "flutter/lib/ui/ui_dart_state.h"
 #include "flutter/lib/ui/window/platform_configuration.h"

runtime/skia_concurrent_executor.cc

@@ -4,7 +4,7 @@
 
 #include "flutter/runtime/skia_concurrent_executor.h"
 
-#include "flutter/fml/trace_event.h"
+#include "flutter/fml/trace/trace_event.h"
 
 namespace flutter {
 

shell/common/animator.cc

@@ -4,7 +4,7 @@
 
 #include "flutter/shell/common/animator.h"
 
-#include "flutter/fml/trace_event.h"
+#include "flutter/fml/trace/trace_event.h"
 #include "third_party/dart/runtime/include/dart_tools_api.h"
 
 namespace flutter {

shell/common/engine.cc

@@ -14,7 +14,7 @@
 #include "flutter/fml/file.h"
 #include "flutter/fml/make_copyable.h"
 #include "flutter/fml/paths.h"
-#include "flutter/fml/trace_event.h"
+#include "flutter/fml/trace/trace_event.h"
 #include "flutter/fml/unique_fd.h"
 #include "flutter/lib/snapshot/snapshot.h"
 #include "flutter/lib/ui/text/font_collection.h"

shell/common/pipeline.h

@@ -12,7 +12,7 @@
 #include "flutter/fml/macros.h"
 #include "flutter/fml/memory/ref_counted.h"
 #include "flutter/fml/synchronization/semaphore.h"
-#include "flutter/fml/trace_event.h"
+#include "flutter/fml/trace/trace_event.h"
 
 namespace flutter {
 

shell/common/pointer_data_dispatcher.cc

@@ -4,7 +4,7 @@
 
 #include "flutter/shell/common/pointer_data_dispatcher.h"
 
-#include "flutter/fml/trace_event.h"
+#include "flutter/fml/trace/trace_event.h"
 
 namespace flutter {
 

shell/common/shell.cc

@@ -18,7 +18,7 @@
 #include "flutter/fml/make_copyable.h"
 #include "flutter/fml/message_loop.h"
 #include "flutter/fml/paths.h"
-#include "flutter/fml/trace_event.h"
+#include "flutter/fml/trace/trace_event.h"
 #include "flutter/fml/unique_fd.h"
 #include "flutter/runtime/dart_vm.h"
 #include "flutter/shell/common/engine.h"