188530 2018-08-13 14:20:44 -0700 [MotionMark] Update Leaves test 2018-08-13 16:02:16 -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 1449766 0 jonlee 2018-08-13 14:20:44 -0700 Update Leaves test 1449767 1 webkit-bug-importer 2018-08-13 14:21:23 -0700 <rdar://problem/43251862> 1449768 2 347036 jonlee 2018-08-13 14:26:56 -0700 Created attachment 347036 Patch 1449773 3 347037 jonlee 2018-08-13 14:29:41 -0700 Created attachment 347037 Patch 1449824 4 347037 sabouhallawa 2018-08-13 15:50:44 -0700 Comment on attachment 347037 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=347037&action=review > PerformanceTests/MotionMark/tests/master/resources/leaves.js:85 > + this.element.style.opacity = this._opacity; The use of this._opacity is be guarded by this.usesOpacity unless this._opacity is always initialized with the default value. But I do not see that. 1449826 5 347037 jonlee 2018-08-13 15:56:55 -0700 Comment on attachment 347037 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=347037&action=review >> PerformanceTests/MotionMark/tests/master/resources/leaves.js:85 >> + this.element.style.opacity = this._opacity; > > The use of this._opacity is be guarded by this.usesOpacity unless this._opacity is always initialized with the default value. But I do not see that. Good point. It turns out that all of the subclasses do override the method. I'll fix this in the next version. 1449827 6 347037 commit-queue 2018-08-13 16:02:14 -0700 Comment on attachment 347037 Patch Clearing flags on attachment: 347037 Committed r234823: <https://trac.webkit.org/changeset/234823> 1449828 7 commit-queue 2018-08-13 16:02:16 -0700 All reviewed patches have been landed. Closing bug. 347036 2018-08-13 14:26:56 -0700 2018-08-13 14:29:37 -0700 Patch bug-188530-20180813142655.patch text/plain 10655 jonlee U3VidmVyc2lvbiBSZXZpc2lvbjogMjM0NTgwCmRpZmYgLS1naXQgYS9QZXJmb3JtYW5jZVRlc3Rz L0NoYW5nZUxvZyBiL1BlcmZvcm1hbmNlVGVzdHMvQ2hhbmdlTG9nCmluZGV4IGYyMGU0ZTI5YjVi YzgyMmNiZDBiYThhMjlmODg4ODc4MTk1OTk4MmUuLjE0YjdhMGQ5NWZmMDNhZWY4NGM5NDcyMGFh ZjljYTFiZDBlZWFjZDYgMTAwNjQ0Ci0tLSBhL1BlcmZvcm1hbmNlVGVzdHMvQ2hhbmdlTG9nCisr KyBiL1BlcmZvcm1hbmNlVGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTgtMDgt MTMgIEpvbiBMZWUgIDxqb25sZWVAYXBwbGUuY29tPgorCisgICAgICAgIFtNb3Rpb25NYXJrXSBV cGRhdGUgTGVhdmVzIHRlc3QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE4ODUzMAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDMyNTE4NjI+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXBkYXRlIExlYXZl cyB0ZXN0IHRvIGluY2x1ZGUgb3BhY2l0eSBhbmQgc2NhbGUuIEFkZCBuZXcgTGVhdmVzIHN1aXRl IHRoYXQgaXNvbGF0ZSB0aG9zZSBjb21wb25lbnRzCisgICAgICAgIGZvciBkZWJ1Z2dpbmcgcHVy cG9zZXMuCisKKyAgICAgICAgKiBNb3Rpb25NYXJrL3Jlc291cmNlcy9kZWJ1Zy1ydW5uZXIvdGVz dHMuanM6CisgICAgICAgICogTW90aW9uTWFyay90ZXN0cy9kb20vbGVhdmVzLmh0bWw6CisgICAg ICAgICogTW90aW9uTWFyay90ZXN0cy9kb20vcmVzb3VyY2VzL2xlYXZlcy5qczoKKyAgICAgICAg KiBNb3Rpb25NYXJrL3Rlc3RzL21hc3Rlci9yZXNvdXJjZXMvbGVhdmVzLmpzOgorCiAyMDE4LTA3 LTI2ICBBbmR5IFZhbldhZ29uZXIgIDxhbmR5QHZhbndhZ29uZXIuZmFtaWx5PgogCiAgICAgICAg IFtJTlRMXSBSZW1vdmUgSU5UTCBzdWItZmVhdHVyZSBjb21waWxlIGZsYWdzCmRpZmYgLS1naXQg YS9QZXJmb3JtYW5jZVRlc3RzL01vdGlvbk1hcmsvcmVzb3VyY2VzL2RlYnVnLXJ1bm5lci90ZXN0 cy5qcyBiL1BlcmZvcm1hbmNlVGVzdHMvTW90aW9uTWFyay9yZXNvdXJjZXMvZGVidWctcnVubmVy L3Rlc3RzLmpzCmluZGV4IGYxNzgzMTQxOGY4M2ZjYjIxZGM3NjNkZjE5NDgxNGRmMDhkNzdjYTIu LjAzYjM2MjY4YjY4ZGM1M2Y5ODdmZTk2NTQ0NWYwZWEyZDk1ODBlZGEgMTAwNjQ0Ci0tLSBhL1Bl cmZvcm1hbmNlVGVzdHMvTW90aW9uTWFyay9yZXNvdXJjZXMvZGVidWctcnVubmVyL3Rlc3RzLmpz CisrKyBiL1BlcmZvcm1hbmNlVGVzdHMvTW90aW9uTWFyay9yZXNvdXJjZXMvZGVidWctcnVubmVy L3Rlc3RzLmpzCkBAIC0xOTAsMTAgKzE5MCw2IEBAIFN1aXRlcy5wdXNoKG5ldyBTdWl0ZSgiSFRN TCBzdWl0ZSIsCiAgICAgICAgICAgICB1cmw6ICJib3VuY2luZy1wYXJ0aWNsZXMvYm91bmNpbmct dGFnZ2VkLWltYWdlcy5odG1sP3BhcnRpY2xlV2lkdGg9MTAwJnBhcnRpY2xlSGVpZ2h0PTEwMCIs CiAgICAgICAgICAgICBuYW1lOiAiQ1NTIGJvdW5jaW5nIHRhZ2dlZCBpbWFnZXMiCiAgICAgICAg IH0sCi0gICAgICAgIHsKLSAgICAgICAgICAgIHVybDogImRvbS9sZWF2ZXMuaHRtbCIsCi0gICAg ICAgICAgICBuYW1lOiAiTGVhdmVzIDIuMCIKLSAgICAgICAgfSwKICAgICAgICAgewogICAgICAg ICAgICAgdXJsOiAiZG9tL2ZvY3VzLmh0bWwiLAogICAgICAgICAgICAgbmFtZTogIkZvY3VzIDIu MCIKQEAgLTI2Nyw2ICsyNjMsMjMgQEAgU3VpdGVzLnB1c2gobmV3IFN1aXRlKCJTVkcgc3VpdGUi LAogICAgIF0KICkpOwogCitTdWl0ZXMucHVzaChuZXcgU3VpdGUoIkxlYXZlcyBzdWl0ZSIsCisg ICAgWworICAgICAgICB7CisgICAgICAgICAgICB1cmw6ICJkb20vbGVhdmVzLmh0bWw/c3R5bGU9 c2ltcGxlIiwKKyAgICAgICAgICAgIG5hbWU6ICJUcmFuc2xhdGUtb25seSBMZWF2ZXMiCisgICAg ICAgIH0sCisgICAgICAgIHsKKyAgICAgICAgICAgIHVybDogImRvbS9sZWF2ZXMuaHRtbD9zdHls ZT1zY2FsZSIsCisgICAgICAgICAgICBuYW1lOiAiVHJhbnNsYXRlICsgU2NhbGUgTGVhdmVzIgor ICAgICAgICB9LAorICAgICAgICB7CisgICAgICAgICAgICB1cmw6ICJkb20vbGVhdmVzLmh0bWw/ c3R5bGU9b3BhY2l0eSIsCisgICAgICAgICAgICBuYW1lOiAiVHJhbnNsYXRlICsgT3BhY2l0eSBM ZWF2ZXMiCisgICAgICAgIH0KKyAgICBdCispKTsKKwogU3VpdGVzLnB1c2gobmV3IFN1aXRlKCJU ZXh0IHN1aXRlIiwKICAgICBbCiAgICAgICAgIHsKZGlmZiAtLWdpdCBhL1BlcmZvcm1hbmNlVGVz dHMvTW90aW9uTWFyay90ZXN0cy9kb20vbGVhdmVzLmh0bWwgYi9QZXJmb3JtYW5jZVRlc3RzL01v dGlvbk1hcmsvdGVzdHMvZG9tL2xlYXZlcy5odG1sCmluZGV4IDhkYmVmY2UyYjBlOGM2MDU2ZThi YjIwNjkyN2FiODMzZmNmNWMxZjcuLmMyZmRiNjgxYzQ3N2I0OTIyNTI3NGU4NTg0MTBhYmE4ZTMw YmJjZjIgMTAwNjQ0Ci0tLSBhL1BlcmZvcm1hbmNlVGVzdHMvTW90aW9uTWFyay90ZXN0cy9kb20v bGVhdmVzLmh0bWwKKysrIGIvUGVyZm9ybWFuY2VUZXN0cy9Nb3Rpb25NYXJrL3Rlc3RzL2RvbS9s ZWF2ZXMuaHRtbApAQCAtMjksNyArMjksNyBAQAogICAgIDxsaW5rIHJlbD0ic3R5bGVzaGVldCIg dHlwZT0idGV4dC9jc3MiIGhyZWY9Ii4uL3Jlc291cmNlcy9zdGFnZS5jc3MiPgogICAgIDxzdHls ZT4KICAgICAgICAgI3N0YWdlIHsKLSAgICAgICAgICAgIGJhY2tncm91bmQtY29sb3I6ICMyMzI4 MkI7CisgICAgICAgICAgICBiYWNrZ3JvdW5kLWNvbG9yOiAjMzMyODJCOwogICAgICAgICB9CiAg ICAgICAgICNzdGFnZSBpbWcgewogICAgICAgICAgICAgcG9zaXRpb246IGFic29sdXRlOwpkaWZm IC0tZ2l0IGEvUGVyZm9ybWFuY2VUZXN0cy9Nb3Rpb25NYXJrL3Rlc3RzL2RvbS9yZXNvdXJjZXMv bGVhdmVzLmpzIGIvUGVyZm9ybWFuY2VUZXN0cy9Nb3Rpb25NYXJrL3Rlc3RzL2RvbS9yZXNvdXJj ZXMvbGVhdmVzLmpzCmluZGV4IDhjMTZkZWNlYWIyMWJmOTRjMDg0MjAyODk1ZjY5ZmJmNTY0YmNh NmUuLmEwYmI2MzM2YTYwODYxZmZmYjM1Yjc5MDEzMWViZmMxM2FmNmQyYzAgMTAwNjQ0Ci0tLSBh L1BlcmZvcm1hbmNlVGVzdHMvTW90aW9uTWFyay90ZXN0cy9kb20vcmVzb3VyY2VzL2xlYXZlcy5q cworKysgYi9QZXJmb3JtYW5jZVRlc3RzL01vdGlvbk1hcmsvdGVzdHMvZG9tL3Jlc291cmNlcy9s ZWF2ZXMuanMKQEAgLTEsNSArMSw1IEBACiAvKgotICogQ29weXJpZ2h0IChDKSAyMDE1LTIwMTcg QXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAyMDE1LTIw MTggQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoKICAqIFJlZGlzdHJpYnV0aW9u IGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogICog bW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBj b25kaXRpb25zCkBAIC0yMiw0NyArMjIsNTAgQEAKICAqIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQg T0YgVEhFIFVTRSBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YKICAqIFRIRSBQ T1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KICAqLwotTGVhZiA9IFV0aWxpdGllcy5jcmVhdGVT dWJjbGFzcyhQYXJ0aWNsZSwKKyhmdW5jdGlvbigpIHsKKwordmFyIFN1cGVyTGVhZiA9IHdpbmRv dy5MZWFmOwordmFyIFNpbXBsZUxlYWYgPSBVdGlsaXRpZXMuY3JlYXRlU3ViY2xhc3MoU3VwZXJM ZWFmLAogICAgIGZ1bmN0aW9uKHN0YWdlKQogICAgIHsKLSAgICAgICAgdGhpcy5lbGVtZW50ID0g ZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiaW1nIik7Ci0gICAgICAgIHRoaXMuZWxlbWVudC5zZXRB dHRyaWJ1dGUoInNyYyIsIFN0YWdlLnJhbmRvbUVsZW1lbnRJbkFycmF5KHN0YWdlLmltYWdlcyku c3JjKTsKLSAgICAgICAgc3RhZ2UuZWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLmVsZW1lbnQpOwor ICAgICAgICBTdXBlckxlYWYuY2FsbCh0aGlzLCBzdGFnZSk7CisgICAgfSwgeworCisgICAgc2l6 ZU1pbmltdW06IDI1LAorICAgIHNpemVSYW5nZTogMCwKKyAgICB1c2VzT3BhY2l0eTogZmFsc2Us CisKKyAgICBtb3ZlOiBmdW5jdGlvbigpCisgICAgeworICAgICAgICB0aGlzLmVsZW1lbnQuc3R5 bGUudHJhbnNmb3JtID0gInRyYW5zbGF0ZSgiICsgdGhpcy5fcG9zaXRpb24ueCArICJweCwgIiAr IHRoaXMuX3Bvc2l0aW9uLnkgKyAicHgpIiArIHRoaXMucm90YXRlci5yb3RhdGVaKCk7CisgICAg fQorfSk7CiAKLSAgICAgICAgUGFydGljbGUuY2FsbCh0aGlzLCBzdGFnZSk7Cit2YXIgU2NhbGVM ZWFmID0gVXRpbGl0aWVzLmNyZWF0ZVN1YmNsYXNzKFN1cGVyTGVhZiwKKyAgICBmdW5jdGlvbihz dGFnZSkKKyAgICB7CisgICAgICAgIFN1cGVyTGVhZi5jYWxsKHRoaXMsIHN0YWdlKTsKICAgICB9 LCB7CiAKICAgICBzaXplTWluaW11bTogMjAsCi0gICAgc2l6ZVJhbmdlOiA0MCwKKyAgICBzaXpl UmFuZ2U6IDMwLAorICAgIHVzZXNPcGFjaXR5OiBmYWxzZSwKIAotICAgIHJlc2V0OiBmdW5jdGlv bigpCisgICAgbW92ZTogZnVuY3Rpb24oKQogICAgIHsKLSAgICAgICAgUGFydGljbGUucHJvdG90 eXBlLnJlc2V0LmNhbGwodGhpcyk7Ci0gICAgICAgIHRoaXMuZWxlbWVudC5zdHlsZS53aWR0aCA9 IHRoaXMuc2l6ZS54ICsgInB4IjsKLSAgICAgICAgdGhpcy5lbGVtZW50LnN0eWxlLmhlaWdodCA9 IHRoaXMuc2l6ZS55ICsgInB4IjsKLSAgICAgICAgdGhpcy5fb3BhY2l0eSA9IC4wMTsKLSAgICAg ICAgdGhpcy5fb3BhY2l0eVJhdGUgPSAwLjAyICogU3RhZ2UucmFuZG9tKDEsIDYpOwotICAgICAg ICB0aGlzLl9wb3NpdGlvbiA9IG5ldyBQb2ludChTdGFnZS5yYW5kb20oMCwgdGhpcy5tYXhQb3Np dGlvbi54KSwgU3RhZ2UucmFuZG9tKC10aGlzLnNpemUuaGVpZ2h0LCB0aGlzLm1heFBvc2l0aW9u LnkpKTsKLSAgICAgICAgdGhpcy5fdmVsb2NpdHkgPSBuZXcgUG9pbnQoU3RhZ2UucmFuZG9tKC02 LCAtMiksIC4xICogdGhpcy5zaXplLnkgKyBTdGFnZS5yYW5kb20oLTEsIDEpKTsKLSAgICB9LAor ICAgICAgICB0aGlzLmVsZW1lbnQuc3R5bGUudHJhbnNmb3JtID0gInRyYW5zbGF0ZSgiICsgdGhp cy5fcG9zaXRpb24ueCArICJweCwgIiArIHRoaXMuX3Bvc2l0aW9uLnkgKyAicHgpIiArIHRoaXMu cm90YXRlci5yb3RhdGVaKCk7CisgICAgfQorfSk7CiAKLSAgICBhbmltYXRlOiBmdW5jdGlvbih0 aW1lRGVsdGEpCit2YXIgT3BhY2l0eUxlYWYgPSBVdGlsaXRpZXMuY3JlYXRlU3ViY2xhc3MoU3Vw ZXJMZWFmLAorICAgIGZ1bmN0aW9uKHN0YWdlKQogICAgIHsKLSAgICAgICAgdGhpcy5yb3RhdGVy Lm5leHQodGltZURlbHRhKTsKLQotICAgICAgICB0aGlzLl9wb3NpdGlvbi54ICs9IHRoaXMuX3Zl bG9jaXR5LnggKyA4ICogdGhpcy5zdGFnZS5mb2N1c1g7Ci0gICAgICAgIHRoaXMuX3Bvc2l0aW9u LnkgKz0gdGhpcy5fdmVsb2NpdHkueTsKLSAgICAgICAgdGhpcy5fb3BhY2l0eSArPSB0aGlzLl9v cGFjaXR5UmF0ZTsKLSAgICAgICAgaWYgKHRoaXMuX29wYWNpdHkgPiAxKSB7Ci0gICAgICAgICAg ICB0aGlzLl9vcGFjaXR5ID0gMTsKLSAgICAgICAgICAgIHRoaXMuX29wYWNpdHlSYXRlICo9IC0x OwotICAgICAgICB9IGVsc2UgaWYgKHRoaXMuX29wYWNpdHkgPCAwIHx8IHRoaXMuX3Bvc2l0aW9u LnkgPiB0aGlzLnN0YWdlLnNpemUuaGVpZ2h0KQotICAgICAgICAgICAgdGhpcy5yZXNldCgpOwor ICAgICAgICBTdXBlckxlYWYuY2FsbCh0aGlzLCBzdGFnZSk7CisgICAgfSwgewogCi0gICAgICAg IGlmICh0aGlzLl9wb3NpdGlvbi54IDwgLXRoaXMuc2l6ZS53aWR0aCB8fCB0aGlzLl9wb3NpdGlv bi54ID4gdGhpcy5zdGFnZS5zaXplLndpZHRoKQotICAgICAgICAgICAgdGhpcy5fcG9zaXRpb24u eCA9IHRoaXMuX3Bvc2l0aW9uLnggLSBNYXRoLnNpZ24odGhpcy5fcG9zaXRpb24ueCkgKiAodGhp cy5zaXplLndpZHRoICsgdGhpcy5zdGFnZS5zaXplLndpZHRoKTsKLSAgICAgICAgdGhpcy5tb3Zl KCk7Ci0gICAgfSwKKyAgICBzaXplTWluaW11bTogMjUsCisgICAgc2l6ZVJhbmdlOiAwLAorICAg IHVzZXNPcGFjaXR5OiB0cnVlLAogCiAgICAgbW92ZTogZnVuY3Rpb24oKQogICAgIHsKQEAgLTcw LDMgKzczLDI3IEBAIExlYWYgPSBVdGlsaXRpZXMuY3JlYXRlU3ViY2xhc3MoUGFydGljbGUsCiAg ICAgICAgIHRoaXMuZWxlbWVudC5zdHlsZS5vcGFjaXR5ID0gdGhpcy5fb3BhY2l0eTsKICAgICB9 CiB9KTsKKworCit2YXIgTGVhdmVzQmVuY2htYXJrID0gd2luZG93LmJlbmNobWFya0NsYXNzOwor dmFyIExlYXZlc0Rlcml2ZWRCZW5jaG1hcmsgPSBVdGlsaXRpZXMuY3JlYXRlU3ViY2xhc3MoTGVh dmVzQmVuY2htYXJrLAorICAgIGZ1bmN0aW9uKG9wdGlvbnMpCisgICAgeworICAgICAgICBzd2l0 Y2ggKG9wdGlvbnNbInN0eWxlIl0pIHsKKyAgICAgICAgY2FzZSAic2ltcGxlIjoKKyAgICAgICAg ICAgIHdpbmRvdy5MZWFmID0gU2ltcGxlTGVhZjsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAg ICBjYXNlICJzY2FsZSI6CisgICAgICAgICAgICB3aW5kb3cuTGVhZiA9IFNjYWxlTGVhZjsKKyAg ICAgICAgICAgIGJyZWFrOworICAgICAgICBjYXNlICJvcGFjaXR5IjoKKyAgICAgICAgICAgIHdp bmRvdy5MZWFmID0gT3BhY2l0eUxlYWY7CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgfQor ICAgICAgICBMZWF2ZXNCZW5jaG1hcmsuY2FsbCh0aGlzLCBvcHRpb25zKTsKKyAgICB9CispOwor Cit3aW5kb3cuYmVuY2htYXJrQ2xhc3MgPSBMZWF2ZXNEZXJpdmVkQmVuY2htYXJrOworCit9KSgp OwpkaWZmIC0tZ2l0IGEvUGVyZm9ybWFuY2VUZXN0cy9Nb3Rpb25NYXJrL3Rlc3RzL21hc3Rlci9y ZXNvdXJjZXMvbGVhdmVzLmpzIGIvUGVyZm9ybWFuY2VUZXN0cy9Nb3Rpb25NYXJrL3Rlc3RzL21h c3Rlci9yZXNvdXJjZXMvbGVhdmVzLmpzCmluZGV4IGZlZmRhMTQ5YmY0YjRhMGU5YzFjNGEwMjVj YjQ3NjdjMDdlMjU3ZTYuLjUzMTdlNTBiNTEzYjIzNDk0MGIyOTRkZGZlNDczYzAwNzBlOTg1ZDkg MTAwNjQ0Ci0tLSBhL1BlcmZvcm1hbmNlVGVzdHMvTW90aW9uTWFyay90ZXN0cy9tYXN0ZXIvcmVz b3VyY2VzL2xlYXZlcy5qcworKysgYi9QZXJmb3JtYW5jZVRlc3RzL01vdGlvbk1hcmsvdGVzdHMv bWFzdGVyL3Jlc291cmNlcy9sZWF2ZXMuanMKQEAgLTEsNSArMSw1IEBACiAvKgotICogQ29weXJp Z2h0IChDKSAyMDE1LTIwMTcgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29w eXJpZ2h0IChDKSAyMDE1LTIwMTggQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoK ICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdp dGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRo YXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC0yMiwyNiArMjIsMzQgQEAKICAqIEFSSVNJ TkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFE VklTRUQgT0YKICAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KICAqLwotTGVhZiA9 IFV0aWxpdGllcy5jcmVhdGVTdWJjbGFzcyhQYXJ0aWNsZSwKKyhmdW5jdGlvbigpIHsKKword2lu ZG93LkxlYWYgPSBVdGlsaXRpZXMuY3JlYXRlU3ViY2xhc3MoUGFydGljbGUsCiAgICAgZnVuY3Rp b24oc3RhZ2UpCiAgICAgewogICAgICAgICB0aGlzLmVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVF bGVtZW50KCJpbWciKTsKICAgICAgICAgdGhpcy5lbGVtZW50LnNldEF0dHJpYnV0ZSgic3JjIiwg U3RhZ2UucmFuZG9tRWxlbWVudEluQXJyYXkoc3RhZ2UuaW1hZ2VzKS5zcmMpOwotICAgICAgICB2 YXIgc2l6ZVN0cmluZyA9IHRoaXMuc2l6ZU1pbmltdW0gKyAicHgiOwotICAgICAgICB0aGlzLmVs ZW1lbnQuc3R5bGUud2lkdGggPSBzaXplU3RyaW5nOwotICAgICAgICB0aGlzLmVsZW1lbnQuc3R5 bGUuaGVpZ2h0ID0gc2l6ZVN0cmluZzsKICAgICAgICAgc3RhZ2UuZWxlbWVudC5hcHBlbmRDaGls ZCh0aGlzLmVsZW1lbnQpOwogCiAgICAgICAgIFBhcnRpY2xlLmNhbGwodGhpcywgc3RhZ2UpOwog ICAgIH0sIHsKIAotICAgIHNpemVNaW5pbXVtOiAyNSwKLSAgICBzaXplUmFuZ2U6IDAsCisgICAg c2l6ZU1pbmltdW06IDIwLAorICAgIHNpemVSYW5nZTogMzAsCisgICAgdXNlc09wYWNpdHk6IHRy dWUsCiAKICAgICByZXNldDogZnVuY3Rpb24oKQogICAgIHsKICAgICAgICAgUGFydGljbGUucHJv dG90eXBlLnJlc2V0LmNhbGwodGhpcyk7Ci0gICAgICAgIHRoaXMuX2xpZmUgPSBTdGFnZS5yYW5k b21JbnQoMjAsIDEwMCk7CisgICAgICAgIHRoaXMuZWxlbWVudC5zdHlsZS53aWR0aCA9IHRoaXMu c2l6ZS54ICsgInB4IjsKKyAgICAgICAgdGhpcy5lbGVtZW50LnN0eWxlLmhlaWdodCA9IHRoaXMu c2l6ZS55ICsgInB4IjsKKworICAgICAgICBpZiAodGhpcy51c2VzT3BhY2l0eSkgeworICAgICAg ICAgICAgdGhpcy5fb3BhY2l0eSA9IC4wMTsKKyAgICAgICAgICAgIHRoaXMuX29wYWNpdHlSYXRl ID0gMC4wMiAqIFN0YWdlLnJhbmRvbSgxLCA2KTsKKyAgICAgICAgfSBlbHNlCisgICAgICAgICAg ICB0aGlzLl9saWZlID0gU3RhZ2UucmFuZG9tSW50KDIwLCAxMDApOworCiAgICAgICAgIHRoaXMu X3Bvc2l0aW9uID0gbmV3IFBvaW50KFN0YWdlLnJhbmRvbSgwLCB0aGlzLm1heFBvc2l0aW9uLngp LCBTdGFnZS5yYW5kb20oLXRoaXMuc2l6ZS5oZWlnaHQsIHRoaXMubWF4UG9zaXRpb24ueSkpOwog ICAgICAgICB0aGlzLl92ZWxvY2l0eSA9IG5ldyBQb2ludChTdGFnZS5yYW5kb20oLTYsIC0yKSwg LjEgKiB0aGlzLnNpemUueSArIFN0YWdlLnJhbmRvbSgtMSwgMSkpOwogICAgIH0sCkBAIC01Myw5 ICs2MSwxOCBAQCBMZWFmID0gVXRpbGl0aWVzLmNyZWF0ZVN1YmNsYXNzKFBhcnRpY2xlLAogICAg ICAgICB0aGlzLl9wb3NpdGlvbi54ICs9IHRoaXMuX3ZlbG9jaXR5LnggKyA4ICogdGhpcy5zdGFn ZS5mb2N1c1g7CiAgICAgICAgIHRoaXMuX3Bvc2l0aW9uLnkgKz0gdGhpcy5fdmVsb2NpdHkueTsK IAotICAgICAgICB0aGlzLl9saWZlLS07Ci0gICAgICAgIGlmICghdGhpcy5fbGlmZSB8fCB0aGlz Ll9wb3NpdGlvbi55ID4gdGhpcy5zdGFnZS5zaXplLmhlaWdodCkKLSAgICAgICAgICAgIHRoaXMu cmVzZXQoKTsKKyAgICAgICAgaWYgKHRoaXMudXNlc09wYWNpdHkpIHsKKyAgICAgICAgICAgIHRo aXMuX29wYWNpdHkgKz0gdGhpcy5fb3BhY2l0eVJhdGU7CisgICAgICAgICAgICBpZiAodGhpcy5f b3BhY2l0eSA+IDEpIHsKKyAgICAgICAgICAgICAgICB0aGlzLl9vcGFjaXR5ID0gMTsKKyAgICAg ICAgICAgICAgICB0aGlzLl9vcGFjaXR5UmF0ZSAqPSAtMTsKKyAgICAgICAgICAgIH0gZWxzZSBp ZiAodGhpcy5fb3BhY2l0eSA8IDAgfHwgdGhpcy5fcG9zaXRpb24ueSA+IHRoaXMuc3RhZ2Uuc2l6 ZS5oZWlnaHQpCisgICAgICAgICAgICAgICAgdGhpcy5yZXNldCgpOworICAgICAgICB9IGVsc2Ug eworICAgICAgICAgICAgdGhpcy5fbGlmZS0tOworICAgICAgICAgICAgaWYgKCF0aGlzLl9saWZl IHx8IHRoaXMuX3Bvc2l0aW9uLnkgPiB0aGlzLnN0YWdlLnNpemUuaGVpZ2h0KQorICAgICAgICAg ICAgICAgIHRoaXMucmVzZXQoKTsKKyAgICAgICAgfQogCiAgICAgICAgIGlmICh0aGlzLl9wb3Np dGlvbi54IDwgLXRoaXMuc2l6ZS53aWR0aCB8fCB0aGlzLl9wb3NpdGlvbi54ID4gdGhpcy5zdGFn ZS5zaXplLndpZHRoKQogICAgICAgICAgICAgdGhpcy5fcG9zaXRpb24ueCA9IHRoaXMuX3Bvc2l0 aW9uLnggLSBNYXRoLnNpZ24odGhpcy5fcG9zaXRpb24ueCkgKiAodGhpcy5zaXplLndpZHRoICsg dGhpcy5zdGFnZS5zaXplLndpZHRoKTsKQEAgLTY1LDYgKzgyLDcgQEAgTGVhZiA9IFV0aWxpdGll cy5jcmVhdGVTdWJjbGFzcyhQYXJ0aWNsZSwKICAgICBtb3ZlOiBmdW5jdGlvbigpCiAgICAgewog ICAgICAgICB0aGlzLmVsZW1lbnQuc3R5bGUudHJhbnNmb3JtID0gInRyYW5zbGF0ZSgiICsgdGhp cy5fcG9zaXRpb24ueCArICJweCwgIiArIHRoaXMuX3Bvc2l0aW9uLnkgKyAicHgpIiArIHRoaXMu cm90YXRlci5yb3RhdGVaKCk7CisgICAgICAgIHRoaXMuZWxlbWVudC5zdHlsZS5vcGFjaXR5ID0g dGhpcy5fb3BhY2l0eTsKICAgICB9CiB9KTsKIApAQCAtMTQzLDcgKzE2MSw3IEBAIFV0aWxpdGll cy5leHRlbmRPYmplY3QoUGFydGljbGVzU3RhZ2UucHJvdG90eXBlLCB7CiAgICAgfQogfSk7CiAK LUxlYXZlc0JlbmNobWFyayA9IFV0aWxpdGllcy5jcmVhdGVTdWJjbGFzcyhCZW5jaG1hcmssCit2 YXIgTGVhdmVzQmVuY2htYXJrID0gVXRpbGl0aWVzLmNyZWF0ZVN1YmNsYXNzKEJlbmNobWFyaywK ICAgICBmdW5jdGlvbihvcHRpb25zKQogICAgIHsKICAgICAgICAgQmVuY2htYXJrLmNhbGwodGhp cywgbmV3IFBhcnRpY2xlc1N0YWdlKCksIG9wdGlvbnMpOwpAQCAtMTU3LDMgKzE3NSw1IEBAIExl YXZlc0JlbmNobWFyayA9IFV0aWxpdGllcy5jcmVhdGVTdWJjbGFzcyhCZW5jaG1hcmssCiB9KTsK IAogd2luZG93LmJlbmNobWFya0NsYXNzID0gTGVhdmVzQmVuY2htYXJrOworCit9KSgpOwo= 347037 2018-08-13 14:29:41 -0700 2018-08-13 16:02:14 -0700 Patch bug-188530-20180813142941.patch text/plain 10937 jonlee U3VidmVyc2lvbiBSZXZpc2lvbjogMjM0NTgwCmRpZmYgLS1naXQgYS9QZXJmb3JtYW5jZVRlc3Rz L0NoYW5nZUxvZyBiL1BlcmZvcm1hbmNlVGVzdHMvQ2hhbmdlTG9nCmluZGV4IGYyMGU0ZTI5YjVi YzgyMmNiZDBiYThhMjlmODg4ODc4MTk1OTk4MmUuLjE0YjdhMGQ5NWZmMDNhZWY4NGM5NDcyMGFh ZjljYTFiZDBlZWFjZDYgMTAwNjQ0Ci0tLSBhL1BlcmZvcm1hbmNlVGVzdHMvQ2hhbmdlTG9nCisr KyBiL1BlcmZvcm1hbmNlVGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTgtMDgt MTMgIEpvbiBMZWUgIDxqb25sZWVAYXBwbGUuY29tPgorCisgICAgICAgIFtNb3Rpb25NYXJrXSBV cGRhdGUgTGVhdmVzIHRlc3QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE4ODUzMAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDMyNTE4NjI+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXBkYXRlIExlYXZl cyB0ZXN0IHRvIGluY2x1ZGUgb3BhY2l0eSBhbmQgc2NhbGUuIEFkZCBuZXcgTGVhdmVzIHN1aXRl IHRoYXQgaXNvbGF0ZSB0aG9zZSBjb21wb25lbnRzCisgICAgICAgIGZvciBkZWJ1Z2dpbmcgcHVy cG9zZXMuCisKKyAgICAgICAgKiBNb3Rpb25NYXJrL3Jlc291cmNlcy9kZWJ1Zy1ydW5uZXIvdGVz dHMuanM6CisgICAgICAgICogTW90aW9uTWFyay90ZXN0cy9kb20vbGVhdmVzLmh0bWw6CisgICAg ICAgICogTW90aW9uTWFyay90ZXN0cy9kb20vcmVzb3VyY2VzL2xlYXZlcy5qczoKKyAgICAgICAg KiBNb3Rpb25NYXJrL3Rlc3RzL21hc3Rlci9yZXNvdXJjZXMvbGVhdmVzLmpzOgorCiAyMDE4LTA3 LTI2ICBBbmR5IFZhbldhZ29uZXIgIDxhbmR5QHZhbndhZ29uZXIuZmFtaWx5PgogCiAgICAgICAg IFtJTlRMXSBSZW1vdmUgSU5UTCBzdWItZmVhdHVyZSBjb21waWxlIGZsYWdzCmRpZmYgLS1naXQg YS9QZXJmb3JtYW5jZVRlc3RzL01vdGlvbk1hcmsvcmVzb3VyY2VzL2RlYnVnLXJ1bm5lci90ZXN0 cy5qcyBiL1BlcmZvcm1hbmNlVGVzdHMvTW90aW9uTWFyay9yZXNvdXJjZXMvZGVidWctcnVubmVy L3Rlc3RzLmpzCmluZGV4IGYxNzgzMTQxOGY4M2ZjYjIxZGM3NjNkZjE5NDgxNGRmMDhkNzdjYTIu LjAzYjM2MjY4YjY4ZGM1M2Y5ODdmZTk2NTQ0NWYwZWEyZDk1ODBlZGEgMTAwNjQ0Ci0tLSBhL1Bl cmZvcm1hbmNlVGVzdHMvTW90aW9uTWFyay9yZXNvdXJjZXMvZGVidWctcnVubmVyL3Rlc3RzLmpz CisrKyBiL1BlcmZvcm1hbmNlVGVzdHMvTW90aW9uTWFyay9yZXNvdXJjZXMvZGVidWctcnVubmVy L3Rlc3RzLmpzCkBAIC0xOTAsMTAgKzE5MCw2IEBAIFN1aXRlcy5wdXNoKG5ldyBTdWl0ZSgiSFRN TCBzdWl0ZSIsCiAgICAgICAgICAgICB1cmw6ICJib3VuY2luZy1wYXJ0aWNsZXMvYm91bmNpbmct dGFnZ2VkLWltYWdlcy5odG1sP3BhcnRpY2xlV2lkdGg9MTAwJnBhcnRpY2xlSGVpZ2h0PTEwMCIs CiAgICAgICAgICAgICBuYW1lOiAiQ1NTIGJvdW5jaW5nIHRhZ2dlZCBpbWFnZXMiCiAgICAgICAg IH0sCi0gICAgICAgIHsKLSAgICAgICAgICAgIHVybDogImRvbS9sZWF2ZXMuaHRtbCIsCi0gICAg ICAgICAgICBuYW1lOiAiTGVhdmVzIDIuMCIKLSAgICAgICAgfSwKICAgICAgICAgewogICAgICAg ICAgICAgdXJsOiAiZG9tL2ZvY3VzLmh0bWwiLAogICAgICAgICAgICAgbmFtZTogIkZvY3VzIDIu MCIKQEAgLTI2Nyw2ICsyNjMsMjMgQEAgU3VpdGVzLnB1c2gobmV3IFN1aXRlKCJTVkcgc3VpdGUi LAogICAgIF0KICkpOwogCitTdWl0ZXMucHVzaChuZXcgU3VpdGUoIkxlYXZlcyBzdWl0ZSIsCisg ICAgWworICAgICAgICB7CisgICAgICAgICAgICB1cmw6ICJkb20vbGVhdmVzLmh0bWw/c3R5bGU9 c2ltcGxlIiwKKyAgICAgICAgICAgIG5hbWU6ICJUcmFuc2xhdGUtb25seSBMZWF2ZXMiCisgICAg ICAgIH0sCisgICAgICAgIHsKKyAgICAgICAgICAgIHVybDogImRvbS9sZWF2ZXMuaHRtbD9zdHls ZT1zY2FsZSIsCisgICAgICAgICAgICBuYW1lOiAiVHJhbnNsYXRlICsgU2NhbGUgTGVhdmVzIgor ICAgICAgICB9LAorICAgICAgICB7CisgICAgICAgICAgICB1cmw6ICJkb20vbGVhdmVzLmh0bWw/ c3R5bGU9b3BhY2l0eSIsCisgICAgICAgICAgICBuYW1lOiAiVHJhbnNsYXRlICsgT3BhY2l0eSBM ZWF2ZXMiCisgICAgICAgIH0KKyAgICBdCispKTsKKwogU3VpdGVzLnB1c2gobmV3IFN1aXRlKCJU ZXh0IHN1aXRlIiwKICAgICBbCiAgICAgICAgIHsKZGlmZiAtLWdpdCBhL1BlcmZvcm1hbmNlVGVz dHMvTW90aW9uTWFyay90ZXN0cy9kb20vbGVhdmVzLmh0bWwgYi9QZXJmb3JtYW5jZVRlc3RzL01v dGlvbk1hcmsvdGVzdHMvZG9tL2xlYXZlcy5odG1sCmluZGV4IDhkYmVmY2UyYjBlOGM2MDU2ZThi YjIwNjkyN2FiODMzZmNmNWMxZjcuLjhkZmY2NGQwNjg4YmQyNjIxNmVhY2FlZTQ5OGI3MDExMTQ4 MThhMGUgMTAwNjQ0Ci0tLSBhL1BlcmZvcm1hbmNlVGVzdHMvTW90aW9uTWFyay90ZXN0cy9kb20v bGVhdmVzLmh0bWwKKysrIGIvUGVyZm9ybWFuY2VUZXN0cy9Nb3Rpb25NYXJrL3Rlc3RzL2RvbS9s ZWF2ZXMuaHRtbApAQCAtMSw1ICsxLDUgQEAKIDwhLS0KLSAgQ29weXJpZ2h0IChDKSAyMDE1LTIw MTcgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICBDb3B5cmlnaHQgKEMpIDIwMTUt MjAxOCBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAKICAgUmVkaXN0cmlidXRpb24g YW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAgIG1v ZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29u ZGl0aW9ucwpAQCAtMjksNyArMjksNyBAQAogICAgIDxsaW5rIHJlbD0ic3R5bGVzaGVldCIgdHlw ZT0idGV4dC9jc3MiIGhyZWY9Ii4uL3Jlc291cmNlcy9zdGFnZS5jc3MiPgogICAgIDxzdHlsZT4K ICAgICAgICAgI3N0YWdlIHsKLSAgICAgICAgICAgIGJhY2tncm91bmQtY29sb3I6ICMyMzI4MkI7 CisgICAgICAgICAgICBiYWNrZ3JvdW5kLWNvbG9yOiAjMzMyODJCOwogICAgICAgICB9CiAgICAg ICAgICNzdGFnZSBpbWcgewogICAgICAgICAgICAgcG9zaXRpb246IGFic29sdXRlOwpkaWZmIC0t Z2l0IGEvUGVyZm9ybWFuY2VUZXN0cy9Nb3Rpb25NYXJrL3Rlc3RzL2RvbS9yZXNvdXJjZXMvbGVh dmVzLmpzIGIvUGVyZm9ybWFuY2VUZXN0cy9Nb3Rpb25NYXJrL3Rlc3RzL2RvbS9yZXNvdXJjZXMv bGVhdmVzLmpzCmluZGV4IDhjMTZkZWNlYWIyMWJmOTRjMDg0MjAyODk1ZjY5ZmJmNTY0YmNhNmUu LmEwYmI2MzM2YTYwODYxZmZmYjM1Yjc5MDEzMWViZmMxM2FmNmQyYzAgMTAwNjQ0Ci0tLSBhL1Bl cmZvcm1hbmNlVGVzdHMvTW90aW9uTWFyay90ZXN0cy9kb20vcmVzb3VyY2VzL2xlYXZlcy5qcwor KysgYi9QZXJmb3JtYW5jZVRlc3RzL01vdGlvbk1hcmsvdGVzdHMvZG9tL3Jlc291cmNlcy9sZWF2 ZXMuanMKQEAgLTEsNSArMSw1IEBACiAvKgotICogQ29weXJpZ2h0IChDKSAyMDE1LTIwMTcgQXBw bGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAyMDE1LTIwMTgg QXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFu ZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogICogbW9k aWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25k aXRpb25zCkBAIC0yMiw0NyArMjIsNTAgQEAKICAqIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0Yg VEhFIFVTRSBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YKICAqIFRIRSBQT1NT SUJJTElUWSBPRiBTVUNIIERBTUFHRS4KICAqLwotTGVhZiA9IFV0aWxpdGllcy5jcmVhdGVTdWJj bGFzcyhQYXJ0aWNsZSwKKyhmdW5jdGlvbigpIHsKKwordmFyIFN1cGVyTGVhZiA9IHdpbmRvdy5M ZWFmOwordmFyIFNpbXBsZUxlYWYgPSBVdGlsaXRpZXMuY3JlYXRlU3ViY2xhc3MoU3VwZXJMZWFm LAogICAgIGZ1bmN0aW9uKHN0YWdlKQogICAgIHsKLSAgICAgICAgdGhpcy5lbGVtZW50ID0gZG9j dW1lbnQuY3JlYXRlRWxlbWVudCgiaW1nIik7Ci0gICAgICAgIHRoaXMuZWxlbWVudC5zZXRBdHRy aWJ1dGUoInNyYyIsIFN0YWdlLnJhbmRvbUVsZW1lbnRJbkFycmF5KHN0YWdlLmltYWdlcykuc3Jj KTsKLSAgICAgICAgc3RhZ2UuZWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLmVsZW1lbnQpOworICAg ICAgICBTdXBlckxlYWYuY2FsbCh0aGlzLCBzdGFnZSk7CisgICAgfSwgeworCisgICAgc2l6ZU1p bmltdW06IDI1LAorICAgIHNpemVSYW5nZTogMCwKKyAgICB1c2VzT3BhY2l0eTogZmFsc2UsCisK KyAgICBtb3ZlOiBmdW5jdGlvbigpCisgICAgeworICAgICAgICB0aGlzLmVsZW1lbnQuc3R5bGUu dHJhbnNmb3JtID0gInRyYW5zbGF0ZSgiICsgdGhpcy5fcG9zaXRpb24ueCArICJweCwgIiArIHRo aXMuX3Bvc2l0aW9uLnkgKyAicHgpIiArIHRoaXMucm90YXRlci5yb3RhdGVaKCk7CisgICAgfQor fSk7CiAKLSAgICAgICAgUGFydGljbGUuY2FsbCh0aGlzLCBzdGFnZSk7Cit2YXIgU2NhbGVMZWFm ID0gVXRpbGl0aWVzLmNyZWF0ZVN1YmNsYXNzKFN1cGVyTGVhZiwKKyAgICBmdW5jdGlvbihzdGFn ZSkKKyAgICB7CisgICAgICAgIFN1cGVyTGVhZi5jYWxsKHRoaXMsIHN0YWdlKTsKICAgICB9LCB7 CiAKICAgICBzaXplTWluaW11bTogMjAsCi0gICAgc2l6ZVJhbmdlOiA0MCwKKyAgICBzaXplUmFu Z2U6IDMwLAorICAgIHVzZXNPcGFjaXR5OiBmYWxzZSwKIAotICAgIHJlc2V0OiBmdW5jdGlvbigp CisgICAgbW92ZTogZnVuY3Rpb24oKQogICAgIHsKLSAgICAgICAgUGFydGljbGUucHJvdG90eXBl LnJlc2V0LmNhbGwodGhpcyk7Ci0gICAgICAgIHRoaXMuZWxlbWVudC5zdHlsZS53aWR0aCA9IHRo aXMuc2l6ZS54ICsgInB4IjsKLSAgICAgICAgdGhpcy5lbGVtZW50LnN0eWxlLmhlaWdodCA9IHRo aXMuc2l6ZS55ICsgInB4IjsKLSAgICAgICAgdGhpcy5fb3BhY2l0eSA9IC4wMTsKLSAgICAgICAg dGhpcy5fb3BhY2l0eVJhdGUgPSAwLjAyICogU3RhZ2UucmFuZG9tKDEsIDYpOwotICAgICAgICB0 aGlzLl9wb3NpdGlvbiA9IG5ldyBQb2ludChTdGFnZS5yYW5kb20oMCwgdGhpcy5tYXhQb3NpdGlv bi54KSwgU3RhZ2UucmFuZG9tKC10aGlzLnNpemUuaGVpZ2h0LCB0aGlzLm1heFBvc2l0aW9uLnkp KTsKLSAgICAgICAgdGhpcy5fdmVsb2NpdHkgPSBuZXcgUG9pbnQoU3RhZ2UucmFuZG9tKC02LCAt MiksIC4xICogdGhpcy5zaXplLnkgKyBTdGFnZS5yYW5kb20oLTEsIDEpKTsKLSAgICB9LAorICAg ICAgICB0aGlzLmVsZW1lbnQuc3R5bGUudHJhbnNmb3JtID0gInRyYW5zbGF0ZSgiICsgdGhpcy5f cG9zaXRpb24ueCArICJweCwgIiArIHRoaXMuX3Bvc2l0aW9uLnkgKyAicHgpIiArIHRoaXMucm90 YXRlci5yb3RhdGVaKCk7CisgICAgfQorfSk7CiAKLSAgICBhbmltYXRlOiBmdW5jdGlvbih0aW1l RGVsdGEpCit2YXIgT3BhY2l0eUxlYWYgPSBVdGlsaXRpZXMuY3JlYXRlU3ViY2xhc3MoU3VwZXJM ZWFmLAorICAgIGZ1bmN0aW9uKHN0YWdlKQogICAgIHsKLSAgICAgICAgdGhpcy5yb3RhdGVyLm5l eHQodGltZURlbHRhKTsKLQotICAgICAgICB0aGlzLl9wb3NpdGlvbi54ICs9IHRoaXMuX3ZlbG9j aXR5LnggKyA4ICogdGhpcy5zdGFnZS5mb2N1c1g7Ci0gICAgICAgIHRoaXMuX3Bvc2l0aW9uLnkg Kz0gdGhpcy5fdmVsb2NpdHkueTsKLSAgICAgICAgdGhpcy5fb3BhY2l0eSArPSB0aGlzLl9vcGFj aXR5UmF0ZTsKLSAgICAgICAgaWYgKHRoaXMuX29wYWNpdHkgPiAxKSB7Ci0gICAgICAgICAgICB0 aGlzLl9vcGFjaXR5ID0gMTsKLSAgICAgICAgICAgIHRoaXMuX29wYWNpdHlSYXRlICo9IC0xOwot ICAgICAgICB9IGVsc2UgaWYgKHRoaXMuX29wYWNpdHkgPCAwIHx8IHRoaXMuX3Bvc2l0aW9uLnkg PiB0aGlzLnN0YWdlLnNpemUuaGVpZ2h0KQotICAgICAgICAgICAgdGhpcy5yZXNldCgpOworICAg ICAgICBTdXBlckxlYWYuY2FsbCh0aGlzLCBzdGFnZSk7CisgICAgfSwgewogCi0gICAgICAgIGlm ICh0aGlzLl9wb3NpdGlvbi54IDwgLXRoaXMuc2l6ZS53aWR0aCB8fCB0aGlzLl9wb3NpdGlvbi54 ID4gdGhpcy5zdGFnZS5zaXplLndpZHRoKQotICAgICAgICAgICAgdGhpcy5fcG9zaXRpb24ueCA9 IHRoaXMuX3Bvc2l0aW9uLnggLSBNYXRoLnNpZ24odGhpcy5fcG9zaXRpb24ueCkgKiAodGhpcy5z aXplLndpZHRoICsgdGhpcy5zdGFnZS5zaXplLndpZHRoKTsKLSAgICAgICAgdGhpcy5tb3ZlKCk7 Ci0gICAgfSwKKyAgICBzaXplTWluaW11bTogMjUsCisgICAgc2l6ZVJhbmdlOiAwLAorICAgIHVz ZXNPcGFjaXR5OiB0cnVlLAogCiAgICAgbW92ZTogZnVuY3Rpb24oKQogICAgIHsKQEAgLTcwLDMg KzczLDI3IEBAIExlYWYgPSBVdGlsaXRpZXMuY3JlYXRlU3ViY2xhc3MoUGFydGljbGUsCiAgICAg ICAgIHRoaXMuZWxlbWVudC5zdHlsZS5vcGFjaXR5ID0gdGhpcy5fb3BhY2l0eTsKICAgICB9CiB9 KTsKKworCit2YXIgTGVhdmVzQmVuY2htYXJrID0gd2luZG93LmJlbmNobWFya0NsYXNzOwordmFy IExlYXZlc0Rlcml2ZWRCZW5jaG1hcmsgPSBVdGlsaXRpZXMuY3JlYXRlU3ViY2xhc3MoTGVhdmVz QmVuY2htYXJrLAorICAgIGZ1bmN0aW9uKG9wdGlvbnMpCisgICAgeworICAgICAgICBzd2l0Y2gg KG9wdGlvbnNbInN0eWxlIl0pIHsKKyAgICAgICAgY2FzZSAic2ltcGxlIjoKKyAgICAgICAgICAg IHdpbmRvdy5MZWFmID0gU2ltcGxlTGVhZjsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICBj YXNlICJzY2FsZSI6CisgICAgICAgICAgICB3aW5kb3cuTGVhZiA9IFNjYWxlTGVhZjsKKyAgICAg ICAgICAgIGJyZWFrOworICAgICAgICBjYXNlICJvcGFjaXR5IjoKKyAgICAgICAgICAgIHdpbmRv dy5MZWFmID0gT3BhY2l0eUxlYWY7CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgfQorICAg ICAgICBMZWF2ZXNCZW5jaG1hcmsuY2FsbCh0aGlzLCBvcHRpb25zKTsKKyAgICB9CispOworCit3 aW5kb3cuYmVuY2htYXJrQ2xhc3MgPSBMZWF2ZXNEZXJpdmVkQmVuY2htYXJrOworCit9KSgpOwpk aWZmIC0tZ2l0IGEvUGVyZm9ybWFuY2VUZXN0cy9Nb3Rpb25NYXJrL3Rlc3RzL21hc3Rlci9yZXNv dXJjZXMvbGVhdmVzLmpzIGIvUGVyZm9ybWFuY2VUZXN0cy9Nb3Rpb25NYXJrL3Rlc3RzL21hc3Rl ci9yZXNvdXJjZXMvbGVhdmVzLmpzCmluZGV4IGZlZmRhMTQ5YmY0YjRhMGU5YzFjNGEwMjVjYjQ3 NjdjMDdlMjU3ZTYuLjUzMTdlNTBiNTEzYjIzNDk0MGIyOTRkZGZlNDczYzAwNzBlOTg1ZDkgMTAw NjQ0Ci0tLSBhL1BlcmZvcm1hbmNlVGVzdHMvTW90aW9uTWFyay90ZXN0cy9tYXN0ZXIvcmVzb3Vy Y2VzL2xlYXZlcy5qcworKysgYi9QZXJmb3JtYW5jZVRlc3RzL01vdGlvbk1hcmsvdGVzdHMvbWFz dGVyL3Jlc291cmNlcy9sZWF2ZXMuanMKQEAgLTEsNSArMSw1IEBACiAvKgotICogQ29weXJpZ2h0 IChDKSAyMDE1LTIwMTcgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJp Z2h0IChDKSAyMDE1LTIwMTggQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoKICAq IFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGgg b3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQg dGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC0yMiwyNiArMjIsMzQgQEAKICAqIEFSSVNJTkcg SU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklT RUQgT0YKICAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KICAqLwotTGVhZiA9IFV0 aWxpdGllcy5jcmVhdGVTdWJjbGFzcyhQYXJ0aWNsZSwKKyhmdW5jdGlvbigpIHsKKword2luZG93 LkxlYWYgPSBVdGlsaXRpZXMuY3JlYXRlU3ViY2xhc3MoUGFydGljbGUsCiAgICAgZnVuY3Rpb24o c3RhZ2UpCiAgICAgewogICAgICAgICB0aGlzLmVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVt ZW50KCJpbWciKTsKICAgICAgICAgdGhpcy5lbGVtZW50LnNldEF0dHJpYnV0ZSgic3JjIiwgU3Rh Z2UucmFuZG9tRWxlbWVudEluQXJyYXkoc3RhZ2UuaW1hZ2VzKS5zcmMpOwotICAgICAgICB2YXIg c2l6ZVN0cmluZyA9IHRoaXMuc2l6ZU1pbmltdW0gKyAicHgiOwotICAgICAgICB0aGlzLmVsZW1l bnQuc3R5bGUud2lkdGggPSBzaXplU3RyaW5nOwotICAgICAgICB0aGlzLmVsZW1lbnQuc3R5bGUu aGVpZ2h0ID0gc2l6ZVN0cmluZzsKICAgICAgICAgc3RhZ2UuZWxlbWVudC5hcHBlbmRDaGlsZCh0 aGlzLmVsZW1lbnQpOwogCiAgICAgICAgIFBhcnRpY2xlLmNhbGwodGhpcywgc3RhZ2UpOwogICAg IH0sIHsKIAotICAgIHNpemVNaW5pbXVtOiAyNSwKLSAgICBzaXplUmFuZ2U6IDAsCisgICAgc2l6 ZU1pbmltdW06IDIwLAorICAgIHNpemVSYW5nZTogMzAsCisgICAgdXNlc09wYWNpdHk6IHRydWUs CiAKICAgICByZXNldDogZnVuY3Rpb24oKQogICAgIHsKICAgICAgICAgUGFydGljbGUucHJvdG90 eXBlLnJlc2V0LmNhbGwodGhpcyk7Ci0gICAgICAgIHRoaXMuX2xpZmUgPSBTdGFnZS5yYW5kb21J bnQoMjAsIDEwMCk7CisgICAgICAgIHRoaXMuZWxlbWVudC5zdHlsZS53aWR0aCA9IHRoaXMuc2l6 ZS54ICsgInB4IjsKKyAgICAgICAgdGhpcy5lbGVtZW50LnN0eWxlLmhlaWdodCA9IHRoaXMuc2l6 ZS55ICsgInB4IjsKKworICAgICAgICBpZiAodGhpcy51c2VzT3BhY2l0eSkgeworICAgICAgICAg ICAgdGhpcy5fb3BhY2l0eSA9IC4wMTsKKyAgICAgICAgICAgIHRoaXMuX29wYWNpdHlSYXRlID0g MC4wMiAqIFN0YWdlLnJhbmRvbSgxLCA2KTsKKyAgICAgICAgfSBlbHNlCisgICAgICAgICAgICB0 aGlzLl9saWZlID0gU3RhZ2UucmFuZG9tSW50KDIwLCAxMDApOworCiAgICAgICAgIHRoaXMuX3Bv c2l0aW9uID0gbmV3IFBvaW50KFN0YWdlLnJhbmRvbSgwLCB0aGlzLm1heFBvc2l0aW9uLngpLCBT dGFnZS5yYW5kb20oLXRoaXMuc2l6ZS5oZWlnaHQsIHRoaXMubWF4UG9zaXRpb24ueSkpOwogICAg ICAgICB0aGlzLl92ZWxvY2l0eSA9IG5ldyBQb2ludChTdGFnZS5yYW5kb20oLTYsIC0yKSwgLjEg KiB0aGlzLnNpemUueSArIFN0YWdlLnJhbmRvbSgtMSwgMSkpOwogICAgIH0sCkBAIC01Myw5ICs2 MSwxOCBAQCBMZWFmID0gVXRpbGl0aWVzLmNyZWF0ZVN1YmNsYXNzKFBhcnRpY2xlLAogICAgICAg ICB0aGlzLl9wb3NpdGlvbi54ICs9IHRoaXMuX3ZlbG9jaXR5LnggKyA4ICogdGhpcy5zdGFnZS5m b2N1c1g7CiAgICAgICAgIHRoaXMuX3Bvc2l0aW9uLnkgKz0gdGhpcy5fdmVsb2NpdHkueTsKIAot ICAgICAgICB0aGlzLl9saWZlLS07Ci0gICAgICAgIGlmICghdGhpcy5fbGlmZSB8fCB0aGlzLl9w b3NpdGlvbi55ID4gdGhpcy5zdGFnZS5zaXplLmhlaWdodCkKLSAgICAgICAgICAgIHRoaXMucmVz ZXQoKTsKKyAgICAgICAgaWYgKHRoaXMudXNlc09wYWNpdHkpIHsKKyAgICAgICAgICAgIHRoaXMu X29wYWNpdHkgKz0gdGhpcy5fb3BhY2l0eVJhdGU7CisgICAgICAgICAgICBpZiAodGhpcy5fb3Bh Y2l0eSA+IDEpIHsKKyAgICAgICAgICAgICAgICB0aGlzLl9vcGFjaXR5ID0gMTsKKyAgICAgICAg ICAgICAgICB0aGlzLl9vcGFjaXR5UmF0ZSAqPSAtMTsKKyAgICAgICAgICAgIH0gZWxzZSBpZiAo dGhpcy5fb3BhY2l0eSA8IDAgfHwgdGhpcy5fcG9zaXRpb24ueSA+IHRoaXMuc3RhZ2Uuc2l6ZS5o ZWlnaHQpCisgICAgICAgICAgICAgICAgdGhpcy5yZXNldCgpOworICAgICAgICB9IGVsc2Ugewor ICAgICAgICAgICAgdGhpcy5fbGlmZS0tOworICAgICAgICAgICAgaWYgKCF0aGlzLl9saWZlIHx8 IHRoaXMuX3Bvc2l0aW9uLnkgPiB0aGlzLnN0YWdlLnNpemUuaGVpZ2h0KQorICAgICAgICAgICAg ICAgIHRoaXMucmVzZXQoKTsKKyAgICAgICAgfQogCiAgICAgICAgIGlmICh0aGlzLl9wb3NpdGlv bi54IDwgLXRoaXMuc2l6ZS53aWR0aCB8fCB0aGlzLl9wb3NpdGlvbi54ID4gdGhpcy5zdGFnZS5z aXplLndpZHRoKQogICAgICAgICAgICAgdGhpcy5fcG9zaXRpb24ueCA9IHRoaXMuX3Bvc2l0aW9u LnggLSBNYXRoLnNpZ24odGhpcy5fcG9zaXRpb24ueCkgKiAodGhpcy5zaXplLndpZHRoICsgdGhp cy5zdGFnZS5zaXplLndpZHRoKTsKQEAgLTY1LDYgKzgyLDcgQEAgTGVhZiA9IFV0aWxpdGllcy5j cmVhdGVTdWJjbGFzcyhQYXJ0aWNsZSwKICAgICBtb3ZlOiBmdW5jdGlvbigpCiAgICAgewogICAg ICAgICB0aGlzLmVsZW1lbnQuc3R5bGUudHJhbnNmb3JtID0gInRyYW5zbGF0ZSgiICsgdGhpcy5f cG9zaXRpb24ueCArICJweCwgIiArIHRoaXMuX3Bvc2l0aW9uLnkgKyAicHgpIiArIHRoaXMucm90 YXRlci5yb3RhdGVaKCk7CisgICAgICAgIHRoaXMuZWxlbWVudC5zdHlsZS5vcGFjaXR5ID0gdGhp cy5fb3BhY2l0eTsKICAgICB9CiB9KTsKIApAQCAtMTQzLDcgKzE2MSw3IEBAIFV0aWxpdGllcy5l eHRlbmRPYmplY3QoUGFydGljbGVzU3RhZ2UucHJvdG90eXBlLCB7CiAgICAgfQogfSk7CiAKLUxl YXZlc0JlbmNobWFyayA9IFV0aWxpdGllcy5jcmVhdGVTdWJjbGFzcyhCZW5jaG1hcmssCit2YXIg TGVhdmVzQmVuY2htYXJrID0gVXRpbGl0aWVzLmNyZWF0ZVN1YmNsYXNzKEJlbmNobWFyaywKICAg ICBmdW5jdGlvbihvcHRpb25zKQogICAgIHsKICAgICAgICAgQmVuY2htYXJrLmNhbGwodGhpcywg bmV3IFBhcnRpY2xlc1N0YWdlKCksIG9wdGlvbnMpOwpAQCAtMTU3LDMgKzE3NSw1IEBAIExlYXZl c0JlbmNobWFyayA9IFV0aWxpdGllcy5jcmVhdGVTdWJjbGFzcyhCZW5jaG1hcmssCiB9KTsKIAog d2luZG93LmJlbmNobWFya0NsYXNzID0gTGVhdmVzQmVuY2htYXJrOworCit9KSgpOwo=