From cfd2fd98629678c805f3386c7b0bba1a50a07669 Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Wed, 26 Aug 2020 14:49:16 +0200 Subject: [PATCH 1/5] add olm as a dependency --- package.json | 3 +++ yarn.lock | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/package.json b/package.json index 9786ce4b..2034f6b9 100644 --- a/package.json +++ b/package.json @@ -44,5 +44,8 @@ "rollup-plugin-cleanup": "^3.1.1", "serve-static": "^1.13.2", "xxhash": "^0.3.0" + }, + "dependencies": { + "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz" } } diff --git a/yarn.lock b/yarn.lock index 1f3e276b..9e556624 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1496,6 +1496,10 @@ object.assign@^4.1.0: has-symbols "^1.0.0" object-keys "^1.0.11" +"olm@https://packages.matrix.org/npm/olm/olm-3.1.4.tgz": + version "3.1.4" + resolved "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz#0f03128b7d3b2f614d2216409a1dfccca765fdb3" + on-finished@~2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" From 6edbec45eb46ac0d1e3d2481ca96ec00d3a0fd12 Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Wed, 26 Aug 2020 15:43:08 +0200 Subject: [PATCH 2/5] move olm into own lib directory --- lib/olm.js | 1 - lib/olm.wasm | 1 - lib/olm/olm.js | 1 + lib/olm/olm.wasm | 1 + lib/olm/olm_legacy.js | 1 + prototypes/olmtest.html | 4 ++-- 6 files changed, 5 insertions(+), 4 deletions(-) delete mode 120000 lib/olm.js delete mode 120000 lib/olm.wasm create mode 120000 lib/olm/olm.js create mode 120000 lib/olm/olm.wasm create mode 120000 lib/olm/olm_legacy.js diff --git a/lib/olm.js b/lib/olm.js deleted file mode 120000 index 9f16c77b..00000000 --- a/lib/olm.js +++ /dev/null @@ -1 +0,0 @@ -../node_modules/olm/olm.js \ No newline at end of file diff --git a/lib/olm.wasm b/lib/olm.wasm deleted file mode 120000 index 8d848e89..00000000 --- a/lib/olm.wasm +++ /dev/null @@ -1 +0,0 @@ -../node_modules/olm/olm.wasm \ No newline at end of file diff --git a/lib/olm/olm.js b/lib/olm/olm.js new file mode 120000 index 00000000..8bedac52 --- /dev/null +++ b/lib/olm/olm.js @@ -0,0 +1 @@ +../../node_modules/olm/olm.js \ No newline at end of file diff --git a/lib/olm/olm.wasm b/lib/olm/olm.wasm new file mode 120000 index 00000000..39293356 --- /dev/null +++ b/lib/olm/olm.wasm @@ -0,0 +1 @@ +../../node_modules/olm/olm.wasm \ No newline at end of file diff --git a/lib/olm/olm_legacy.js b/lib/olm/olm_legacy.js new file mode 120000 index 00000000..140fffb8 --- /dev/null +++ b/lib/olm/olm_legacy.js @@ -0,0 +1 @@ +../../node_modules/olm/olm_legacy.js \ No newline at end of file diff --git a/prototypes/olmtest.html b/prototypes/olmtest.html index 9a17a189..839fb5ee 100644 --- a/prototypes/olmtest.html +++ b/prototypes/olmtest.html @@ -12,13 +12,13 @@ - + + + + + + + From 08b12eace5e167bab59d0272eb6c6b688de5cb94 Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Wed, 26 Aug 2020 16:30:32 +0100 Subject: [PATCH 4/5] add a bit of metrics to ie11 olm prototype --- prototypes/olmtest-ie11.html | 74 ++++++++++++++++++++++++++---------- 1 file changed, 54 insertions(+), 20 deletions(-) diff --git a/prototypes/olmtest-ie11.html b/prototypes/olmtest-ie11.html index 316f5423..dec102ff 100644 --- a/prototypes/olmtest-ie11.html +++ b/prototypes/olmtest-ie11.html @@ -41,45 +41,79 @@ + 

+    
 
 
  

From 8098f9d646c22de76481cb259a82c31e6a6c1959 Mon Sep 17 00:00:00 2001
From: Bruno Windels 
Date: Wed, 26 Aug 2020 17:42:29 +0200
Subject: [PATCH 5/5] try faster imul that might break

---
 prototypes/olmtest-ie11.html | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/prototypes/olmtest-ie11.html b/prototypes/olmtest-ie11.html
index dec102ff..13d906b9 100644
--- a/prototypes/olmtest-ie11.html
+++ b/prototypes/olmtest-ie11.html
@@ -14,7 +14,7 @@