Revert tracing changes (flutter#9296)

* Revert "[fuchsia] Fix alignment of Fuchsia/non-Fuchsia tracing (flutter#9289)"

This reverts commit f80ac5f.

* Revert "Align fuchsia and non-fuchsia tracing (flutter#9199)"

This reverts commit 7826548.

Author: zanderso

assets/asset_manager.cc

@@ -35,8 +35,8 @@ std::unique_ptr<fml::Mapping> AssetManager::GetAsMapping(
   if (asset_name.size() == 0) {
     return nullptr;
   }
-  FML_TRACE_EVENT1("flutter", "AssetManager::GetAsMapping", "name",
-                   asset_name.c_str());
+  TRACE_EVENT1("flutter", "AssetManager::GetAsMapping", "name",
+               asset_name.c_str());
   for (const auto& resolver : resolvers_) {
     auto mapping = resolver->GetAsMapping(asset_name);
     if (mapping != nullptr) {

assets/zip_asset_store.cc

@@ -41,8 +41,8 @@ bool ZipAssetStore::IsValid() const {
 // |AssetResolver|
 std::unique_ptr<fml::Mapping> ZipAssetStore::GetAsMapping(
     const std::string& asset_name) const {
-  FML_TRACE_EVENT1("flutter", "ZipAssetStore::GetAsMapping", "name",
-                   asset_name.c_str());
+  TRACE_EVENT1("flutter", "ZipAssetStore::GetAsMapping", "name",
+               asset_name.c_str());
 
   auto found = stat_cache_.find(directory_ + "/" + asset_name);
   if (found == stat_cache_.end()) {
@@ -84,7 +84,7 @@ std::unique_ptr<fml::Mapping> ZipAssetStore::GetAsMapping(
 }
 
 void ZipAssetStore::BuildStatCache() {
-  FML_TRACE_EVENT0("flutter", "ZipAssetStore::BuildStatCache");
+  TRACE_EVENT0("flutter", "ZipAssetStore::BuildStatCache");
 
   auto unzipper = CreateUnzipper();
 

flow/layers/backdrop_filter_layer.cc

@@ -12,7 +12,7 @@ BackdropFilterLayer::BackdropFilterLayer(sk_sp<SkImageFilter> filter)
 BackdropFilterLayer::~BackdropFilterLayer() = default;
 
 void BackdropFilterLayer::Paint(PaintContext& context) const {
-  FML_TRACE_EVENT0("flutter", "BackdropFilterLayer::Paint");
+  TRACE_EVENT0("flutter", "BackdropFilterLayer::Paint");
   FML_DCHECK(needs_painting());
 
   Layer::AutoSaveLayer save = Layer::AutoSaveLayer::Create(

flow/layers/clip_path_layer.cc

@@ -54,7 +54,7 @@ void ClipPathLayer::UpdateScene(SceneUpdateContext& context) {
 #endif  // defined(OS_FUCHSIA)
 
 void ClipPathLayer::Paint(PaintContext& context) const {
-  FML_TRACE_EVENT0("flutter", "ClipPathLayer::Paint");
+  TRACE_EVENT0("flutter", "ClipPathLayer::Paint");
   FML_DCHECK(needs_painting());
 
   SkAutoCanvasRestore save(context.internal_nodes_canvas, true);

flow/layers/clip_rect_layer.cc

@@ -44,7 +44,7 @@ void ClipRectLayer::UpdateScene(SceneUpdateContext& context) {
 #endif  // defined(OS_FUCHSIA)
 
 void ClipRectLayer::Paint(PaintContext& context) const {
-  FML_TRACE_EVENT0("flutter", "ClipRectLayer::Paint");
+  TRACE_EVENT0("flutter", "ClipRectLayer::Paint");
   FML_DCHECK(needs_painting());
 
   SkAutoCanvasRestore save(context.internal_nodes_canvas, true);

flow/layers/clip_rrect_layer.cc

@@ -52,7 +52,7 @@ void ClipRRectLayer::UpdateScene(SceneUpdateContext& context) {
 #endif  // defined(OS_FUCHSIA)
 
 void ClipRRectLayer::Paint(PaintContext& context) const {
-  FML_TRACE_EVENT0("flutter", "ClipRRectLayer::Paint");
+  TRACE_EVENT0("flutter", "ClipRRectLayer::Paint");
   FML_DCHECK(needs_painting());
 
   SkAutoCanvasRestore save(context.internal_nodes_canvas, true);

flow/layers/color_filter_layer.cc

@@ -12,7 +12,7 @@ ColorFilterLayer::ColorFilterLayer(SkColor color, SkBlendMode blend_mode)
 ColorFilterLayer::~ColorFilterLayer() = default;
 
 void ColorFilterLayer::Paint(PaintContext& context) const {
-  FML_TRACE_EVENT0("flutter", "ColorFilterLayer::Paint");
+  TRACE_EVENT0("flutter", "ColorFilterLayer::Paint");
   FML_DCHECK(needs_painting());
 
   SkPaint paint;

flow/layers/container_layer.cc

@@ -16,7 +16,7 @@ void ContainerLayer::Add(std::shared_ptr<Layer> layer) {
 }
 
 void ContainerLayer::Preroll(PrerollContext* context, const SkMatrix& matrix) {
-  FML_TRACE_EVENT0("flutter", "ContainerLayer::Preroll");
+  TRACE_EVENT0("flutter", "ContainerLayer::Preroll");
 
   SkRect child_paint_bounds = SkRect::MakeEmpty();
   PrerollChildren(context, matrix, &child_paint_bounds);

flow/layers/layer_tree.cc

@@ -26,7 +26,7 @@ void LayerTree::RecordBuildTime(fml::TimePoint start) {
 
 void LayerTree::Preroll(CompositorContext::ScopedFrame& frame,
                         bool ignore_raster_cache) {
-  FML_TRACE_EVENT0("flutter", "LayerTree::Preroll");
+  TRACE_EVENT0("flutter", "LayerTree::Preroll");
   SkColorSpace* color_space =
       frame.canvas() ? frame.canvas()->imageInfo().colorSpace() : nullptr;
   frame.context().raster_cache().SetCheckboardCacheImages(
@@ -48,7 +48,7 @@ void LayerTree::Preroll(CompositorContext::ScopedFrame& frame,
 #if defined(OS_FUCHSIA)
 void LayerTree::UpdateScene(SceneUpdateContext& context,
                             scenic::ContainerNode& container) {
-  FML_TRACE_EVENT0("flutter", "LayerTree::UpdateScene");
+  TRACE_EVENT0("flutter", "LayerTree::UpdateScene");
   const auto& metrics = context.metrics();
   SceneUpdateContext::Transform transform(context,                  // context
                                           1.0f / metrics->scale_x,  // X
@@ -72,7 +72,7 @@ void LayerTree::UpdateScene(SceneUpdateContext& context,
 
 void LayerTree::Paint(CompositorContext::ScopedFrame& frame,
                       bool ignore_raster_cache) const {
-  FML_TRACE_EVENT0("flutter", "LayerTree::Paint");
+  TRACE_EVENT0("flutter", "LayerTree::Paint");
   SkISize canvas_size = frame.canvas()->getBaseLayerSize();
   SkNWayCanvas internal_nodes_canvas(canvas_size.width(), canvas_size.height());
   internal_nodes_canvas.addCanvas(frame.canvas());
@@ -99,7 +99,7 @@ void LayerTree::Paint(CompositorContext::ScopedFrame& frame,
 }
 
 sk_sp<SkPicture> LayerTree::Flatten(const SkRect& bounds) {
-  FML_TRACE_EVENT0("flutter", "LayerTree::Flatten");
+  TRACE_EVENT0("flutter", "LayerTree::Flatten");
 
   SkPictureRecorder recorder;
   auto* canvas = recorder.beginRecording(bounds);

flow/layers/opacity_layer.cc

@@ -53,7 +53,7 @@ void OpacityLayer::Preroll(PrerollContext* context, const SkMatrix& matrix) {
 }
 
 void OpacityLayer::Paint(PaintContext& context) const {
-  FML_TRACE_EVENT0("flutter", "OpacityLayer::Paint");
+  TRACE_EVENT0("flutter", "OpacityLayer::Paint");
   FML_DCHECK(needs_painting());
 
   SkPaint paint;