3 files changed, 20 insertions, 7 deletions
diff --git a/tools/winscope/src/transform.js b/tools/winscope/src/transform.js
index 2a72113b6..c00b170c2 100644
--- a/tools/winscope/src/transform.js
+++ b/tools/winscope/src/transform.js
@@ -147,4 +147,9 @@ function nanos_to_string(elapsedRealtimeNanos) {
 	return parts.reverse().join('');
 }
 
-export {transform, transform_json, nanos_to_string};
+ // Returns a UI element used highlight a visible entry.
+ function get_visible_chip() {
+	return {short: 'V', long: "visible", class: 'default'};
+ }
+
+export {transform, transform_json, nanos_to_string, get_visible_chip};
diff --git a/tools/winscope/src/transform_sf.js b/tools/winscope/src/transform_sf.js
index b1d53954d..299246ea1 100644
--- a/tools/winscope/src/transform_sf.js
+++ b/tools/winscope/src/transform_sf.js
@@ -14,10 +14,9 @@
  * limitations under the License.
  */
 
-import {transform, nanos_to_string} from './transform.js'
+import {transform, nanos_to_string, get_visible_chip} from './transform.js'
 
 const FLAG_HIDDEN = 0x1;
-var VISIBLE_CHIP = {short: 'V', long: "visible", class: 'default'};
 var RELATIVE_Z_CHIP = {short: 'RelZ',
     long: "Is relative Z-ordered to another surface",
     class: 'warn'};
@@ -48,7 +47,7 @@ function transform_layer(layer, {parentHidden}) {
   var visible = (layer.activeBuffer || layer.type === 'ColorLayer')
       && !hidden && layer.color.a > 0;
   if (visible) {
-    chips.push(VISIBLE_CHIP);
+    chips.push(get_visible_chip());
   } else {
     rect = undefined;
   }
diff --git a/tools/winscope/src/transform_wm.js b/tools/winscope/src/transform_wm.js
index 0bd4ed108..2d5953bcb 100644
--- a/tools/winscope/src/transform_wm.js
+++ b/tools/winscope/src/transform_wm.js
@@ -14,10 +14,12 @@
  * limitations under the License.
  */
 
-import {transform, nanos_to_string} from './transform.js'
+import {transform, nanos_to_string, get_visible_chip} from './transform.js'
 
 function transform_window(entry) {
+  var chips = [];
   var renderIdentifier = (id) => shortenComponentName(id.title) + "@" + id.hashCode;
+  var visible = entry.windowContainer.visible;
   function transform_rect(rect, label) {
     var r = rect || {};
     return {
@@ -28,17 +30,24 @@ function transform_window(entry) {
         label,
     }
   }
-
   var name = renderIdentifier(entry.identifier)
   var rect = transform_rect(entry.frame, name);
 
+  if (visible) {
+    chips.push(get_visible_chip());
+  } else {
+    rect = undefined;
+  }
+
   return transform({
     obj: entry,
     kind: 'window',
     name,
     children: [],
     rect,
-    highlight: rect
+    highlight: rect,
+    chips: chips,
+    visible: visible,
   });
 }