chrome-devtools-frontend 1.0.1012587 → 1.0.1013367

package/front_end/ui/components/linear_memory_inspector/LinearMemoryViewer.ts

@@ -115,19 +115,22 @@ export class LinearMemoryViewer extends HTMLElement {
 
     // We initially just plot one row with one byte group (here: byte group size of 4).
     // Depending on that initially plotted row we can determine how many rows and
-    // bytes per row we can fit:
-    // > 0000000 | b0 b1 b2 b4 | a0 a1 a2 a3       <
-    //             ^-^           ^-^
-    //             byteCellWidth textCellWidth
-    //             ^-------------------------------^
-    //                 widthToFill
+    // bytes per row we can fit.
+    // >    0000000 | b0 b1 b2 b4 | a0 a1 a2 a3    <
+    //      ^-------^ ^-^           ^-^
+    //          |     byteCellWidth textCellWidth
+    //          |
+    //     addressTextAndDividerWidth
+    //  ^--^   +     ^----------------------------^
+    //      widthToFill
 
     const firstByteCell = this.shadowRoot.querySelector('.byte-cell');
     const textCell = this.shadowRoot.querySelector('.text-cell');
     const divider = this.shadowRoot.querySelector('.divider');
     const rowElement = this.shadowRoot.querySelector('.row');
+    const addressText = this.shadowRoot.querySelector('.address');
 
-    if (!firstByteCell || !textCell || !divider || !rowElement) {
+    if (!firstByteCell || !textCell || !divider || !rowElement || !addressText) {
       this.#numBytesInRow = BYTE_GROUP_SIZE;
       this.#numRows = 1;
       return;
@@ -140,16 +143,18 @@ export class LinearMemoryViewer extends HTMLElement {
 
     // Calculate the width to fill.
     const dividerWidth = divider.getBoundingClientRect().width;
-    // this.clientWidth is rounded, while the other values are not. Subtract one to make
+    const addressTextAndDividerWidth =
+        firstByteCell.getBoundingClientRect().left - addressText.getBoundingClientRect().left;
+
+    // this.clientWidth is rounded, while the other values are not. Subtract 1 to make
     // sure that we correctly calculate the widths.
-    const widthToFill = this.clientWidth - 1 -
-        (firstByteCell.getBoundingClientRect().left - this.getBoundingClientRect().left) - dividerWidth;
+    const widthToFill = this.clientWidth - 1 - addressTextAndDividerWidth - dividerWidth;
+
     if (widthToFill < groupWidth) {
       this.#numBytesInRow = BYTE_GROUP_SIZE;
       this.#numRows = 1;
       return;
     }
-
     this.#numBytesInRow = Math.floor(widthToFill / groupWidth) * BYTE_GROUP_SIZE;
     this.#numRows = Math.floor(this.clientHeight / rowElement.clientHeight);
   }

package/front_end/ui/components/linear_memory_inspector/linearMemoryInspector.css

@@ -19,6 +19,10 @@
   padding: 9px 12px 9px 7px;
 }
 
+devtools-linear-memory-inspector-viewer {
+  justify-content: center;
+}
+
 devtools-linear-memory-inspector-navigator + devtools-linear-memory-inspector-viewer {
   margin-top: 12px;
 }

package/package.json

@@ -55,5 +55,5 @@
     "unittest": "scripts/test/run_unittests.py --no-text-coverage",
     "watch": "vpython third_party/node/node.py --output scripts/watch_build.js"
   },
-  "version": "1.0.1012587"
+  "version": "1.0.1013367"
 }

package/scripts/build/ninja/devtools_entrypoint.gni

@@ -121,9 +121,9 @@ template("devtools_entrypoint") {
 
       is_web_worker = _is_web_worker
 
-      if (defined(use_rbe) && use_rbe && defined(devtools_use_rbe) &&
-          devtools_use_rbe) {
-        use_rbe = false
+      if (defined(use_remoteexec) && use_remoteexec &&
+          defined(devtools_use_remoteexec) && devtools_use_remoteexec) {
+        use_remoteexec = false
       }
     }
 

package/scripts/build/ninja/wasm.gni

@@ -0,0 +1,25 @@
+# Copyright 2022 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+import("./copy.gni")
+
+template("wasm_module") {
+  assert(defined(invoker.sources), "Need sources in $target_name")
+  action_foreach(target_name) {
+    script = devtools_location_prepend + "scripts/build/wasm-as.py"
+    outputs = [
+      "$target_gen_dir/{{source_name_part}}.wasm",
+      "$target_gen_dir/{{source_name_part}}.wasm.map",
+      "$target_gen_dir/{{source_name_part}}.wasm.map.json",
+    ]
+    args = [
+      "{{source}}",
+      rebase_path("$target_gen_dir/{{source_name_part}}.wasm", root_build_dir),
+    ]
+    sources = invoker.sources
+  }
+
+  copy_to_gen(target_name + "_sources") {
+    sources = invoker.sources
+  }
+}

package/scripts/build/wasm-as.py

@@ -0,0 +1,87 @@
+# Copyright 2022 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import argparse
+import json
+from os import path
+import platform
+import re
+import subprocess
+import sys
+
+REPO_DIR = path.join(path.dirname(__file__), '..', '..')
+
+
+def llvm_readobj():
+    binary_name = {
+        'Darwin': 'llvm-readobj',
+        'Linux': 'llvm-readobj',
+        'Windows': 'llvm-readobj.exe',
+    }[platform.system()]
+    return path.realpath(
+        path.join(REPO_DIR, 'third_party', 'emscripten-releases', 'install',
+                  'bin', binary_name))
+
+
+def wasm_as():
+    binary_name = {
+        'Darwin': 'wasm-as',
+        'Linux': 'wasm-as',
+        'Windows': 'wasm-as.exe',
+    }[platform.system()]
+    return path.realpath(
+        path.join(REPO_DIR, 'third_party', 'emscripten-releases', 'install',
+                  'bin', binary_name))
+
+
+def script_main(args):
+    parser = argparse.ArgumentParser()
+    parser.add_argument('input')
+    parser.add_argument('output')
+    options = parser.parse_args(args)
+
+    sourcemap = f'{options.output}.map'
+    subprocess.check_call([
+        wasm_as(), options.input, '-g', '-sm', sourcemap, '-o', options.output
+    ])
+
+    wasm_obj_headers = subprocess.check_output([
+        llvm_readobj(),
+        '-e',
+        # TODO(crbug.com/1328729): use JSON output as soon as that's supported for wasm
+        # '--elf-output-style=JSON',
+        options.output
+    ])
+    (size, offset) = re.search(
+        b'Section {[^}]*Type: CODE[^}]*Size: (\d*)[^}]*Offset: (\d*)[^}]*}',
+        wasm_obj_headers).groups()
+
+    # readobj reports as offset the location of the first byte of the header.
+    # Our offsets are relative to the first byte of the section though, so
+    # calculate the offset manually. The header is composed of one byte for the
+    # section id, and an leb128 value for the length.
+    size = int(size)
+    leb_len = 0
+    while size > 0:
+        size >>= 7
+        leb_len += 1
+    offset = int(offset) + 1 + leb_len
+
+    node = path.realpath(path.join(REPO_DIR, 'third_party', 'node', 'node.py'))
+    sourcemap2json = path.realpath(
+        path.join(REPO_DIR, 'scripts', 'build', 'wasm_sourcemap.mjs'))
+    sourcemap_contents = subprocess.check_output([
+        sys.executable, node, '--output', sourcemap2json, sourcemap,
+        '%s' % (offset)
+    ])
+
+    json_file = f'{options.output}.map.json'
+    with open(json_file, 'wb') as output:
+        output.write(sourcemap_contents)
+
+    return 0
+
+
+if __name__ == '__main__':
+    sys.exit(script_main(sys.argv[1:]))

package/scripts/build/wasm_sourcemap.mjs

@@ -0,0 +1,22 @@
+// Copyright 2022 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import * as fs from 'fs';
+import * as sourceMap from 'source-map';
+
+if (process.argv.length !== 4) {
+  throw new Error(`usage: ${process.argv[1]} <input.map> <offset>`);
+}
+
+const offset = Number(process.argv[3] || 0);
+const sourceMapContents = JSON.parse(fs.readFileSync(process.argv[2], 'utf-8'));
+const sourceMapConsumer = new sourceMap.SourceMapConsumer(sourceMapContents);
+
+const sourceMappings = [];
+sourceMapConsumer.eachMapping(({source, generatedLine, generatedColumn, originalLine, originalColumn}) => {
+  const bytecodeOffset = generatedColumn - offset;
+  sourceMappings.push({source, generatedLine, generatedColumn, originalLine, originalColumn, bytecodeOffset});
+});
+
+console.log(JSON.stringify(sourceMappings));