From 2dbeb5da18b164cece00431cc77e09102960ee69 Mon Sep 17 00:00:00 2001
From: Kim-Anh Tran <kimanh@chromium.org>
Date: Tue, 31 Mar 2020 07:10:21 +0200
Subject: [PATCH] Update CDP and add string to reflect stack scope in scope
 view

DISABLE_THIRD_PARTY_CHECK=Change to reflect CDP update

Bug: chromium:1043034
Bug: v8:10347
Change-Id: I777072a1263f93b228263d065c2e0e95707774dd
Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/2128128
Reviewed-by: Benedikt Meurer <bmeurer@chromium.org>
Commit-Queue: Kim-Anh Tran <kimanh@chromium.org>
---
 front_end/generated/InspectorBackendCommands.js   | 13 ++++++++++---
 front_end/generated/protocol.d.ts                 |  9 ++++++++-
 front_end/sdk/DebuggerModel.js                    |  2 ++
 front_end/sdk/sdk_strings.grdp                    |  3 +++
 .../devtools_protocol/browser_protocol.json       | 15 +++++++++++----
 v8/include/js_protocol.pdl                        |  9 ++++++++-
 6 files changed, 42 insertions(+), 9 deletions(-)

diff --git a/front_end/generated/InspectorBackendCommands.js b/front_end/generated/InspectorBackendCommands.js
index 7e13d73538..93eb471063 100644
--- a/front_end/generated/InspectorBackendCommands.js
+++ b/front_end/generated/InspectorBackendCommands.js
@@ -2212,7 +2212,8 @@ export function registerCommands(inspectorBackend) {
     Block: 'block',
     Script: 'script',
     Eval: 'eval',
-    Module: 'module'
+    Module: 'module',
+    WasmExpressionStack: 'wasm-expression-stack'
   });
   inspectorBackend.registerEnum(
       'Debugger.BreakLocationType', {DebuggerStatement: 'debuggerStatement', Call: 'call', Return: 'return'});
@@ -2438,7 +2439,8 @@ export function registerCommands(inspectorBackend) {
     Number: 'number',
     Boolean: 'boolean',
     Symbol: 'symbol',
-    Bigint: 'bigint'
+    Bigint: 'bigint',
+    Wasm: 'wasm'
   });
   inspectorBackend.registerEnum('Runtime.RemoteObjectSubtype', {
     Array: 'array',
@@ -2457,7 +2459,12 @@ export function registerCommands(inspectorBackend) {
     Promise: 'promise',
     Typedarray: 'typedarray',
     Arraybuffer: 'arraybuffer',
-    Dataview: 'dataview'
+    Dataview: 'dataview',
+    I32: 'i32',
+    I64: 'i64',
+    F32: 'f32',
+    F64: 'f64',
+    V128: 'v128'
   });
   inspectorBackend.registerEnum('Runtime.ObjectPreviewType', {
     Object: 'object',
diff --git a/front_end/generated/protocol.d.ts b/front_end/generated/protocol.d.ts
index 06cf2769c6..abb8bb8c59 100644
--- a/front_end/generated/protocol.d.ts
+++ b/front_end/generated/protocol.d.ts
@@ -11403,6 +11403,7 @@ declare namespace Protocol {
       Script = 'script',
       Eval = 'eval',
       Module = 'module',
+      WasmExpressionStack = 'wasm-expression-stack',
     }
 
     /**
@@ -12628,6 +12629,7 @@ declare namespace Protocol {
       Boolean = 'boolean',
       Symbol = 'symbol',
       Bigint = 'bigint',
+      Wasm = 'wasm',
     }
 
     export enum RemoteObjectSubtype {
@@ -12648,6 +12650,11 @@ declare namespace Protocol {
       Typedarray = 'typedarray',
       Arraybuffer = 'arraybuffer',
       Dataview = 'dataview',
+      I32 = 'i32',
+      I64 = 'i64',
+      F32 = 'f32',
+      F64 = 'f64',
+      V128 = 'v128',
     }
 
     /**
@@ -12659,7 +12666,7 @@ declare namespace Protocol {
        */
       type: RemoteObjectType;
       /**
-       * Object subtype hint. Specified for `object` type values only.
+       * Object subtype hint. Specified for `object` or `wasm` type values only.
        */
       subtype?: RemoteObjectSubtype;
       /**
diff --git a/front_end/sdk/DebuggerModel.js b/front_end/sdk/DebuggerModel.js
index 84fa17d66f..daf0532266 100644
--- a/front_end/sdk/DebuggerModel.js
+++ b/front_end/sdk/DebuggerModel.js
@@ -1485,6 +1485,8 @@ export class Scope {
         return Common.UIString.UIString('Global');
       case Protocol.Debugger.ScopeType.Module:
         return Common.UIString.UIString('Module');
+      case Protocol.Debugger.ScopeType.WasmExpressionStack:
+        return Common.UIString.UIString('Stack');
     }
     return '';
   }
diff --git a/front_end/sdk/sdk_strings.grdp b/front_end/sdk/sdk_strings.grdp
index d15ba74d22..2536837155 100644
--- a/front_end/sdk/sdk_strings.grdp
+++ b/front_end/sdk/sdk_strings.grdp
@@ -60,6 +60,9 @@
   <message name="IDS_DEVTOOLS_212af9ab36fa426a9e52bc1ebfd8665b" desc="Text in DOMDebugger Model">
     Drag / drop
   </message>
+  <message name="IDS_DEVTOOLS_2187e1021a911b3807cc1bea2eb1a9ca" desc="Text for a stack, the programming concept">
+    Stack
+  </message>
   <message name="IDS_DEVTOOLS_22af645d1859cb5ca6da0c484f1f37ea" desc="Service worker version status displayed in the Threads view of the Debugging side pane in the Sources panel">
     new
   </message>
diff --git a/third_party/blink/public/devtools_protocol/browser_protocol.json b/third_party/blink/public/devtools_protocol/browser_protocol.json
index b4472165ce..bee9aff32e 100644
--- a/third_party/blink/public/devtools_protocol/browser_protocol.json
+++ b/third_party/blink/public/devtools_protocol/browser_protocol.json
@@ -16828,7 +16828,8 @@
                                 "block",
                                 "script",
                                 "eval",
-                                "module"
+                                "module",
+                                "wasm-expression-stack"
                             ]
                         },
                         {
@@ -18664,12 +18665,13 @@
                                 "number",
                                 "boolean",
                                 "symbol",
-                                "bigint"
+                                "bigint",
+                                "wasm"
                             ]
                         },
                         {
                             "name": "subtype",
-                            "description": "Object subtype hint. Specified for `object` type values only.",
+                            "description": "Object subtype hint. Specified for `object` or `wasm` type values only.",
                             "optional": true,
                             "type": "string",
                             "enum": [
@@ -18689,7 +18691,12 @@
                                 "promise",
                                 "typedarray",
                                 "arraybuffer",
-                                "dataview"
+                                "dataview",
+                                "i32",
+                                "i64",
+                                "f32",
+                                "f64",
+                                "v128"
                             ]
                         },
                         {
diff --git a/v8/include/js_protocol.pdl b/v8/include/js_protocol.pdl
index c923c49440..3f5410d1e1 100644
--- a/v8/include/js_protocol.pdl
+++ b/v8/include/js_protocol.pdl
@@ -119,6 +119,7 @@ domain Debugger
         script
         eval
         module
+        wasm-expression-stack
       # Object representing the scope. For `global` and `with` scopes it represents the actual
       # object; for the rest of the scopes, it is artificial transient object enumerating scope
       # variables as its properties.
@@ -954,7 +955,8 @@ domain Runtime
         boolean
         symbol
         bigint
-      # Object subtype hint. Specified for `object` type values only.
+        wasm
+      # Object subtype hint. Specified for `object` or `wasm` type values only.
       optional enum subtype
         array
         null
@@ -973,6 +975,11 @@ domain Runtime
         typedarray
         arraybuffer
         dataview
+        i32
+        i64
+        f32
+        f64
+        v128
       # Object class (constructor) name. Specified for `object` type values only.
       optional string className
       # Remote object value in case of primitive values or JSON values (if it was requested).