commit | e21532a7ac67bf8f09b18b704cc824e956377a68 | [log] [tgz] |
---|---|---|
author | dstockwell <dstockwell@google.com> | Wed Jan 23 01:33:10 2019 |
committer | Commit Bot <commit-bot@chromium.org> | Wed Jan 23 01:33:10 2019 |
tree | 40a4d607fb7a509f0e400b01f75b85227f0ac1e5 | |
parent | 1f74b7fde74543a8c2d0cd92566b90e5784d6915 [diff] |
Reland "Roll third_party/ink to 230250745" This is a reland of 45ce00a7dc3fb08046922af7d626464fe0dc0932 Additional externs were manually added to make up for the missing externs in ink_lib_externs.js Original change's description: > Roll third_party/ink to 230250745 > > Bug: 902646 > Change-Id: Ife9419c49c925dd74c3381cf3c9ce703bc1bede4 > Reviewed-on: https://chromium-review.googlesource.com/c/1426197 > Auto-Submit: dstockwell <dstockwell@chromium.org> > Commit-Queue: Darren Shen <shend@chromium.org> > Reviewed-by: Darren Shen <shend@chromium.org> > Cr-Commit-Position: refs/heads/master@{#624690} Bug: 902646 Change-Id: Icc7bacb5ab2e01cbb926377afeb6d9dde7b62ae1 Reviewed-on: https://chromium-review.googlesource.com/c/1426237 Reviewed-by: Darren Shen <shend@chromium.org> Reviewed-by: dsinclair <dsinclair@chromium.org> Commit-Queue: dstockwell <dstockwell@chromium.org> Cr-Commit-Position: refs/heads/master@{#625019}
diff --git a/chrome/browser/resources/pdf/ink/externs.js b/chrome/browser/resources/pdf/ink/externs.js index 2e721649..8af66df 100644 --- a/chrome/browser/resources/pdf/ink/externs.js +++ b/chrome/browser/resources/pdf/ink/externs.js
@@ -24,6 +24,9 @@ ink.proto.SetCallbackFlags = function() {}; /** @constructor */ +ink.proto.ToolEvent = function() {}; + +/** @constructor */ ink.Box = function() {}; /** @constructor */
diff --git a/third_party/ink/README.chromium b/third_party/ink/README.chromium index 210055f..9cf9474 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: 228585062 +Version: 230250745 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 0107f4d..90c75fd 100644 --- a/third_party/ink/build/ink_lib_binary.js.sha1 +++ b/third_party/ink/build/ink_lib_binary.js.sha1
@@ -1 +1 @@ -96a199262085db0c8ab769ffc1c00c7a4206e11b \ No newline at end of file +dd1031228cad37ca2de73e238c57f92ddb5599e8 \ 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 360f70b..81cfbff 100644 --- a/third_party/ink/build/ink_lib_externs.js.sha1 +++ b/third_party/ink/build/ink_lib_externs.js.sha1
@@ -1 +1 @@ -1bf7b6050e80900d1550662449ee4cb629a5b58c \ No newline at end of file +b23214c40d27afd815b297307c444f0f7a8aae5d \ 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 bc3a9812..78cafe0 100644 --- a/third_party/ink/build/wasm/glcore_base.js.sha1 +++ b/third_party/ink/build/wasm/glcore_base.js.sha1
@@ -1 +1 @@ -f5d2b7ef263232214fb4245fd65ddac9163b3dfa \ No newline at end of file +d82d4e4ca932f33422d54f91a760c2283c15c386 \ 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 f644fb5..a943dd0 100644 --- a/third_party/ink/build/wasm/glcore_base.wasm.sha1 +++ b/third_party/ink/build/wasm/glcore_base.wasm.sha1
@@ -1 +1 @@ -6cd75c44e3d09a4498db217134621ceec456e963 \ No newline at end of file +81f6395d9c2a455c655065c58b80b064197829e2 \ 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 1d46f28..840d1485 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 @@ -6906d70ce132066b0118e823b5ac7a80ebbc98bc \ No newline at end of file +63ac7c111db8e8a67ead5b95e4e43c8344b6e394 \ No newline at end of file