From ffff2c1c37db12a8c53e4962ea3428ade0ddcc6e Mon Sep 17 00:00:00 2001 From: Jonah Williams Date: Tue, 25 Oct 2022 14:13:14 -0700 Subject: [PATCH] Remove expensive trace events (flutter/engine#36989) --- engine/src/flutter/display_list/display_list.cc | 1 - engine/src/flutter/flow/layers/backdrop_filter_layer.cc | 1 - engine/src/flutter/flow/layers/clip_path_layer.cc | 2 -- engine/src/flutter/flow/layers/clip_rect_layer.cc | 2 -- engine/src/flutter/flow/layers/clip_rrect_layer.cc | 2 -- engine/src/flutter/flow/layers/color_filter_layer.cc | 1 - engine/src/flutter/flow/layers/container_layer.cc | 2 -- engine/src/flutter/flow/layers/display_list_layer.cc | 2 -- engine/src/flutter/flow/layers/image_filter_layer.cc | 3 --- engine/src/flutter/flow/layers/opacity_layer.cc | 2 -- engine/src/flutter/flow/layers/performance_overlay_layer.cc | 1 - engine/src/flutter/flow/layers/physical_shape_layer.cc | 2 -- engine/src/flutter/flow/layers/shader_mask_layer.cc | 1 - engine/src/flutter/flow/layers/texture_layer.cc | 3 --- engine/src/flutter/flow/layers/transform_layer.cc | 3 --- engine/src/flutter/flow/raster_cache.cc | 2 -- 16 files changed, 30 deletions(-) diff --git a/engine/src/flutter/display_list/display_list.cc b/engine/src/flutter/display_list/display_list.cc index 264ca3fe75..2023334596 100644 --- a/engine/src/flutter/display_list/display_list.cc +++ b/engine/src/flutter/display_list/display_list.cc @@ -75,7 +75,6 @@ void DisplayList::ComputeRTree() { void DisplayList::Dispatch(Dispatcher& dispatcher, uint8_t* ptr, uint8_t* end) const { - TRACE_EVENT0("flutter", "DisplayList::Dispatch"); while (ptr < end) { auto op = reinterpret_cast(ptr); ptr += op->size; diff --git a/engine/src/flutter/flow/layers/backdrop_filter_layer.cc b/engine/src/flutter/flow/layers/backdrop_filter_layer.cc index 9f67b746b1..2c9f673a5a 100644 --- a/engine/src/flutter/flow/layers/backdrop_filter_layer.cc +++ b/engine/src/flutter/flow/layers/backdrop_filter_layer.cc @@ -54,7 +54,6 @@ void BackdropFilterLayer::Preroll(PrerollContext* context, } void BackdropFilterLayer::Paint(PaintContext& context) const { - TRACE_EVENT0("flutter", "BackdropFilterLayer::Paint"); FML_DCHECK(needs_painting(context)); AutoCachePaint save_paint(context); diff --git a/engine/src/flutter/flow/layers/clip_path_layer.cc b/engine/src/flutter/flow/layers/clip_path_layer.cc index 51426168e0..65c7f898ea 100644 --- a/engine/src/flutter/flow/layers/clip_path_layer.cc +++ b/engine/src/flutter/flow/layers/clip_path_layer.cc @@ -10,12 +10,10 @@ ClipPathLayer::ClipPathLayer(const SkPath& clip_path, Clip clip_behavior) : ClipShapeLayer(clip_path, clip_behavior) {} void ClipPathLayer::Preroll(PrerollContext* context, const SkMatrix& matrix) { - TRACE_EVENT0("flutter", "ClipPathLayer::Preroll"); ClipShapeLayer::Preroll(context, matrix); } void ClipPathLayer::Paint(PaintContext& context) const { - TRACE_EVENT0("flutter", "ClipPathLayer::Paint"); ClipShapeLayer::Paint(context); } diff --git a/engine/src/flutter/flow/layers/clip_rect_layer.cc b/engine/src/flutter/flow/layers/clip_rect_layer.cc index e2db2aeac0..6b7ff2002f 100644 --- a/engine/src/flutter/flow/layers/clip_rect_layer.cc +++ b/engine/src/flutter/flow/layers/clip_rect_layer.cc @@ -10,12 +10,10 @@ ClipRectLayer::ClipRectLayer(const SkRect& clip_rect, Clip clip_behavior) : ClipShapeLayer(clip_rect, clip_behavior) {} void ClipRectLayer::Preroll(PrerollContext* context, const SkMatrix& matrix) { - TRACE_EVENT0("flutter", "ClipRectLayer::Preroll"); ClipShapeLayer::Preroll(context, matrix); } void ClipRectLayer::Paint(PaintContext& context) const { - TRACE_EVENT0("flutter", "ClipRectLayer::Paint"); ClipShapeLayer::Paint(context); } diff --git a/engine/src/flutter/flow/layers/clip_rrect_layer.cc b/engine/src/flutter/flow/layers/clip_rrect_layer.cc index 6c1a5cca6c..2bf5b06933 100644 --- a/engine/src/flutter/flow/layers/clip_rrect_layer.cc +++ b/engine/src/flutter/flow/layers/clip_rrect_layer.cc @@ -10,12 +10,10 @@ ClipRRectLayer::ClipRRectLayer(const SkRRect& clip_rrect, Clip clip_behavior) : ClipShapeLayer(clip_rrect, clip_behavior) {} void ClipRRectLayer::Preroll(PrerollContext* context, const SkMatrix& matrix) { - TRACE_EVENT0("flutter", "ClipRRectLayer::Preroll"); ClipShapeLayer::Preroll(context, matrix); } void ClipRRectLayer::Paint(PaintContext& context) const { - TRACE_EVENT0("flutter", "ClipRRectLayer::Paint"); ClipShapeLayer::Paint(context); } diff --git a/engine/src/flutter/flow/layers/color_filter_layer.cc b/engine/src/flutter/flow/layers/color_filter_layer.cc index 5b2181f014..d3da4763fc 100644 --- a/engine/src/flutter/flow/layers/color_filter_layer.cc +++ b/engine/src/flutter/flow/layers/color_filter_layer.cc @@ -52,7 +52,6 @@ void ColorFilterLayer::Preroll(PrerollContext* context, } void ColorFilterLayer::Paint(PaintContext& context) const { - TRACE_EVENT0("flutter", "ColorFilterLayer::Paint"); FML_DCHECK(needs_painting(context)); if (context.raster_cache) { diff --git a/engine/src/flutter/flow/layers/container_layer.cc b/engine/src/flutter/flow/layers/container_layer.cc index a37f7d92f4..cd1157565d 100644 --- a/engine/src/flutter/flow/layers/container_layer.cc +++ b/engine/src/flutter/flow/layers/container_layer.cc @@ -108,8 +108,6 @@ void ContainerLayer::Add(std::shared_ptr layer) { } void ContainerLayer::Preroll(PrerollContext* context, const SkMatrix& matrix) { - TRACE_EVENT0("flutter", "ContainerLayer::Preroll"); - SkRect child_paint_bounds = SkRect::MakeEmpty(); PrerollChildren(context, matrix, &child_paint_bounds); set_paint_bounds(child_paint_bounds); diff --git a/engine/src/flutter/flow/layers/display_list_layer.cc b/engine/src/flutter/flow/layers/display_list_layer.cc index d37bbaf7ea..0d75bd88ff 100644 --- a/engine/src/flutter/flow/layers/display_list_layer.cc +++ b/engine/src/flutter/flow/layers/display_list_layer.cc @@ -97,7 +97,6 @@ bool DisplayListLayer::Compare(DiffContext::Statistics& statistics, void DisplayListLayer::Preroll(PrerollContext* context, const SkMatrix& matrix) { - TRACE_EVENT0("flutter", "DisplayListLayer::Preroll"); DisplayList* disp_list = display_list(); SkMatrix child_matrix = matrix; @@ -110,7 +109,6 @@ void DisplayListLayer::Preroll(PrerollContext* context, } void DisplayListLayer::Paint(PaintContext& context) const { - TRACE_EVENT0("flutter", "DisplayListLayer::Paint"); FML_DCHECK(display_list_.skia_object()); FML_DCHECK(needs_painting(context)); diff --git a/engine/src/flutter/flow/layers/image_filter_layer.cc b/engine/src/flutter/flow/layers/image_filter_layer.cc index 249d74a245..b08baad68f 100644 --- a/engine/src/flutter/flow/layers/image_filter_layer.cc +++ b/engine/src/flutter/flow/layers/image_filter_layer.cc @@ -48,8 +48,6 @@ void ImageFilterLayer::Diff(DiffContext* context, const Layer* old_layer) { void ImageFilterLayer::Preroll(PrerollContext* context, const SkMatrix& matrix) { - TRACE_EVENT0("flutter", "ImageFilterLayer::Preroll"); - Layer::AutoPrerollSaveLayerState save = Layer::AutoPrerollSaveLayerState::Create(context); SkMatrix child_matrix = matrix; @@ -89,7 +87,6 @@ void ImageFilterLayer::Preroll(PrerollContext* context, } void ImageFilterLayer::Paint(PaintContext& context) const { - TRACE_EVENT0("flutter", "ImageFilterLayer::Paint"); FML_DCHECK(needs_painting(context)); AutoCachePaint cache_paint(context); diff --git a/engine/src/flutter/flow/layers/opacity_layer.cc b/engine/src/flutter/flow/layers/opacity_layer.cc index 6ee0db3187..111fbf798e 100644 --- a/engine/src/flutter/flow/layers/opacity_layer.cc +++ b/engine/src/flutter/flow/layers/opacity_layer.cc @@ -37,7 +37,6 @@ void OpacityLayer::Diff(DiffContext* context, const Layer* old_layer) { } void OpacityLayer::Preroll(PrerollContext* context, const SkMatrix& matrix) { - TRACE_EVENT0("flutter", "OpacityLayer::Preroll"); FML_DCHECK(!layers().empty()); // We can't be a leaf. SkMatrix child_matrix = matrix; @@ -85,7 +84,6 @@ void OpacityLayer::Preroll(PrerollContext* context, const SkMatrix& matrix) { } void OpacityLayer::Paint(PaintContext& context) const { - TRACE_EVENT0("flutter", "OpacityLayer::Paint"); FML_DCHECK(needs_painting(context)); SkAutoCanvasRestore save(context.internal_nodes_canvas, true); diff --git a/engine/src/flutter/flow/layers/performance_overlay_layer.cc b/engine/src/flutter/flow/layers/performance_overlay_layer.cc index d211959a89..fe8b76288a 100644 --- a/engine/src/flutter/flow/layers/performance_overlay_layer.cc +++ b/engine/src/flutter/flow/layers/performance_overlay_layer.cc @@ -93,7 +93,6 @@ void PerformanceOverlayLayer::Paint(PaintContext& context) const { return; } - TRACE_EVENT0("flutter", "PerformanceOverlayLayer::Paint"); SkScalar x = paint_bounds().x() + padding; SkScalar y = paint_bounds().y() + padding; SkScalar width = paint_bounds().width() - (padding * 2); diff --git a/engine/src/flutter/flow/layers/physical_shape_layer.cc b/engine/src/flutter/flow/layers/physical_shape_layer.cc index 0a08efb906..d84320228b 100644 --- a/engine/src/flutter/flow/layers/physical_shape_layer.cc +++ b/engine/src/flutter/flow/layers/physical_shape_layer.cc @@ -52,7 +52,6 @@ void PhysicalShapeLayer::Diff(DiffContext* context, const Layer* old_layer) { void PhysicalShapeLayer::Preroll(PrerollContext* context, const SkMatrix& matrix) { - TRACE_EVENT0("flutter", "PhysicalShapeLayer::Preroll"); Layer::AutoPrerollSaveLayerState save = Layer::AutoPrerollSaveLayerState::Create(context, UsesSaveLayer()); @@ -77,7 +76,6 @@ void PhysicalShapeLayer::Preroll(PrerollContext* context, } void PhysicalShapeLayer::Paint(PaintContext& context) const { - TRACE_EVENT0("flutter", "PhysicalShapeLayer::Paint"); FML_DCHECK(needs_painting(context)); if (elevation_ != 0) { diff --git a/engine/src/flutter/flow/layers/shader_mask_layer.cc b/engine/src/flutter/flow/layers/shader_mask_layer.cc index 61d83fe69f..1b88bc88df 100644 --- a/engine/src/flutter/flow/layers/shader_mask_layer.cc +++ b/engine/src/flutter/flow/layers/shader_mask_layer.cc @@ -49,7 +49,6 @@ void ShaderMaskLayer::Preroll(PrerollContext* context, const SkMatrix& matrix) { } void ShaderMaskLayer::Paint(PaintContext& context) const { - TRACE_EVENT0("flutter", "ShaderMaskLayer::Paint"); FML_DCHECK(needs_painting(context)); AutoCachePaint cache_paint(context); diff --git a/engine/src/flutter/flow/layers/texture_layer.cc b/engine/src/flutter/flow/layers/texture_layer.cc index 8a98366f2c..00361d1606 100644 --- a/engine/src/flutter/flow/layers/texture_layer.cc +++ b/engine/src/flutter/flow/layers/texture_layer.cc @@ -41,8 +41,6 @@ void TextureLayer::Diff(DiffContext* context, const Layer* old_layer) { } void TextureLayer::Preroll(PrerollContext* context, const SkMatrix& matrix) { - TRACE_EVENT0("flutter", "TextureLayer::Preroll"); - set_paint_bounds(SkRect::MakeXYWH(offset_.x(), offset_.y(), size_.width(), size_.height())); context->has_texture_layer = true; @@ -50,7 +48,6 @@ void TextureLayer::Preroll(PrerollContext* context, const SkMatrix& matrix) { } void TextureLayer::Paint(PaintContext& context) const { - TRACE_EVENT0("flutter", "TextureLayer::Paint"); FML_DCHECK(needs_painting(context)); std::shared_ptr texture = diff --git a/engine/src/flutter/flow/layers/transform_layer.cc b/engine/src/flutter/flow/layers/transform_layer.cc index 478f09f835..335c80d070 100644 --- a/engine/src/flutter/flow/layers/transform_layer.cc +++ b/engine/src/flutter/flow/layers/transform_layer.cc @@ -41,8 +41,6 @@ void TransformLayer::Diff(DiffContext* context, const Layer* old_layer) { } void TransformLayer::Preroll(PrerollContext* context, const SkMatrix& matrix) { - TRACE_EVENT0("flutter", "TransformLayer::Preroll"); - SkMatrix child_matrix; child_matrix.setConcat(matrix, transform_); context->mutators_stack.PushTransform(transform_); @@ -71,7 +69,6 @@ void TransformLayer::Preroll(PrerollContext* context, const SkMatrix& matrix) { } void TransformLayer::Paint(PaintContext& context) const { - TRACE_EVENT0("flutter", "TransformLayer::Paint"); FML_DCHECK(needs_painting(context)); SkAutoCanvasRestore save(context.internal_nodes_canvas, true); diff --git a/engine/src/flutter/flow/raster_cache.cc b/engine/src/flutter/flow/raster_cache.cc index 21183da293..c25f656e13 100644 --- a/engine/src/flutter/flow/raster_cache.cc +++ b/engine/src/flutter/flow/raster_cache.cc @@ -29,7 +29,6 @@ RasterCacheResult::RasterCacheResult(sk_sp image, : image_(std::move(image)), logical_rect_(logical_rect), flow_(type) {} void RasterCacheResult::draw(SkCanvas& canvas, const SkPaint* paint) const { - TRACE_EVENT0("flutter", "RasterCacheResult::draw"); SkAutoCanvasRestore auto_restore(&canvas, true); auto matrix = RasterCacheUtil::GetIntegralTransCTM(canvas.getTotalMatrix()); @@ -55,7 +54,6 @@ std::unique_ptr RasterCache::Rasterize( const std::function& draw_function, const std::function& draw_checkerboard) const { - TRACE_EVENT0("flutter", "RasterCachePopulate"); auto matrix = RasterCacheUtil::GetIntegralTransCTM(context.matrix); SkRect dest_rect = RasterCacheUtil::GetRoundedOutDeviceBounds(context.logical_rect, matrix);