From 0a11bb12d7db825675c4b26f34aba30621bfdd08 Mon Sep 17 00:00:00 2001
From: Brandon DeRosier <bdero@google.com>
Date: Fri, 11 Nov 2022 17:05:25 -0800
Subject: [PATCH] Add more raster traces (flutter/engine#37510)

---
 engine/src/flutter/flow/surface_frame.cc                    | 1 +
 engine/src/flutter/shell/common/rasterizer.cc               | 1 +
 engine/src/flutter/shell/gpu/gpu_surface_metal_impeller.mm  | 3 +++
 .../darwin/ios/framework/Source/FlutterPlatformViews.mm     | 6 ++++--
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/engine/src/flutter/flow/surface_frame.cc b/engine/src/flutter/flow/surface_frame.cc
index 44c9f706d4e..f9b162f8f98 100644
--- a/engine/src/flutter/flow/surface_frame.cc
+++ b/engine/src/flutter/flow/surface_frame.cc
@@ -35,6 +35,7 @@ SurfaceFrame::SurfaceFrame(sk_sp<SkSurface> surface,
 }
 
 bool SurfaceFrame::Submit() {
+  TRACE_EVENT0("flutter", "SurfaceFrame::Submit");
   if (submitted_) {
     return false;
   }
diff --git a/engine/src/flutter/shell/common/rasterizer.cc b/engine/src/flutter/shell/common/rasterizer.cc
index f283c414209..479988440a6 100644
--- a/engine/src/flutter/shell/common/rasterizer.cc
+++ b/engine/src/flutter/shell/common/rasterizer.cc
@@ -464,6 +464,7 @@ RasterStatus Rasterizer::DoDraw(
 RasterStatus Rasterizer::DrawToSurface(
     FrameTimingsRecorder& frame_timings_recorder,
     flutter::LayerTree& layer_tree) {
+  TRACE_EVENT0("flutter", "Rasterizer::DrawToSurface");
   FML_DCHECK(surface_);
 
   RasterStatus raster_status;
diff --git a/engine/src/flutter/shell/gpu/gpu_surface_metal_impeller.mm b/engine/src/flutter/shell/gpu/gpu_surface_metal_impeller.mm
index 4f6da625d95..686c3c5a925 100644
--- a/engine/src/flutter/shell/gpu/gpu_surface_metal_impeller.mm
+++ b/engine/src/flutter/shell/gpu/gpu_surface_metal_impeller.mm
@@ -9,6 +9,7 @@
 
 #include "flutter/fml/make_copyable.h"
 #include "flutter/fml/mapping.h"
+#include "flutter/fml/trace_event.h"
 #include "flutter/impeller/display_list/display_list_dispatcher.h"
 #include "flutter/impeller/renderer/backend/metal/surface_mtl.h"
 
@@ -42,6 +43,8 @@ bool GPUSurfaceMetalImpeller::IsValid() {
 
 // |Surface|
 std::unique_ptr<SurfaceFrame> GPUSurfaceMetalImpeller::AcquireFrame(const SkISize& frame_info) {
+  TRACE_EVENT0("impeller", "GPUSurfaceMetalImpeller::AcquireFrame");
+
   if (!IsValid()) {
     FML_LOG(ERROR) << "Metal surface was invalid.";
     return nullptr;
diff --git a/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews.mm b/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews.mm
index 51085c93557..40c7ab8e12e 100644
--- a/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews.mm
+++ b/engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews.mm
@@ -586,6 +586,8 @@ SkRect FlutterPlatformViewsController::GetPlatformViewRect(int view_id) {
 bool FlutterPlatformViewsController::SubmitFrame(GrDirectContext* gr_context,
                                                  const std::shared_ptr<IOSContext>& ios_context,
                                                  std::unique_ptr<SurfaceFrame> frame) {
+  TRACE_EVENT0("flutter", "FlutterPlatformViewsController::SubmitFrame");
+
   // Any UIKit related code has to run on main thread.
   FML_DCHECK([[NSThread currentThread] isMainThread]);
   if (flutter_view_ == nullptr) {
@@ -600,8 +602,8 @@ bool FlutterPlatformViewsController::SubmitFrame(GrDirectContext* gr_context,
   // Resolve all pending GPU operations before allocating a new surface.
   background_canvas->flush();
 
-  // Clipping the background canvas before drawing the picture recorders requires to
-  // save and restore the clip context.
+  // Clipping the background canvas before drawing the picture recorders requires
+  // saving and restoring the clip context.
   SkAutoCanvasRestore save(background_canvas, /*doSave=*/true);
 
   // Maps a platform view id to a vector of `FlutterPlatformViewLayer`.