188532 2018-08-13 14:27:36 -0700 [MotionMark] Update Multiply test 2018-08-13 17:58:48 -0700 1 1 1 Unclassified WebKit Animations WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jonlee jonlee cdumez commit-queue dino ews-watchlist rniwa sabouhallawa simon.fraser webkit-bug-importer oldest_to_newest 1449770 0 jonlee 2018-08-13 14:27:36 -0700 Update Multiply test 1449771 1 webkit-bug-importer 2018-08-13 14:27:55 -0700 <rdar://problem/43252125> 1449772 2 webkit-bug-importer 2018-08-13 14:28:28 -0700 <rdar://problem/43252151> 1449787 3 347044 jonlee 2018-08-13 14:57:16 -0700 Created attachment 347044 Patch 1449829 4 347044 sabouhallawa 2018-08-13 16:14:33 -0700 Comment on attachment 347044 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=347044&action=review > PerformanceTests/MotionMark/tests/dom/resources/multiply.js:33 > + options.visibleCSS = [["opacity", 0, 1]]; I would suggest writing this as an structures: options.visibleCSS = [{ property: "visibility", initialValue: "hidden", animateValue: "visible" }]; > PerformanceTests/MotionMark/tests/master/resources/multiply.js:39 > + visibleCSS: [ > + ["visibility", "hidden", "visible"], > + ["opacity", 0, 1], > + ["display", "none", "block"] > + ], Ditto: visibleCSS: [ { property: "visibility", initialValue: "hidden", animateValue: "visible" }, { property: "opacity", initialValue: 0, animateValue: 1 }, { property: "display", initialValue: "none", animateValue: "block" } ], > PerformanceTests/MotionMark/tests/master/resources/multiply.js:45 > - var tileSize = Math.round(this.size.height / 25); > + var tileSize = Math.round(this.size.height / this.totalRows); Shouldn't we use the screen.height instead of the stage height to control how many tiles can be shown in the page? > PerformanceTests/MotionMark/tests/master/resources/multiply.js:96 > + tile.style[visibleCSS[0]] = visibleCSS[1]; tile.style[visibleCSS.property] = visibleCSS.initialValue; > PerformanceTests/MotionMark/tests/master/resources/multiply.js:130 > + tile.element.style[tile.visibleCSS[0]] = tile.visibleCSS[2]; tile.style[tile.visibleCSS.property] = tile.visibleCSS.animateValue; > PerformanceTests/MotionMark/tests/master/resources/multiply.js:141 > + tile.element.style[tile.visibleCSS[0]] = tile.visibleCSS[1]; tile.style[tile.visibleCSS.property] = tile.visibleCSS.initialValue; 1449854 5 347044 jonlee 2018-08-13 17:31:05 -0700 Comment on attachment 347044 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=347044&action=review >> PerformanceTests/MotionMark/tests/master/resources/multiply.js:39 >> + ], > > Ditto: > > visibleCSS: [ > { property: "visibility", initialValue: "hidden", animateValue: "visible" }, > { property: "opacity", initialValue: 0, animateValue: 1 }, > { property: "display", initialValue: "none", animateValue: "block" } > ], I'll do this update in a later patch. >> PerformanceTests/MotionMark/tests/master/resources/multiply.js:45 >> + var tileSize = Math.round(this.size.height / this.totalRows); > > Shouldn't we use the screen.height instead of the stage height to control how many tiles can be shown in the page? I don't think so. It does mean literally equal work in terms of point area among all device classes, but if we did this then desktop spaces would have high 10,000s max # of particles, which might be detrimental to getting high-enough scores given the # of renderers that need to be iterated. 1449860 6 347044 commit-queue 2018-08-13 17:58:46 -0700 Comment on attachment 347044 Patch Clearing flags on attachment: 347044 Committed r234832: <https://trac.webkit.org/changeset/234832> 1449861 7 commit-queue 2018-08-13 17:58:48 -0700 All reviewed patches have been landed. Closing bug. 347044 2018-08-13 14:57:16 -0700 2018-08-13 17:58:46 -0700 Patch bug-188532-20180813145715.patch text/plain 10154 jonlee U3VidmVyc2lvbiBSZXZpc2lvbjogMjM0NTgwCmRpZmYgLS1naXQgYS9QZXJmb3JtYW5jZVRlc3Rz L0NoYW5nZUxvZyBiL1BlcmZvcm1hbmNlVGVzdHMvQ2hhbmdlTG9nCmluZGV4IDE0YjdhMGQ5NWZm MDNhZWY4NGM5NDcyMGFhZjljYTFiZDBlZWFjZDYuLmM2ZDBlMWM0M2FmYzE0NGY5NjYwMTgwYjI3 YWI1YjJiZTAzODQzMTMgMTAwNjQ0Ci0tLSBhL1BlcmZvcm1hbmNlVGVzdHMvQ2hhbmdlTG9nCisr KyBiL1BlcmZvcm1hbmNlVGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTgtMDgt MTMgIEpvbiBMZWUgIDxqb25sZWVAYXBwbGUuY29tPgorCisgICAgICAgIFtNb3Rpb25NYXJrXSBV cGRhdGUgTXVsdGlwbHkgdGVzdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTg4NTMyCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80MzI1MjE1MT4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVcGRhdGUgTXVs dGlwbHkgdGVzdCB0byBoYXZlIGEgbGFyZ2VyIHVwcGVyIGxpbWl0IG9mIG51bWJlciBvZiBwYXJ0 aWNsZXMuIEN5Y2xlIHRocm91Z2ggdGhyZWUKKyAgICAgICAgZGlmZmVyZW50IHdheXMgb2YgaGlk aW5nIGFuIGVsZW1lbnQuIEFkZCBuZXcgTXVsdGlwbGUgc3VpdGUgdGhhdCBpc29sYXRlcyB0aG9z ZSBjb21wb25lbnRzIGZvcgorICAgICAgICBkZWJ1Z2dpbmcgcHVycG9zZXMuCisKKyAgICAgICAg KiBNb3Rpb25NYXJrL3Jlc291cmNlcy9kZWJ1Zy1ydW5uZXIvdGVzdHMuanM6CisgICAgICAgICog TW90aW9uTWFyay90ZXN0cy9kb20vbXVsdGlwbHkuaHRtbDogQWRkZWQuCisgICAgICAgICogTW90 aW9uTWFyay90ZXN0cy9kb20vcmVzb3VyY2VzL211bHRpcGx5LmpzOiBBZGRlZC4KKyAgICAgICAg KiBNb3Rpb25NYXJrL3Rlc3RzL21hc3Rlci9yZXNvdXJjZXMvbXVsdGlwbHkuanM6CisKIDIwMTgt MDgtMTMgIEpvbiBMZWUgIDxqb25sZWVAYXBwbGUuY29tPgogCiAgICAgICAgIFtNb3Rpb25NYXJr XSBVcGRhdGUgTGVhdmVzIHRlc3QKZGlmZiAtLWdpdCBhL1BlcmZvcm1hbmNlVGVzdHMvTW90aW9u TWFyay9yZXNvdXJjZXMvZGVidWctcnVubmVyL3Rlc3RzLmpzIGIvUGVyZm9ybWFuY2VUZXN0cy9N b3Rpb25NYXJrL3Jlc291cmNlcy9kZWJ1Zy1ydW5uZXIvdGVzdHMuanMKaW5kZXggMDNiMzYyNjhi NjhkYzUzZjk4N2ZlOTY1NDQ1ZjBlYTJkOTU4MGVkYS4uN2Q3MDFjOTQzNzUwYmMwMGJmZmRmNTMw MjFmODAzOWIyNDkyNzllZiAxMDA2NDQKLS0tIGEvUGVyZm9ybWFuY2VUZXN0cy9Nb3Rpb25NYXJr L3Jlc291cmNlcy9kZWJ1Zy1ydW5uZXIvdGVzdHMuanMKKysrIGIvUGVyZm9ybWFuY2VUZXN0cy9N b3Rpb25NYXJrL3Jlc291cmNlcy9kZWJ1Zy1ydW5uZXIvdGVzdHMuanMKQEAgLTI4MCw2ICsyODAs MjMgQEAgU3VpdGVzLnB1c2gobmV3IFN1aXRlKCJMZWF2ZXMgc3VpdGUiLAogICAgIF0KICkpOwog CitTdWl0ZXMucHVzaChuZXcgU3VpdGUoIk11bHRpcGx5IHN1aXRlIiwKKyAgICBbCisgICAgICAg IHsKKyAgICAgICAgICAgIHVybDogImRvbS9tdWx0aXBseS5odG1sP3N0eWxlPW9wYWNpdHkiLAor ICAgICAgICAgICAgbmFtZTogIk11bHRpcGx5OiBDU1Mgb3BhY2l0eSBvbmx5IgorICAgICAgICB9 LAorICAgICAgICB7CisgICAgICAgICAgICB1cmw6ICJkb20vbXVsdGlwbHkuaHRtbD9zdHlsZT1k aXNwbGF5IiwKKyAgICAgICAgICAgIG5hbWU6ICJNdWx0aXBseTogQ1NTIGRpc3BsYXkgb25seSIK KyAgICAgICAgfSwKKyAgICAgICAgeworICAgICAgICAgICAgdXJsOiAiZG9tL211bHRpcGx5Lmh0 bWw/c3R5bGU9dmlzaWJpbGl0eSIsCisgICAgICAgICAgICBuYW1lOiAiTXVsdGlwbHk6IENTUyB2 aXNpYmlsaXR5IG9ubHkiCisgICAgICAgIH0KKyAgICBdCispKTsKKwogU3VpdGVzLnB1c2gobmV3 IFN1aXRlKCJUZXh0IHN1aXRlIiwKICAgICBbCiAgICAgICAgIHsKZGlmZiAtLWdpdCBhL1BlcmZv cm1hbmNlVGVzdHMvTW90aW9uTWFyay90ZXN0cy9kb20vbXVsdGlwbHkuaHRtbCBiL1BlcmZvcm1h bmNlVGVzdHMvTW90aW9uTWFyay90ZXN0cy9kb20vbXVsdGlwbHkuaHRtbApuZXcgZmlsZSBtb2Rl IDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4y YTc5Njg5MjFjOTdhYTBhZWVhNjhhNDQzZmM0NzAyODc3ZmIyMGI1Ci0tLSAvZGV2L251bGwKKysr IGIvUGVyZm9ybWFuY2VUZXN0cy9Nb3Rpb25NYXJrL3Rlc3RzL2RvbS9tdWx0aXBseS5odG1sCkBA IC0wLDAgKzEsNzggQEAKKzwhLS0KKyAgQ29weXJpZ2h0IChDKSAyMDE4IEFwcGxlIEluYy4gQWxs IHJpZ2h0cyByZXNlcnZlZC4KKworICBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBh bmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyAgbW9kaWZpY2F0aW9uLCBhcmUgcGVy bWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCisgIGFyZSBtZXQ6 CisgIDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJv dmUgY29weXJpZ2h0CisgICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRo ZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyAgMi4gUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBm b3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAgICAgbm90aWNlLCB0aGlz IGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQor ICAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0 aGUgZGlzdHJpYnV0aW9uLgorCisgIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUg SU5DLiBBTkQgSVRTIENPTlRSSUJVVE9SUyBgYEFTIElTJycKKyAgQU5EIEFOWSBFWFBSRVNTIE9S IElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sCisgIFRI RSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBB IFBBUlRJQ1VMQVIKKyAgUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwg QVBQTEUgSU5DLiBPUiBJVFMgQ09OVFJJQlVUT1JTCisgIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVD VCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IKKyAgQ09OU0VR VUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgUFJPQ1VSRU1F TlQgT0YKKyAgU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEs IE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTCisgIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQg QU5EIE9OIEFOWSBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOCisgIENPTlRSQUNULCBT VFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJ U0UpCisgIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBPRiBUSElTIFNPRlRXQVJF LCBFVkVOIElGIEFEVklTRUQgT0YKKyAgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgor LS0+Cis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorPGhlYWQ+CisgICAgPG1ldGEgY2hhcnNldD0i dXRmLTgiPgorICAgIDxsaW5rIHJlbD0ic3R5bGVzaGVldCIgdHlwZT0idGV4dC9jc3MiIGhyZWY9 Ii4uL3Jlc291cmNlcy9zdGFnZS5jc3MiPgorICAgIDxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+CisK KyAgICAjc3RhZ2UgeworICAgICAgICBiYWNrZ3JvdW5kLWNvbG9yOiAjMjIyOworICAgIH0KKwor ICAgICNzdGFnZSBkaXYgeworICAgICAgICBwb3NpdGlvbjogYWJzb2x1dGU7CisgICAgfQorCisg ICAgI3N0YWdlIC5kaXYtMCB7CisgICAgICAgIGJvcmRlci10b3AtcmlnaHQtcmFkaXVzOiAxMDAl OworICAgIH0KKworICAgICNzdGFnZSAuZGl2LTEgeworICAgICAgICBib3JkZXItdG9wLWxlZnQt cmFkaXVzOiAxMDAlOworICAgIH0KKworICAgICNzdGFnZSAuZGl2LTIgeworICAgICAgICBib3Jk ZXItYm90dG9tLWxlZnQtcmFkaXVzOiAxMDAlOworICAgIH0KKworICAgICNzdGFnZSAuZGl2LTMg eworICAgICAgICBib3JkZXItYm90dG9tLXJpZ2h0LXJhZGl1czogMTAwJTsKKyAgICB9CisKKyAg ICAjc3RhZ2UgLmRpdi00IHsKKyAgICAgICAgYm9yZGVyLWJvdHRvbS1sZWZ0LXJhZGl1czogMTAw JTsKKyAgICAgICAgYm9yZGVyLXRvcC1yaWdodC1yYWRpdXM6IDEwMCU7CisgICAgfQorCisgICAg I3N0YWdlIC5kaXYtNSB7CisgICAgICAgIGJvcmRlci1ib3R0b20tcmlnaHQtcmFkaXVzOiAxMDAl OworICAgICAgICBib3JkZXItdG9wLWxlZnQtcmFkaXVzOiAxMDAlOworICAgIH0KKyAgICA8L3N0 eWxlPgorPC9oZWFkPgorPGJvZHk+CisgICAgPGRpdiBpZD0ic3RhZ2UiPgorICAgIDwvZGl2Pgor ICAgIDxzY3JpcHQgc3JjPSIuLi8uLi9yZXNvdXJjZXMvc3RyaW5ncy5qcyI+PC9zY3JpcHQ+Cisg ICAgPHNjcmlwdCBzcmM9Ii4uLy4uL3Jlc291cmNlcy9leHRlbnNpb25zLmpzIj48L3NjcmlwdD4K KyAgICA8c2NyaXB0IHNyYz0iLi4vLi4vcmVzb3VyY2VzL3N0YXRpc3RpY3MuanMiPjwvc2NyaXB0 PgorICAgIDxzY3JpcHQgc3JjPSIuLi9yZXNvdXJjZXMvbWF0aC5qcyI+PC9zY3JpcHQ+CisgICAg PHNjcmlwdCBzcmM9Ii4uL3Jlc291cmNlcy9tYWluLmpzIj48L3NjcmlwdD4KKyAgICA8c2NyaXB0 IHNyYz0iLi4vbWFzdGVyL3Jlc291cmNlcy9tdWx0aXBseS5qcyI+PC9zY3JpcHQ+CisgICAgPHNj cmlwdCBzcmM9InJlc291cmNlcy9tdWx0aXBseS5qcyI+PC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0 bWw+CmRpZmYgLS1naXQgYS9QZXJmb3JtYW5jZVRlc3RzL01vdGlvbk1hcmsvdGVzdHMvZG9tL3Jl c291cmNlcy9tdWx0aXBseS5qcyBiL1BlcmZvcm1hbmNlVGVzdHMvTW90aW9uTWFyay90ZXN0cy9k b20vcmVzb3VyY2VzL211bHRpcGx5LmpzCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjMyMmEzYjQ4N2FjZDQzYTI0YjE2 YTllNDBhMGU4NTU3YWE2NjUyNTIKLS0tIC9kZXYvbnVsbAorKysgYi9QZXJmb3JtYW5jZVRlc3Rz L01vdGlvbk1hcmsvdGVzdHMvZG9tL3Jlc291cmNlcy9tdWx0aXBseS5qcwpAQCAtMCwwICsxLDQ4 IEBACisvKgorICogQ29weXJpZ2h0IChDKSAyMDE4IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNl cnZlZC4KKyAqCisgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5 IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBw cm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucworICogYXJlIG1ldDoKKyAqIDEu IFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29w eXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9s bG93aW5nIGRpc2NsYWltZXIuCisgKiAyLiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0g bXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxp c3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQorICog ICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhl IGRpc3RyaWJ1dGlvbi4KKyAqCisgKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExF IElOQy4gQU5EIElUUyBDT05UUklCVVRPUlMgYGBBUyBJUycnCisgKiBBTkQgQU5ZIEVYUFJFU1Mg T1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywKKyAq IFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZP UiBBIFBBUlRJQ1VMQVIKKyAqIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNI QUxMIEFQUExFIElOQy4gT1IgSVRTIENPTlRSSUJVVE9SUworICogQkUgTElBQkxFIEZPUiBBTlkg RElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUgorICog Q09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgUFJP Q1VSRU1FTlQgT0YKKyAqIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNF LCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUworICogSU5URVJSVVBUSU9OKSBIT1dFVkVS IENBVVNFRCBBTkQgT04gQU5ZIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4KKyAqIENP TlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUIChJTkNMVURJTkcgTkVHTElHRU5DRSBP UiBPVEhFUldJU0UpCisgKiBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UgT0YgVEhJ UyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GCisgKiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VD SCBEQU1BR0UuCisgKi8KKyhmdW5jdGlvbigpIHsKKwordmFyIE11bHRpcGx5QmVuY2htYXJrID0g d2luZG93LmJlbmNobWFya0NsYXNzOwordmFyIE11bHRpcGx5RGVyaXZlZEJlbmNobWFyayA9IFV0 aWxpdGllcy5jcmVhdGVTdWJjbGFzcyhNdWx0aXBseUJlbmNobWFyaywKKyAgICBmdW5jdGlvbihv cHRpb25zKQorICAgIHsKKyAgICAgICAgc3dpdGNoIChvcHRpb25zWyJzdHlsZSJdKSB7CisgICAg ICAgIGNhc2UgIm9wYWNpdHkiOgorICAgICAgICAgICAgb3B0aW9ucy52aXNpYmxlQ1NTID0gW1si b3BhY2l0eSIsIDAsIDFdXTsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICBjYXNlICJkaXNw bGF5IjoKKyAgICAgICAgICAgIG9wdGlvbnMudmlzaWJsZUNTUyA9IFtbImRpc3BsYXkiLCAibm9u ZSIsICJibG9jayJdXTsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICBjYXNlICJ2aXNpYmls aXR5IjoKKyAgICAgICAgICAgIG9wdGlvbnMudmlzaWJsZUNTUyA9IFtbInZpc2liaWxpdHkiLCAi aGlkZGVuIiwgInZpc2libGUiXV07CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgfQorICAg ICAgICBNdWx0aXBseUJlbmNobWFyay5jYWxsKHRoaXMsIG9wdGlvbnMpOworICAgIH0KKyk7CisK K3dpbmRvdy5iZW5jaG1hcmtDbGFzcyA9IE11bHRpcGx5RGVyaXZlZEJlbmNobWFyazsKKworfSko KTsKXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCmRpZmYgLS1naXQgYS9QZXJmb3JtYW5jZVRl c3RzL01vdGlvbk1hcmsvdGVzdHMvbWFzdGVyL3Jlc291cmNlcy9tdWx0aXBseS5qcyBiL1BlcmZv cm1hbmNlVGVzdHMvTW90aW9uTWFyay90ZXN0cy9tYXN0ZXIvcmVzb3VyY2VzL211bHRpcGx5Lmpz CmluZGV4IDU0ZDZhNDU2MDY4ODVmM2Y1M2RlZGJjNGZkNGJlNGI1MDIzNjZmOTEuLmU1OGVhYTNi MmFiNGUxOGFkYzNjMzQzOWQ5NmFkMjIwNWQ5YjUxZTUgMTAwNjQ0Ci0tLSBhL1BlcmZvcm1hbmNl VGVzdHMvTW90aW9uTWFyay90ZXN0cy9tYXN0ZXIvcmVzb3VyY2VzL211bHRpcGx5LmpzCisrKyBi L1BlcmZvcm1hbmNlVGVzdHMvTW90aW9uTWFyay90ZXN0cy9tYXN0ZXIvcmVzb3VyY2VzL211bHRp cGx5LmpzCkBAIC0zMiwxMCArMzIsMTkgQEAgdmFyIE11bHRpcGx5U3RhZ2UgPSBVdGlsaXRpZXMu Y3JlYXRlU3ViY2xhc3MoU3RhZ2UsCiAgICAgICAgIHRoaXMuX29mZnNldEluZGV4ID0gMDsKICAg ICB9LCB7CiAKKyAgICB2aXNpYmxlQ1NTOiBbCisgICAgICAgIFsidmlzaWJpbGl0eSIsICJoaWRk ZW4iLCAidmlzaWJsZSJdLAorICAgICAgICBbIm9wYWNpdHkiLCAwLCAxXSwKKyAgICAgICAgWyJk aXNwbGF5IiwgIm5vbmUiLCAiYmxvY2siXQorICAgIF0sCisgICAgdG90YWxSb3dzOiA0NSwKKwog ICAgIGluaXRpYWxpemU6IGZ1bmN0aW9uKGJlbmNobWFyaywgb3B0aW9ucykKICAgICB7CiAgICAg ICAgIFN0YWdlLnByb3RvdHlwZS5pbml0aWFsaXplLmNhbGwodGhpcywgYmVuY2htYXJrLCBvcHRp b25zKTsKLSAgICAgICAgdmFyIHRpbGVTaXplID0gTWF0aC5yb3VuZCh0aGlzLnNpemUuaGVpZ2h0 IC8gMjUpOworICAgICAgICB2YXIgdGlsZVNpemUgPSBNYXRoLnJvdW5kKHRoaXMuc2l6ZS5oZWln aHQgLyB0aGlzLnRvdGFsUm93cyk7CisgICAgICAgIGlmIChvcHRpb25zLnZpc2libGVDU1MpCisg ICAgICAgICAgICB0aGlzLnZpc2libGVDU1MgPSBvcHRpb25zLnZpc2libGVDU1M7CiAKICAgICAg ICAgLy8gRmlsbCB0aGUgc2NlbmUgd2l0aCBlbGVtZW50cwogICAgICAgICB2YXIgeCA9IE1hdGgu cm91bmQoKHRoaXMuc2l6ZS53aWR0aCAtIHRpbGVTaXplKSAvIDIpOwpAQCAtODMsNyArOTIsOCBA QCB2YXIgTXVsdGlwbHlTdGFnZSA9IFV0aWxpdGllcy5jcmVhdGVTdWJjbGFzcyhTdGFnZSwKICAg ICAgICAgdGlsZS5zdHlsZS50b3AgPSB5ICsgJ3B4JzsKICAgICAgICAgdGlsZS5zdHlsZS53aWR0 aCA9IHRpbGVTaXplICsgJ3B4JzsKICAgICAgICAgdGlsZS5zdHlsZS5oZWlnaHQgPSB0aWxlU2l6 ZSArICdweCc7Ci0gICAgICAgIHRpbGUuc3R5bGUudmlzaWJpbGl0eSA9ICJoaWRkZW4iOworICAg ICAgICB2YXIgdmlzaWJsZUNTUyA9IHRoaXMudmlzaWJsZUNTU1t0aGlzLnRpbGVzLmxlbmd0aCAl IHRoaXMudmlzaWJsZUNTUy5sZW5ndGhdOworICAgICAgICB0aWxlLnN0eWxlW3Zpc2libGVDU1Nb MF1dID0gdmlzaWJsZUNTU1sxXTsKIAogICAgICAgICB2YXIgZGlzdGFuY2UgPSAxIC8gdGlsZVNp emUgKiB0aGlzLnNpemUubXVsdGlwbHkoMC41KS5zdWJ0cmFjdChuZXcgUG9pbnQoeCArIGhhbGZU aWxlU2l6ZSwgeSArIGhhbGZUaWxlU2l6ZSkpLmxlbmd0aCgpOwogICAgICAgICB0aGlzLnRpbGVz LnB1c2goewpAQCAtOTEsNyArMTAxLDggQEAgdmFyIE11bHRpcGx5U3RhZ2UgPSBVdGlsaXRpZXMu Y3JlYXRlU3ViY2xhc3MoU3RhZ2UsCiAgICAgICAgICAgICByb3RhdGU6IHJvdGF0ZURlZywKICAg ICAgICAgICAgIHN0ZXA6IE1hdGgubWF4KDMsIGRpc3RhbmNlIC8gMS41KSwKICAgICAgICAgICAg IGRpc3RhbmNlOiBkaXN0YW5jZSwKLSAgICAgICAgICAgIGFjdGl2ZTogZmFsc2UKKyAgICAgICAg ICAgIGFjdGl2ZTogZmFsc2UsCisgICAgICAgICAgICB2aXNpYmxlQ1NTOiB2aXNpYmxlQ1NTLAog ICAgICAgICB9KTsKICAgICB9LAogCkBAIC0xMTYsNyArMTI3LDcgQEAgdmFyIE11bHRpcGx5U3Rh Z2UgPSBVdGlsaXRpZXMuY3JlYXRlU3ViY2xhc3MoU3RhZ2UsCiAgICAgICAgIGZvciAodmFyIGkg PSAwOyBpIDwgdGhpcy5fb2Zmc2V0SW5kZXg7ICsraSkgewogICAgICAgICAgICAgdmFyIHRpbGUg PSB0aGlzLnRpbGVzW2ldOwogICAgICAgICAgICAgdGlsZS5hY3RpdmUgPSB0cnVlOwotICAgICAg ICAgICAgdGlsZS5lbGVtZW50LnN0eWxlLnZpc2liaWxpdHkgPSAiIjsKKyAgICAgICAgICAgIHRp bGUuZWxlbWVudC5zdHlsZVt0aWxlLnZpc2libGVDU1NbMF1dID0gdGlsZS52aXNpYmxlQ1NTWzJd OwogICAgICAgICAgICAgdGlsZS5yb3RhdGUgKz0gdGlsZS5zdGVwOwogICAgICAgICAgICAgdGls ZS5lbGVtZW50LnN0eWxlLnRyYW5zZm9ybSA9ICJyb3RhdGUoIiArIHRpbGUucm90YXRlICsgImRl ZykiOwogCkBAIC0xMjUsOCArMTM2LDkgQEAgdmFyIE11bHRpcGx5U3RhZ2UgPSBVdGlsaXRpZXMu Y3JlYXRlU3ViY2xhc3MoU3RhZ2UsCiAgICAgICAgIH0KIAogICAgICAgICBmb3IgKHZhciBpID0g dGhpcy5fb2Zmc2V0SW5kZXg7IGkgPCB0aGlzLnRpbGVzLmxlbmd0aCAmJiB0aGlzLnRpbGVzW2ld LmFjdGl2ZTsgKytpKSB7Ci0gICAgICAgICAgICB0aGlzLnRpbGVzW2ldLmFjdGl2ZSA9IGZhbHNl OwotICAgICAgICAgICAgdGhpcy50aWxlc1tpXS5lbGVtZW50LnN0eWxlLnZpc2liaWxpdHkgPSAi aGlkZGVuIjsKKyAgICAgICAgICAgIHZhciB0aWxlID0gdGhpcy50aWxlc1tpXTsKKyAgICAgICAg ICAgIHRpbGUuYWN0aXZlID0gZmFsc2U7CisgICAgICAgICAgICB0aWxlLmVsZW1lbnQuc3R5bGVb dGlsZS52aXNpYmxlQ1NTWzBdXSA9IHRpbGUudmlzaWJsZUNTU1sxXTsKICAgICAgICAgfQogICAg IH0KIH0pOwo=