[scenic] ViewTree tracing/cleanup

Add trace macros.

Remove unnecessary includes, and readd them wherever they were
transitively required.

Bug: 401298250
Change-Id: I410af89838e9e7f4766b301803257ffa57502387
Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/1231586
Fuchsia-Auto-Submit: Josh Gargus <[email protected]>
Reviewed-by: Justin Kobler <[email protected]>
Commit-Queue: Auto-Submit <[email protected]>

Author: schwa423

src/ui/scenic/lib/flatland/link_system.cc

@@ -8,6 +8,7 @@
 #include <lib/trace/event.h>
 
 #include "src/ui/scenic/lib/utils/dispatcher_holder.h"
+#include "src/ui/scenic/lib/utils/helpers.h"
 #include "src/ui/scenic/lib/utils/task_utils.h"
 
 #include <glm/gtc/matrix_access.hpp>

src/ui/scenic/lib/input/touch_source_base.h

@@ -5,6 +5,7 @@
 #ifndef SRC_UI_SCENIC_LIB_INPUT_TOUCH_SOURCE_BASE_H_
 #define SRC_UI_SCENIC_LIB_INPUT_TOUCH_SOURCE_BASE_H_
 
+#include <fuchsia/ui/pointer/cpp/fidl.h>
 #include <lib/fit/function.h>
 #include <lib/inspect/cpp/inspect.h>
 #include <zircon/status.h>

src/ui/scenic/lib/screenshot/tests/flatland_screenshot_unittest.cc

@@ -24,6 +24,7 @@
 #include "src/ui/scenic/lib/screen_capture/screen_capture_buffer_collection_importer.h"
 #include "src/ui/scenic/lib/screenshot/screenshot_manager.h"
 #include "src/ui/scenic/lib/screenshot/tests/mock_image_compression.h"
+#include "src/ui/scenic/lib/utils/helpers.h"
 
 using allocation::BufferCollectionImporter;
 using fuchsia::ui::compression::internal::ImageCompressorEncodePngRequest;

src/ui/scenic/lib/view_tree/snapshot_types.cc

@@ -6,7 +6,7 @@
 
 #include <lib/syslog/cpp/macros.h>
 
-#include "src/ui/scenic/lib/utils/math.h"
+#include "src/ui/scenic/lib/utils/helpers.h"
 
 namespace {
 
@@ -84,8 +84,8 @@ bool Snapshot::IsDescendant(zx_koid_t descendant_koid, zx_koid_t ancestor_koid)
 }
 
 std::vector<zx_koid_t> Snapshot::GetAncestorsOf(zx_koid_t koid) const {
-  // TODO(https://fxbug.dev/42050703): Turn this back into a DCHECK once we solve the ViewTree-flakiness
-  // issue.
+  // TODO(https://fxbug.dev/42050703): Turn this back into a DCHECK once we solve the
+  // ViewTree-flakiness issue.
   if (view_tree.count(koid) == 0) {
     FX_LOGS(ERROR) << "Tried to GetAncestorsOf() a koid not in the ViewTree";
     return {};

src/ui/scenic/lib/view_tree/snapshot_types.h

@@ -5,6 +5,8 @@
 #ifndef SRC_UI_SCENIC_LIB_VIEW_TREE_SNAPSHOT_TYPES_H_
 #define SRC_UI_SCENIC_LIB_VIEW_TREE_SNAPSHOT_TYPES_H_
 
+// TODO(https://fxbug.dev/404958102): delete mentions of GFX in `ViewNode`, then delete this.
+#include <fuchsia/math/cpp/fidl.h>
 #include <fuchsia/ui/views/cpp/fidl.h>
 #include <lib/fit/function.h>
 #include <zircon/types.h>
@@ -16,8 +18,6 @@
 #include <unordered_set>
 #include <vector>
 
-#include "src/ui/scenic/lib/utils/helpers.h"
-
 #include <glm/glm.hpp>
 
 namespace view_tree {
@@ -59,14 +59,17 @@ struct ViewNode {
 
   // Set to true when a GFX view has generated the |is_rendering| signal. For flatland views, this
   // field is set to |std::nullopt|.
+  // TODO(https://fxbug.dev/404958102): delete mentions of GFX.
   std::optional<bool> gfx_is_rendering;
 
   // The conversion ratio from physical pixels (of a display) to logical pixels (of the coordinate
   // system of the view). For flatland views, this field is set to |std::nullopt|.
+  // TODO(https://fxbug.dev/404958102): delete mentions of GFX.
   std::optional<std::array<float, 2>> gfx_pixel_scale;
 
   // The offset data for the view's bounding box, in the coordinate system of that view. For
   // flatland views, this field is set to |std::nullopt|.
+  // TODO(https://fxbug.dev/404958102): delete mentions of GFX.
   std::optional<fuchsia::math::InsetF> gfx_inset;
 
   bool operator==(const ViewNode& other) const;

src/ui/scenic/lib/view_tree/tests/geometry_provider_unittest.cc

@@ -4,6 +4,7 @@
 
 #include "src/ui/scenic/lib/view_tree/geometry_provider.h"
 
+#include <fuchsia/ui/composition/cpp/fidl.h>
 #include <fuchsia/ui/views/cpp/fidl.h>
 #include <lib/syslog/cpp/macros.h>
 #include <lib/zx/time.h>

src/ui/scenic/lib/view_tree/view_tree_snapshotter.cc

@@ -40,6 +40,8 @@ void TreeWalk(const std::unordered_map<zx_koid_t, ViewNode>& view_tree, zx_koid_
 }
 
 bool ValidateSnapshot(const Snapshot& snapshot) {
+  TRACE_DURATION("gfx", "ViewTreeSnapshotter::ValidateSnapshot");
+
   const auto& [root, view_tree, unconnected_views, hit_testers] = snapshot;
   if (view_tree.empty() && root == ZX_KOID_INVALID) {
     return true;
@@ -70,6 +72,8 @@ bool ValidateSnapshot(const Snapshot& snapshot) {
 }
 
 bool ValidateSubtree(const SubtreeSnapshot& subtree) {
+  TRACE_DURATION("gfx", "ViewTreeSnapshotter::ValidateSubtree");
+
   const auto& [root, view_tree, unconnected_views, hit_tester, tree_boundaries] = subtree;
   if (view_tree.empty() && root == ZX_KOID_INVALID) {
     return true;
@@ -115,8 +119,8 @@ ViewTreeSnapshotter::ViewTreeSnapshotter(std::vector<SubtreeSnapshotGenerator> s
     : subtree_generators_(std::move(subtree_generators)) {
   for (auto& [subscriber_callback, dispatcher] : subscribers) {
     FX_DCHECK(dispatcher);
-    // TODO(https://fxbug.dev/42155704): We save the callback directly and ignore the dispatcher as a
-    // workaround to avoid flakes. Rework this after deciding on a new synchronization mechanism.
+    // TODO(https://fxbug.dev/42155704): We save the callback directly and ignore the dispatcher as
+    // a workaround to avoid flakes. Rework this after deciding on a new synchronization mechanism.
     subscriber_callbacks_.emplace_back(std::move(subscriber_callback));
   }
 }
@@ -129,10 +133,16 @@ void ViewTreeSnapshotter::UpdateSnapshot() const {
 
   // Merge subtrees.
   for (auto& generate_subtrees : subtree_generators_) {
-    auto subtree = generate_subtrees();
+    SubtreeSnapshot subtree;
+    {
+      TRACE_DURATION("gfx", "ViewTreeSnapshotter::UpdateSnapshot [generate]");
+      subtree = generate_subtrees();
+    }
     FX_DCHECK(ValidateSubtree(subtree));
     auto& [root, view_tree, unconnected_views, hit_tester, subtree_boundaries] = subtree;
 
+    TRACE_DURATION("gfx", "ViewTreeSnapshotter::UpdateSnapshot [merge]");
+
     if (new_snapshot->root == ZX_KOID_INVALID) {
       new_snapshot->root = root;
     }
@@ -177,6 +187,7 @@ void ViewTreeSnapshotter::UpdateSnapshot() const {
 
   // Update all subscribers with the new snapshot.
   for (const auto& subscriber_callback : subscriber_callbacks_) {
+    TRACE_DURATION("gfx", "ViewTreeSnapshotter::UpdateSnapshot [subscriber]");
     subscriber_callback(new_snapshot);
   }
 }

src/ui/scenic/lib/view_tree/view_tree_snapshotter.h

@@ -9,7 +9,6 @@
 
 #include <vector>
 
-#include "src/ui/scenic/lib/scheduling/frame_scheduler.h"
 #include "src/ui/scenic/lib/view_tree/snapshot_types.h"
 
 namespace view_tree {