From 6dec8374fdd51490da5ca958766d22a9437d51bd Mon Sep 17 00:00:00 2001
From: Priyanka <priyankaspatel@google.com>
Date: Wed, 4 Aug 2021 15:55:37 +0000
Subject: [PATCH] Dumps now show the visual displays.

Fixed a bug where dumps were no longer showing the visual displays due
to empty rects.

Bug: b/195526761

Test: Run a dump or upload a dump file - the visual display should
appear as expected.

Change-Id: I66ae35249514ac8bd34fb6465269de047ae26f00
---
 tools/winscope/src/NodeContextMenu.vue     |  2 +-
 tools/winscope/src/dumps/SurfaceFlinger.ts | 17 ++++++++++-------
 tools/winscope/src/dumps/WindowManager.ts  |  4 +++-
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/tools/winscope/src/NodeContextMenu.vue b/tools/winscope/src/NodeContextMenu.vue
index cba46eb5c..18d86e4bd 100644
--- a/tools/winscope/src/NodeContextMenu.vue
+++ b/tools/winscope/src/NodeContextMenu.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script>
-import {VueContext} from 'vue-context';
+import VueContext from 'vue-context';
 
 export default {
   name: 'NodeContextMenu',
diff --git a/tools/winscope/src/dumps/SurfaceFlinger.ts b/tools/winscope/src/dumps/SurfaceFlinger.ts
index 658dec47d..46940300e 100644
--- a/tools/winscope/src/dumps/SurfaceFlinger.ts
+++ b/tools/winscope/src/dumps/SurfaceFlinger.ts
@@ -16,7 +16,8 @@
 
 import { FILE_TYPES, DUMP_TYPES } from "@/decode.js";
 import DumpBase from "./DumpBase";
-import LayersTraceEntry from '../flickerlib/layers/LayerTraceEntry'
+import LayersTraceEntry from '../flickerlib/layers/LayerTraceEntry';
+import LayersTrace from '../flickerlib/LayersTrace';
 
 export default class SurfaceFlinger extends DumpBase {
   sfDumpFile: any;
@@ -32,11 +33,13 @@ export default class SurfaceFlinger extends DumpBase {
     return DUMP_TYPES.SURFACE_FLINGER;
   }
 
-  static fromProto(proto: any): LayersTraceEntry {
-    return LayersTraceEntry.fromProto(
-        /*protos */ proto.layers,
-        /* timestamp */ 0,
-        /* hwcBlob */ ""
-      );
+  static fromProto(proto: any): LayersTrace {
+    const source = null;
+    const entry =  LayersTraceEntry.fromProto(
+      /*protos */ proto.layers,
+      /* timestamp */ 0,
+      /* hwcBlob */ ""
+    );
+    return new LayersTrace([entry], source);
   }
 }
\ No newline at end of file
diff --git a/tools/winscope/src/dumps/WindowManager.ts b/tools/winscope/src/dumps/WindowManager.ts
index 09e3a3e0a..21b78ac1d 100644
--- a/tools/winscope/src/dumps/WindowManager.ts
+++ b/tools/winscope/src/dumps/WindowManager.ts
@@ -33,6 +33,8 @@ export default class WindowManager extends DumpBase {
   }
 
   static fromProto(proto: any): WindowManagerTrace {
-    return WindowManagerTrace.fromDump(proto);
+    const source = null;
+    const state = WindowManagerTrace.fromDump(proto);
+    return new WindowManagerTrace([state], source);
   }
 }
\ No newline at end of file