From c7c9cf8860da5fb237654ea5138374d693ae57c4 Mon Sep 17 00:00:00 2001
From: John Stiles <johnstiles@google.com>
Date: Fri, 7 Apr 2023 12:32:05 -0400
Subject: [PATCH] Fix debugger visualization of TArray<> and THashMap<>.

These classes were renamed recently.

Change-Id: I90f9988e55e477f62a652bc6cc4c5a46254b52d7
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/667303
Reviewed-by: Herb Derby <herb@google.com>
Commit-Queue: Herb Derby <herb@google.com>
Commit-Queue: John Stiles <johnstiles@google.com>
Auto-Submit: John Stiles <johnstiles@google.com>
---
 platform_tools/debugging/lldb/skia.py   | 4 ++--
 platform_tools/debugging/vs/Skia.natvis | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/platform_tools/debugging/lldb/skia.py b/platform_tools/debugging/lldb/skia.py
index 5f8cacbcd649..a6513fa3ab30 100644
--- a/platform_tools/debugging/lldb/skia.py
+++ b/platform_tools/debugging/lldb/skia.py
@@ -211,11 +211,11 @@ def __lldb_init_module(debugger, dict):
     debugger.HandleCommand(
         'type summary add --summary-string "fPtr = ${var.fPtr}" -x "^sk_sp<.+>$" -w skia')
     debugger.HandleCommand(
-        'type synthetic add -l skia.SkTArray_SynthProvider -x "^SkS?TArray<.+>$" -w skia')
+        'type synthetic add -l skia.SkTArray_SynthProvider -x "^skia_private::S?TArray<.+>$" -w skia')
     debugger.HandleCommand(
         'type synthetic add -l skia.SkSpan_SynthProvider -x "^SkSpan<.+>$" -w skia')
     debugger.HandleCommand(
-        'type summary add --summary-string "size=${svar%#}" -e -x "^SkS?TArray<.+>$" -w skia')
+        'type summary add --summary-string "size=${svar%#}" -e -x "^skia_private::S?TArray<.+>$" -w skia')
     debugger.HandleCommand(
         'type synthetic add -l skia.AutoTArray_SynthProvider -x "^skia_private::AutoS?TArray<.+>$" -w skia')
     debugger.HandleCommand(
diff --git a/platform_tools/debugging/vs/Skia.natvis b/platform_tools/debugging/vs/Skia.natvis
index cfb8952fd4b6..08be9ac4cc02 100644
--- a/platform_tools/debugging/vs/Skia.natvis
+++ b/platform_tools/debugging/vs/Skia.natvis
@@ -98,8 +98,8 @@
     </Expand>
   </Type>
 
-  <!-- SkTArray -->
-  <Type Name="SkTArray&lt;*&gt;">
+  <!-- TArray -->
+  <Type Name="skia_private::TArray&lt;*&gt;">
     <DisplayString>{{size = {fSize}}}</DisplayString>
     <Expand>
       <Item Name="[size]">fSize</Item>
@@ -119,8 +119,8 @@
     </Expand>
   </Type>
 
-  <!-- SkTHashMap -->
-  <Type Name="SkTHashMap&lt;*,*,*&gt;">
+  <!-- THashMap -->
+  <Type Name="skia_private::THashMap&lt;*,*,*&gt;">
     <DisplayString>{{size = {fTable.fCount}}}</DisplayString>
     <Expand>
       <CustomListItems>