third_party/ink: Roll to 236729529 and add threaded build
Bug: 902646
Change-Id: I8b7bb960a2cdc0a386b3a8518d20a9514c4d1eb4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1501236
Commit-Queue: dstockwell <dstockwell@chromium.org>
Reviewed-by: Darren Shen <shend@chromium.org>
Cr-Commit-Position: refs/heads/master@{#638065}diff --git a/DEPS b/DEPS
index 4adcfeb..6965d35a 100644
--- a/DEPS
+++ b/DEPS
@@ -2749,7 +2749,7 @@
'src/third_party/libovr/src',
],
},
- # Download ink resources for chromeos.
+ # Download common ink resources for chromeos.
{
'name': 'ink-build',
'pattern': '.',
@@ -2763,7 +2763,7 @@
'-d', 'src/third_party/ink/build',
],
},
- # Download ink resources for chromeos.
+ # Download wasm ink resources for chromeos.
{
'name': 'ink-build-wasm',
'pattern': '.',
@@ -2777,6 +2777,20 @@
'-d', 'src/third_party/ink/build/wasm',
],
},
+ # Download wasm threaded ink resources for chromeos.
+ {
+ 'name': 'ink-build-wasm',
+ 'pattern': '.',
+ 'condition': 'checkout_chromeos',
+ 'action': [ 'python',
+ 'src/third_party/depot_tools/download_from_google_storage.py',
+ '--no_resume',
+ '--no_auth',
+ '--num_threads=4',
+ '--bucket', 'chromium-ink',
+ '-d', 'src/third_party/ink/build/wasm-threads',
+ ],
+ },
{
# Pull doclava binaries if building for Android.
'name': 'doclava',
diff --git a/third_party/ink/README.chromium b/third_party/ink/README.chromium
index 314199e..405ce3c 100644
--- a/third_party/ink/README.chromium
+++ b/third_party/ink/README.chromium
@@ -1,7 +1,7 @@
Name: Google Ink
Short Name: ink
URL: https://github.com/google/ink
-Version: 233314166
+Version: 236729529
License: Apache 2.0
Security Critical: yes
diff --git a/third_party/ink/build/ink_lib_binary.js.sha1 b/third_party/ink/build/ink_lib_binary.js.sha1
index 55ca656..d9f90f8 100644
--- a/third_party/ink/build/ink_lib_binary.js.sha1
+++ b/third_party/ink/build/ink_lib_binary.js.sha1
@@ -1 +1 @@
-36d392d7bec3d8550e40a947c0db29b40e19d60b
\ No newline at end of file
+b64c8e4dbec4b01a3aa0cd4a0b7fd37ff735fb72
\ No newline at end of file
diff --git a/third_party/ink/build/ink_lib_externs.js.sha1 b/third_party/ink/build/ink_lib_externs.js.sha1
index 26f1cfff..f68aa91 100644
--- a/third_party/ink/build/ink_lib_externs.js.sha1
+++ b/third_party/ink/build/ink_lib_externs.js.sha1
@@ -1 +1 @@
-b866a5dbc00ee771cf56ed08cc78015cef160758
\ No newline at end of file
+90f553cbf55aa906cdd43c4b27dc3d5ef9e75ebb
\ No newline at end of file
diff --git a/third_party/ink/build/wasm-threads/glcore_base.js.mem.sha1 b/third_party/ink/build/wasm-threads/glcore_base.js.mem.sha1
new file mode 100644
index 0000000..6aaf19f
--- /dev/null
+++ b/third_party/ink/build/wasm-threads/glcore_base.js.mem.sha1
@@ -0,0 +1 @@
+d346855d34df6a757683494be06cad9aac8e1a01
\ No newline at end of file
diff --git a/third_party/ink/build/wasm-threads/glcore_base.js.sha1 b/third_party/ink/build/wasm-threads/glcore_base.js.sha1
new file mode 100644
index 0000000..cb76fe4
--- /dev/null
+++ b/third_party/ink/build/wasm-threads/glcore_base.js.sha1
@@ -0,0 +1 @@
+4d8f1d787a8c0f496b733c7578824cf6e0608840
\ No newline at end of file
diff --git a/third_party/ink/build/wasm-threads/glcore_base.wasm.sha1 b/third_party/ink/build/wasm-threads/glcore_base.wasm.sha1
new file mode 100644
index 0000000..714e08a
--- /dev/null
+++ b/third_party/ink/build/wasm-threads/glcore_base.wasm.sha1
@@ -0,0 +1 @@
+3e0eaa76ec1238f9cd1cecf7808d700cd9a84924
\ No newline at end of file
diff --git a/third_party/ink/build/wasm-threads/glcore_wasm_bootstrap_compiled.js.sha1 b/third_party/ink/build/wasm-threads/glcore_wasm_bootstrap_compiled.js.sha1
new file mode 100644
index 0000000..67c5116
--- /dev/null
+++ b/third_party/ink/build/wasm-threads/glcore_wasm_bootstrap_compiled.js.sha1
@@ -0,0 +1 @@
+4ab63d6214d411e2b096d5d0f3a072d0c9332201
\ No newline at end of file
diff --git a/third_party/ink/build/wasm-threads/pthread-main.js.sha1 b/third_party/ink/build/wasm-threads/pthread-main.js.sha1
new file mode 100644
index 0000000..1e5ae02a
--- /dev/null
+++ b/third_party/ink/build/wasm-threads/pthread-main.js.sha1
@@ -0,0 +1 @@
+89f47a099c85e412a4dc1755c8f01deef42e4713
\ No newline at end of file
diff --git a/third_party/ink/build/wasm/glcore_base.js.sha1 b/third_party/ink/build/wasm/glcore_base.js.sha1
index dbc150f2..8c62ba4 100644
--- a/third_party/ink/build/wasm/glcore_base.js.sha1
+++ b/third_party/ink/build/wasm/glcore_base.js.sha1
@@ -1 +1 @@
-529bc90cbda84c1c1ea684f3b74203932e6897da
\ No newline at end of file
+c8b78d6f7b0b9639cf05f68100568f54024bd621
\ No newline at end of file
diff --git a/third_party/ink/build/wasm/glcore_base.wasm.sha1 b/third_party/ink/build/wasm/glcore_base.wasm.sha1
index 9278463..68dc8071 100644
--- a/third_party/ink/build/wasm/glcore_base.wasm.sha1
+++ b/third_party/ink/build/wasm/glcore_base.wasm.sha1
@@ -1 +1 @@
-a27172fe2f09c9c5c194219754beb0e7433f6264
\ No newline at end of file
+5310afd49946994abbf109c77d06831143d7f623
\ No newline at end of file
diff --git a/third_party/ink/build/wasm/glcore_wasm_bootstrap_compiled.js.sha1 b/third_party/ink/build/wasm/glcore_wasm_bootstrap_compiled.js.sha1
index 5a7db281..4d72bb83 100644
--- a/third_party/ink/build/wasm/glcore_wasm_bootstrap_compiled.js.sha1
+++ b/third_party/ink/build/wasm/glcore_wasm_bootstrap_compiled.js.sha1
@@ -1 +1 @@
-c742f9bc02eeb6189d07d7acb893af6ec7c0f49e
\ No newline at end of file
+49ed90d6ccc69b214c88fe99c43700099ef00bdb
\ No newline at end of file
