From 57f62146378dd2fa894e4eeb98cc50417620ca2b Mon Sep 17 00:00:00 2001
From: Doris Wu <doriswu@google.com>
Date: Sat, 22 Mar 2025 00:17:22 +0800
Subject: [PATCH] Some cleanups (#8558)

* Clean up includes

* Fix the logic
---
 libs/fgviewer/src/ApiHandler.cpp     | 8 ++++++++
 libs/fgviewer/src/DebugServer.cpp    | 6 +++---
 libs/fgviewer/src/FrameGraphInfo.cpp | 5 +++++
 libs/fgviewer/src/JsonWriter.cpp     | 8 ++++++--
 libs/fgviewer/web/app.js             | 2 +-
 5 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/libs/fgviewer/src/ApiHandler.cpp b/libs/fgviewer/src/ApiHandler.cpp
index 5f49c3605b..dbfc5a8c67 100644
--- a/libs/fgviewer/src/ApiHandler.cpp
+++ b/libs/fgviewer/src/ApiHandler.cpp
@@ -17,14 +17,22 @@
 
 #include "ApiHandler.h"
 
+#include <__chrono/duration.h>
 #include <fgviewer/DebugServer.h>
 #include <fgviewer/JsonWriter.h>
 
 #include <utils/FixedCapacityVector.h>
 #include <utils/Log.h>
+#include <utils/ostream.h>
 
 #include <CivetServer.h>
 
+#include <cstdint>
+#include <cstdio>
+#include <cstring>
+#include <mutex>
+#include <string>
+
 namespace filament::fgviewer {
 
 using namespace std::chrono_literals;
diff --git a/libs/fgviewer/src/DebugServer.cpp b/libs/fgviewer/src/DebugServer.cpp
index 7457e24603..159578ed6e 100644
--- a/libs/fgviewer/src/DebugServer.cpp
+++ b/libs/fgviewer/src/DebugServer.cpp
@@ -21,15 +21,15 @@
 
 #include <CivetServer.h>
 
-#include <utils/FixedCapacityVector.h>
-#include <utils/Hash.h>
 #include <utils/Log.h>
+#include <utils/Mutex.h>
+#include <utils/ostream.h>
 
+#include <mutex>
 #include <string>
 #include <string_view>
 
 
-
 // If set to 0, this serves HTML from a resgen resource. Use 1 only during local development, which
 // serves files directly from the source code tree.
 #define SERVE_FROM_SOURCE_TREE 0
diff --git a/libs/fgviewer/src/FrameGraphInfo.cpp b/libs/fgviewer/src/FrameGraphInfo.cpp
index 90cca55bc1..a1b02a261f 100644
--- a/libs/fgviewer/src/FrameGraphInfo.cpp
+++ b/libs/fgviewer/src/FrameGraphInfo.cpp
@@ -16,6 +16,11 @@
 
 #include <fgviewer/FrameGraphInfo.h>
 
+#include <utils/CString.h>
+
+#include <unordered_map>
+#include <vector>
+
 namespace filament::fgviewer {
 
 FrameGraphInfo::FrameGraphInfo(utils::CString viewName):
diff --git a/libs/fgviewer/src/JsonWriter.cpp b/libs/fgviewer/src/JsonWriter.cpp
index 24daab079e..d43c8a4218 100644
--- a/libs/fgviewer/src/JsonWriter.cpp
+++ b/libs/fgviewer/src/JsonWriter.cpp
@@ -14,11 +14,15 @@
  * limitations under the License.
  */
 
-#include <fgviewer/JsonWriter.h>
 #include <fgviewer/FrameGraphInfo.h>
+#include <fgviewer/JsonWriter.h>
 
-#include <iomanip>
+#include <utils/CString.h>
+
+#include <cstddef>
+#include <ostream>
 #include <sstream>
+#include <vector>
 
 namespace filament::fgviewer {
 
diff --git a/libs/fgviewer/web/app.js b/libs/fgviewer/web/app.js
index fa527088ba..071a33e479 100644
--- a/libs/fgviewer/web/app.js
+++ b/libs/fgviewer/web/app.js
@@ -448,7 +448,7 @@ class FrameGraphTable extends LitElement {
                             </span>`
                         : nothing}
                     ${resource.name}
-                    ${hasSubresources && isExpanded ? nothing : html`(${subresourceIds.length})`}
+                    ${hasSubresources && !isExpanded ? html`(${subresourceIds.length})` : nothing}
                 </th>
                 ${this._renderResourceUsage(allPasses, resourceIds, DEFAULT_COLOR)}
             </tr>