[pull] main from chromium:main

DEPS

@@ -1421,7 +1421,7 @@ deps = {
   },
 
   'src/third_party/perfetto':
-    Var('android_git') + '/platform/external/perfetto.git' + '@' + '86b18b837a45380f1b9070cb765ec5864994942c',
+    Var('android_git') + '/platform/external/perfetto.git' + '@' + '1357bd132733ccc23a295739e4bc432d7a53d120',
 
   'src/third_party/perl': {
       'url': Var('chromium_git') + '/chromium/deps/perl.git' + '@' + '6f3e5028eb65d0b4c5fdd792106ac4c84eee1eb3',

ash/webui/camera_app_ui/resources/js/async_job_queue.ts

@@ -0,0 +1,44 @@
+// Copyright 2020 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.
+
+/**
+ * Asynchronous job queue.
+ */
+export class AsyncJobQueue {
+  private promise: Promise<unknown> = Promise.resolve();
+  private clearing = false;
+
+  /**
+   * Pushes the given job into queue.
+   * @return Resolved with the job return value when the job is finished, or
+   *     null if the job is cleared.
+   */
+  push<T>(job: () => Promise<T>): Promise<T|null> {
+    const promise: Promise<T|null> = this.promise.then(() => {
+      if (this.clearing) {
+        return null;
+      }
+      return job();
+    });
+    this.promise = promise;
+    return promise;
+  }
+
+  /**
+   * Flushes the job queue.
+   * @return Resolved when all jobs in the queue are finished.
+   */
+  async flush(): Promise<void> {
+    await this.promise;
+  }
+
+  /**
+   * Clears all not-yet-scheduled jobs and waits for current job finished.
+   */
+  async clear(): Promise<void> {
+    this.clearing = true;
+    await this.flush();
+    this.clearing = false;
+  }
+}

ash/webui/camera_app_ui/resources/js/externs/types.d.ts

@@ -251,9 +251,9 @@ type CreateScriptURLCallback = (input: string, arguments: any) => string;
 
 interface TrustedTypePolicy {
   readonly name: string;
-  createHTML(input: string, arguments: any): TrustedHTML;
-  createScript(input: string, arguments: any): TrustedScript;
-  createScriptURL(input: string, arguments: any): TrustedScriptURL;
+  createHTML(input: string, arguments?: any): TrustedHTML;
+  createScript(input: string, arguments?: any): TrustedScript;
+  createScriptURL(input: string, arguments?: any): TrustedScriptURL;
 }
 
 interface TrustedTypePolicyFactory {

ash/webui/camera_app_ui/resources/js/init.js → ash/webui/camera_app_ui/resources/js/init.ts

@@ -12,11 +12,12 @@
 import '/strings.m.js';
 
 import * as Comlink from './lib/comlink.js';
+import {TestBridge} from './test_bridge.js';
 
 document.addEventListener('DOMContentLoaded', async () => {
   const workerPath = '/js/test_bridge.js';
   const sharedWorker = new SharedWorker(workerPath, {type: 'module'});
-  const testBridge = Comlink.wrap(sharedWorker.port);
+  const testBridge = Comlink.wrap<TestBridge>(sharedWorker.port);
   const appWindow = await testBridge.bindWindow(window.location.href);
   // TODO(crbug.com/980846): Refactor to use a better way rather than window
   // properties to pass data to other modules.

ash/webui/camera_app_ui/resources/js/js.gni

@@ -6,7 +6,7 @@ compile_js_files = [
   "animation.js",
   "app_window.js",
   "assert.ts",
-  "async_job_queue.js",
+  "async_job_queue.ts",
   "barcode_chip.js",
   "css.ts",
   "device/camera3_device_info.js",
@@ -24,9 +24,10 @@ compile_js_files = [
   "geometry.js",
   "h264.js",
   "i18n_string.js",
-  "init.js",
+  "init.ts",
   "intent.js",
-  "lib/comlink.js",
+  "lib/comlink.ts",
+  "lib/comlink_protocol.ts",
   "lib/ffmpeg.js",
   "main.js",
   "metrics.ts",
@@ -46,7 +47,7 @@ compile_js_files = [
   "models/local_storage.js",
   "models/result_saver.js",
   "models/video_processor_interface.js",
-  "models/video_saver.js",
+  "models/video_saver.ts",
   "mojo/chrome_helper.ts",
   "mojo/device_operator.js",
   "mojo/image_capture.js",
@@ -58,17 +59,17 @@ compile_js_files = [
   "snackbar.js",
   "sound.js",
   "state.js",
-  "test_bridge.js",
+  "test_bridge.ts",
   "thumbnailer.js",
-  "timer.js",
+  "timer.ts",
   "toast.js",
   "tooltip.js",
   "type.ts",
   "unload.js",
   "untrusted_ga_helper.js",
   "untrusted_helper_interfaces.js",
   "untrusted_script_loader.js",
-  "untrusted_video_processor_helper.js",
+  "untrusted_video_processor_helper.ts",
   "util.ts",
   "views/camera_intent.js",
   "views/camera.js",