commit a80de9f93a06c5654813da3afdcfeeff3006497c
author Yoshifumi Inoue <yosin@chromium.org> Wed Jul 29 03:27:57 2020
committer Commit Bot <commit-bot@chromium.org> Wed Jul 29 03:27:57 2020
tree 5d1b9d604b4275e65455aea64bdf9938a65c4720
parent 222c7c0bae1746d95e6aed52c0662fcd37846369

Update blink.natvis for StringImpl

This patch changes "tools/win/DebugVisualizers/webkit.natvis" to handle
new |StringImpl| implementation[1].

I confirmed this change for both 8-Bit string and 16-Bit string, e.g.
8-Bit for |Element::tag_name| via (AtomicString), 16-Bit
|NGInlineNodeData::text_content_|.

Note: We use type cast operator to read |std::atomic_uint32_t|, because
DebugVisualizers can't read value from struct field for it.

[1] http://crrev.com/c/2301589 Make StringImpl flags atomic and
threadsafe

Bug: 1083392
Change-Id: I559ff4619695c1a4b1f5d330c36df2e85149c5c4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2309528
Commit-Queue: Yoshifumi Inoue <yosin@chromium.org>
Reviewed-by: Koji Ishii <kojii@chromium.org>
Reviewed-by: Bruce Dawson <brucedawson@chromium.org>
Auto-Submit: Yoshifumi Inoue <yosin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#792511}

tools/win/DebugVisualizers/blink.natvis

diff --git a/tools/win/DebugVisualizers/blink.natvis b/tools/win/DebugVisualizers/blink.natvis
index f045c77c..c734b13f 100644
--- a/tools/win/DebugVisualizers/blink.natvis
+++ b/tools/win/DebugVisualizers/blink.natvis
@@ -25,16 +25,28 @@
   </Type>
   <Type Name="WTF::StringImpl">
     <DisplayString IncludeView="bare"
-        Condition="is_8bit_">{(this+1),[length_]sb}</DisplayString>
-    <DisplayString
-        Condition="is_8bit_">[{length_}] {(this+1),[length_]s}</DisplayString>
-    <DisplayString IncludeView="bare">{(this+1),[length_]sub}</DisplayString>
-    <DisplayString>[{length_}] {(this+1),[length_]su}</DisplayString>
+                   Condition="*(int*)&amp;hash_and_flags_ &amp; 1">
+        {(this+1),[length_]sb}</DisplayString>
+    <DisplayString>[{length_}] {(this+1),[length_]s}</DisplayString>
+    <DisplayString IncludeView="bare"
+                   Condition="*(int*)&amp;hash_and_flags_ &amp; 1">
+        {(this+1),[length_]sub}</DisplayString>
+    <DisplayString Condition="(*(int*)&amp;hash_and_flags_ &amp; 1)==0">
+        [{length_}] {(this+1),[length_]su}</DisplayString>
     <Expand>
       <Item Name="Length">length_</Item>
-      <Item Name="Hash">hash_</Item>
-      <Item Name="AsciiText" Condition="is_8bit_">(char*)(this+1),[length_]s</Item>
-      <Item Name="UnicodeText" Condition="!is_8bit_">(wchar_t*)(this+1),[length_]su</Item>
+      <Item Name="AsciiText"
+            Condition="*(int*)&amp;hash_and_flags_ &amp; 1">
+        (char*)(this+1),[length_]s</Item>
+      <Item Name="UnicodeText"
+            Condition="(*(int*)&amp;hash_and_flags_ &amp; 1)==0">
+        (wchar_t*)(this+1),[length_]su</Item>
+      <Item Name="Is8Bit">*(int*)&amp;hash_and_flags_ &amp; 1</Item>
+      <Item Name="IsStatic">*(int*)&amp;hash_and_flags_ &amp; 2</Item>
+      <Item Name="IsAtomic">*(int*)&amp;hash_and_flags_ &amp; 4</Item>
+      <Item Name="AsciiCheckDone">*(int*)&amp;hash_and_flags_ &amp; 8</Item>
+      <Item Name="ContainsOnlyAscii">*(int*)&amp;hash_and_flags_ &amp; 16</Item>
+      <Item Name="HashRaw">*(int*)&amp;hash_and_flags_ >> 8</Item>
     </Expand>
   </Type>
   <Type Name="WTF::AtomicString">