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 <[email protected]> Commit-Queue: Herb Derby <[email protected]> Commit-Queue: John Stiles <[email protected]> Auto-Submit: John Stiles <[email protected]>
armansito · Apr 7, 2023 · c7c9cf8 · c7c9cf8
1 parent 5e936d5
commit c7c9cf8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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>