196627 2019-04-04 14:13:07 -0700 Have ScrollableArea store a ScrollType for the current scroll 2019-04-04 17:13:47 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser simon.fraser webkit-bug-importer zalan oldest_to_newest 1524438 0 simon.fraser 2019-04-04 14:13:07 -0700 Have ScrollableArea store a ScrollType for the current scroll 1524440 1 366758 simon.fraser 2019-04-04 14:16:08 -0700 Created attachment 366758 Patch 1524533 2 simon.fraser 2019-04-04 17:11:49 -0700 https://trac.webkit.org/r243919 1524535 3 webkit-bug-importer 2019-04-04 17:13:47 -0700 <rdar://problem/49629451> 366758 2019-04-04 14:16:08 -0700 2019-04-04 14:36:04 -0700 Patch bug-196627-20190404141607.patch text/plain 25266 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjQzOTA1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGNjNTNiMTBkZjZlOGNi Y2I2YzEwZDRhYmE3YTU3YWE0M2ZjM2EwNS4uZTRjODg4MGE4NTA2OGQwODU4Yzc4MGU0ZjJlNzcy MjEwYjg3NjczYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDU5IEBACisyMDE5LTA0LTA0ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIEhhdmUgU2Nyb2xs YWJsZUFyZWEgc3RvcmUgYSBTY3JvbGxUeXBlIGZvciB0aGUgY3VycmVudCBzY3JvbGwKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5NjYyNworCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbmRlckxheWVyIGhh ZCBpc0luVXNlclNjcm9sbCgpIHdoaWNoIGlzIHRoZSBvcHBvc2l0ZSBvZiBTY3JvbGxhYmxlQXJl YTo6aW5Qcm9ncmFtbWF0aWNTY3JvbGwoKSwKKyAgICAgICAgc28ganVzdCBoYXZlIFNjcm9sbGFi bGVBcmVhIHN0b3JlIGEgU2Nyb2xsVHlwZS4KKworICAgICAgICBSZW5kZXJMYXllcidzIHNjcm9s bGluZyBib3R0bGVuZWNrLCBzY3JvbGxUb09mZnNldCgpLCBub3cgdGFrZXMgYSBTY3JvbGxUeXBl LCBhbmQgcHVzaGVzCisgICAgICAgIGl0IG9udG8gdGhlIGJhc2UgY2xhc3MuCisKKyAgICAgICAg QXN5bmNTY3JvbGxpbmdDb29yZGluYXRvcjo6cmVxdWVzdFNjcm9sbFBvc2l0aW9uVXBkYXRlKCkg Y2FuIHVzZSB0aGUgaW5jb21pbmcgc2Nyb2xsVHlwZSAoY3VycmVudGx5CisgICAgICAgIGluY29y cmVjdCBmb3IgaU9TIFdLMiBvdmVyZmxvdykgcmF0aGVyIHRoYW4gZGVkdWNpbmcgYSB1c2VyIHNj cm9sbCBmcm9tIFNjcm9sbGluZ0xheWVyUG9zaXRpb25BY3Rpb24uCisKKyAgICAgICAgTm8gYmVo YXZpb3IgY2hhbmdlLgorCisgICAgICAgICogcGFnZS9GcmFtZVZpZXcuY3BwOgorICAgICAgICAo V2ViQ29yZTo6RnJhbWVWaWV3OjpzZXRGcmFtZVJlY3QpOgorICAgICAgICAoV2ViQ29yZTo6RnJh bWVWaWV3Ojp0b3BDb250ZW50SW5zZXREaWRDaGFuZ2UpOgorICAgICAgICAoV2ViQ29yZTo6RnJh bWVWaWV3Ojp1cGRhdGVMYXlvdXRWaWV3cG9ydCk6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZVZp ZXc6OnNldFNjcm9sbFBvc2l0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6c2hv dWxkVXBkYXRlQ29tcG9zaXRpbmdMYXllcnNBZnRlclNjcm9sbGluZyBjb25zdCk6CisgICAgICAg IChXZWJDb3JlOjpGcmFtZVZpZXc6OnNldFdhc1Njcm9sbGVkQnlVc2VyKToKKyAgICAgICAgKiBw YWdlL0ZyYW1lVmlld0xheW91dENvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0 U2NvcGU6OkxheW91dFNjb3BlKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dFNjb3BlOjp+TGF5 b3V0U2NvcGUpOgorICAgICAgICAqIHBhZ2UvaW9zL0ZyYW1lSU9TLm1tOgorICAgICAgICAoV2Vi Q29yZTo6RnJhbWU6Om92ZXJmbG93U2Nyb2xsUG9zaXRpb25DaGFuZ2VkRm9yTm9kZSk6CisgICAg ICAgICogcGFnZS9zY3JvbGxpbmcvQXN5bmNTY3JvbGxpbmdDb29yZGluYXRvci5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpBc3luY1Njcm9sbGluZ0Nvb3JkaW5hdG9yOjpyZXF1ZXN0U2Nyb2xsUG9z aXRpb25VcGRhdGUpOgorICAgICAgICAoV2ViQ29yZTo6QXN5bmNTY3JvbGxpbmdDb29yZGluYXRv cjo6dXBkYXRlU2Nyb2xsUG9zaXRpb25BZnRlckFzeW5jU2Nyb2xsKToKKyAgICAgICAgKFdlYkNv cmU6OkFzeW5jU2Nyb2xsaW5nQ29vcmRpbmF0b3I6OnJlY29uY2lsZVNjcm9sbGluZ1N0YXRlKToK KyAgICAgICAgKiBwbGF0Zm9ybS9TY3JvbGxWaWV3LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNj cm9sbFZpZXc6OnNldFNjcm9sbFBvc2l0aW9uKToKKyAgICAgICAgKiBwbGF0Zm9ybS9TY3JvbGxh YmxlQXJlYS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxhYmxlQXJlYTo6U2Nyb2xsYWJs ZUFyZWEpOgorICAgICAgICAqIHBsYXRmb3JtL1Njcm9sbGFibGVBcmVhLmg6CisgICAgICAgIChX ZWJDb3JlOjpTY3JvbGxhYmxlQXJlYTo6Y3VycmVudFNjcm9sbFR5cGUgY29uc3QpOgorICAgICAg ICAoV2ViQ29yZTo6U2Nyb2xsYWJsZUFyZWE6OnNldEN1cnJlbnRTY3JvbGxUeXBlKToKKyAgICAg ICAgKFdlYkNvcmU6OlNjcm9sbGFibGVBcmVhOjpzZXRJc1VzZXJTY3JvbGwpOiBEZWxldGVkLgor ICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsYWJsZUFyZWE6OmluUHJvZ3JhbW1hdGljU2Nyb2xsIGNv bnN0KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGFibGVBcmVhOjpzZXRJblBy b2dyYW1tYXRpY1Njcm9sbCk6IERlbGV0ZWQuCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxh eWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpSZW5kZXJMYXllcik6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6c2Nyb2xsVG9YUG9zaXRpb24pOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OnNjcm9sbFRvWVBvc2l0aW9uKToKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlckxheWVyOjpzY3JvbGxUb09mZnNldCk6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJMYXllcjo6c2Nyb2xsVG8pOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllci5o OgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3BwOgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyTGF5ZXJCYWNraW5nOjp1cGRhdGVTY3JvbGxPZmZzZXQpOgorICAgICAg ICAqIHJlbmRlcmluZy9SZW5kZXJNYXJxdWVlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl ck1hcnF1ZWU6OnN0YXJ0KToKKwogMjAxOS0wNC0wNCAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJh c2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBNb3ZlICJpblByb2dyYW1tYXRpY1Njcm9sbCIgZG93 biB0byBTY3JvbGxhYmxlQXJlYQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdExlZ2FjeS9tYWMv Q2hhbmdlTG9nIGIvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvQ2hhbmdlTG9nCmluZGV4IDNjOGE1 NGE4MmE3Y2Q0ZjYzMTMwYmFhYzIzNzJmM2UyNjZiMDMzY2UuLjU4YjVlZDgyYWJiMDZjMGRlYWYz MGI3NjMwYzdlNTVkOTVlNDYxMTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFj L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNSBAQAorMjAxOS0wNC0wNCAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxl LmNvbT4KKworICAgICAgICBIYXZlIFNjcm9sbGFibGVBcmVhIHN0b3JlIGEgU2Nyb2xsVHlwZSBm b3IgdGhlIGN1cnJlbnQgc2Nyb2xsCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xOTY2MjcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBTZW5kIHRoZSBwcm9ncmFtbWF0aWMgc2Nyb2xsIHR5cGUuCisKKyAgICAg ICAgKiBET00vRE9NSFRNTC5tbToKKyAgICAgICAgKC1bRE9NSFRNTEVsZW1lbnQgc2V0U2Nyb2xs WE9mZnNldDpzY3JvbGxZT2Zmc2V0OmFkanVzdEZvcklPU0NhcmV0Ol0pOgorCiAyMDE5LTA0LTAz ICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CiAKICAgICAgICAgLWFw cGxlLXRyYWlsaW5nLXdvcmQgaXMgbmVlZGVkIGZvciBicm93c2VyIGRldGVjdGlvbgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwIGIvU291cmNlL1dlYkNvcmUv cGFnZS9GcmFtZVZpZXcuY3BwCmluZGV4IGMwOGM2NGJhZDQ2ZTIwOGQwZmE4YWFkYThjYzUwMWQ5 YzllNWVkMTYuLjQwNzE1ZWNiYTZmMzY5YjRmNTRlZGE3YzZmMjc5MTU0MWJjNTNkNTcgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKQEAgLTQ1OSw5ICs0NTksMTEgQEAgdm9pZCBGcmFtZVZp ZXc6OnNldEZyYW1lUmVjdChjb25zdCBJbnRSZWN0JiBuZXdSZWN0KQogICAgIEludFJlY3Qgb2xk UmVjdCA9IGZyYW1lUmVjdCgpOwogICAgIGlmIChuZXdSZWN0ID09IG9sZFJlY3QpCiAgICAgICAg IHJldHVybjsKKwogICAgIC8vIEV2ZXJ5IHNjcm9sbCB0aGF0IGhhcHBlbnMgYXMgdGhlIHJlc3Vs dCBvZiBmcmFtZSBzaXplIGNoYW5nZSBpcyBwcm9ncmFtbWF0aWMuCi0gICAgYm9vbCB3YXNJblBy b2dyYW1tYXRpY1Njcm9sbCA9IGluUHJvZ3JhbW1hdGljU2Nyb2xsKCk7Ci0gICAgc2V0SW5Qcm9n cmFtbWF0aWNTY3JvbGwodHJ1ZSk7CisgICAgYXV0byBvbGRTY3JvbGxUeXBlID0gY3VycmVudFNj cm9sbFR5cGUoKTsKKyAgICBzZXRDdXJyZW50U2Nyb2xsVHlwZShTY3JvbGxUeXBlOjpQcm9ncmFt bWF0aWMpOworCiAgICAgU2Nyb2xsVmlldzo6c2V0RnJhbWVSZWN0KG5ld1JlY3QpOwogCiAgICAg dXBkYXRlU2Nyb2xsYWJsZUFyZWFTZXQoKTsKQEAgLTQ3NSw3ICs0NzcsNyBAQCB2b2lkIEZyYW1l Vmlldzo6c2V0RnJhbWVSZWN0KGNvbnN0IEludFJlY3QmIG5ld1JlY3QpCiAgICAgICAgIGZyYW1l KCkucGFnZSgpLT5wYWdlT3ZlcmxheUNvbnRyb2xsZXIoKS5kaWRDaGFuZ2VWaWV3U2l6ZSgpOwog CiAgICAgdmlld3BvcnRDb250ZW50c0NoYW5nZWQoKTsKLSAgICBzZXRJblByb2dyYW1tYXRpY1Nj cm9sbCh3YXNJblByb2dyYW1tYXRpY1Njcm9sbCk7CisgICAgc2V0Q3VycmVudFNjcm9sbFR5cGUo b2xkU2Nyb2xsVHlwZSk7CiB9CiAKIGJvb2wgRnJhbWVWaWV3OjpzY2hlZHVsZUFuaW1hdGlvbigp CkBAIC0xMDkyLDggKzEwOTQsOSBAQCB2b2lkIEZyYW1lVmlldzo6dG9wQ29udGVudEluc2V0RGlk Q2hhbmdlKGZsb2F0IG5ld1RvcENvbnRlbnRJbnNldCkKICAgICAKICAgICBsYXlvdXRDb250ZXh0 KCkubGF5b3V0KCk7CiAgICAgLy8gRXZlcnkgc2Nyb2xsIHRoYXQgaGFwcGVucyBhcyB0aGUgcmVz dWx0IG9mIGNvbnRlbnQgaW5zZXQgY2hhbmdlIGlzIHByb2dyYW1tYXRpYy4KLSAgICBib29sIHdh c0luUHJvZ3JhbW1hdGljU2Nyb2xsID0gaW5Qcm9ncmFtbWF0aWNTY3JvbGwoKTsKLSAgICBzZXRJ blByb2dyYW1tYXRpY1Njcm9sbCh0cnVlKTsKKyAgICBhdXRvIG9sZFNjcm9sbFR5cGUgPSBjdXJy ZW50U2Nyb2xsVHlwZSgpOworICAgIHNldEN1cnJlbnRTY3JvbGxUeXBlKFNjcm9sbFR5cGU6OlBy b2dyYW1tYXRpYyk7CisKICAgICB1cGRhdGVTY3JvbGxiYXJzKHNjcm9sbFBvc2l0aW9uKCkpOwog ICAgIGlmIChyZW5kZXJWaWV3LT51c2VzQ29tcG9zaXRpbmcoKSkKICAgICAgICAgcmVuZGVyVmll dy0+Y29tcG9zaXRvcigpLmZyYW1lVmlld0RpZENoYW5nZVNpemUoKTsKQEAgLTExMDEsNyArMTEw NCw3IEBAIHZvaWQgRnJhbWVWaWV3Ojp0b3BDb250ZW50SW5zZXREaWRDaGFuZ2UoZmxvYXQgbmV3 VG9wQ29udGVudEluc2V0KQogICAgIGlmIChUaWxlZEJhY2tpbmcqIHRpbGVkQmFja2luZyA9IHRo aXMtPnRpbGVkQmFja2luZygpKQogICAgICAgICB0aWxlZEJhY2tpbmctPnNldFRvcENvbnRlbnRJ bnNldChuZXdUb3BDb250ZW50SW5zZXQpOwogCi0gICAgc2V0SW5Qcm9ncmFtbWF0aWNTY3JvbGwo d2FzSW5Qcm9ncmFtbWF0aWNTY3JvbGwpOworICAgIHNldEN1cnJlbnRTY3JvbGxUeXBlKG9sZFNj cm9sbFR5cGUpOwogfQogCiB2b2lkIEZyYW1lVmlldzo6dG9wQ29udGVudERpcmVjdGlvbkRpZENo YW5nZSgpCkBAIC0xNjc1LDcgKzE2NzgsNyBAQCB2b2lkIEZyYW1lVmlldzo6dXBkYXRlTGF5b3V0 Vmlld3BvcnQoKQogICAgIExPR19XSVRIX1NUUkVBTShTY3JvbGxpbmcsIHN0cmVhbSA8PCAic3Rh YmxlIG9yaWdpbnM6IG1pbjogIiA8PCBtaW5TdGFibGVMYXlvdXRWaWV3cG9ydE9yaWdpbigpIDw8 ICIgbWF4OiAiPDwgbWF4U3RhYmxlTGF5b3V0Vmlld3BvcnRPcmlnaW4oKSk7CiAgICAgCiAgICAg aWYgKG1fbGF5b3V0Vmlld3BvcnRPdmVycmlkZVJlY3QpIHsKLSAgICAgICAgaWYgKGluUHJvZ3Jh bW1hdGljU2Nyb2xsKCkpIHsKKyAgICAgICAgaWYgKGN1cnJlbnRTY3JvbGxUeXBlKCkgPT0gU2Ny b2xsVHlwZTo6UHJvZ3JhbW1hdGljKSB7CiAgICAgICAgICAgICBMT0dfV0lUSF9TVFJFQU0oU2Ny b2xsaW5nLCBzdHJlYW0gPDwgImNvbXB1dGluZyBuZXcgb3ZlcnJpZGUgbGF5b3V0IHZpZXdwb3J0 IGJlY2F1c2Ugb2YgcHJvZ3JhbW1hdGljIHNjcm9sbGluZyIpOwogICAgICAgICAgICAgTGF5b3V0 UG9pbnQgbmV3T3JpZ2luID0gY29tcHV0ZUxheW91dFZpZXdwb3J0T3JpZ2luKHZpc3VhbFZpZXdw b3J0UmVjdCgpLCBtaW5TdGFibGVMYXlvdXRWaWV3cG9ydE9yaWdpbigpLCBtYXhTdGFibGVMYXlv dXRWaWV3cG9ydE9yaWdpbigpLCBsYXlvdXRWaWV3cG9ydCwgU3RpY2tUb0RvY3VtZW50Qm91bmRz KTsKICAgICAgICAgICAgIHNldExheW91dFZpZXdwb3J0T3ZlcnJpZGVSZWN0KExheW91dFJlY3Qo bmV3T3JpZ2luLCBtX2xheW91dFZpZXdwb3J0T3ZlcnJpZGVSZWN0LnZhbHVlKCkuc2l6ZSgpKSk7 CkBAIC0yMjc5LDggKzIyODIsOCBAQCB2b2lkIEZyYW1lVmlldzo6c2V0U2Nyb2xsUG9zaXRpb24o Y29uc3QgU2Nyb2xsUG9zaXRpb24mIHNjcm9sbFBvc2l0aW9uKQogewogICAgIExPR19XSVRIX1NU UkVBTShTY3JvbGxpbmcsIHN0cmVhbSA8PCAiRnJhbWVWaWV3OjpzZXRTY3JvbGxQb3NpdGlvbiAi IDw8IHNjcm9sbFBvc2l0aW9uIDw8ICIgLCBjbGVhcmluZyBhbmNob3IiKTsKIAotICAgIGJvb2wg d2FzSW5Qcm9ncmFtbWF0aWNTY3JvbGwgPSBpblByb2dyYW1tYXRpY1Njcm9sbCgpOwotICAgIHNl dEluUHJvZ3JhbW1hdGljU2Nyb2xsKHRydWUpOworICAgIGF1dG8gb2xkU2Nyb2xsVHlwZSA9IGN1 cnJlbnRTY3JvbGxUeXBlKCk7CisgICAgc2V0Q3VycmVudFNjcm9sbFR5cGUoU2Nyb2xsVHlwZTo6 UHJvZ3JhbW1hdGljKTsKIAogICAgIG1fbWFpbnRhaW5TY3JvbGxQb3NpdGlvbkFuY2hvciA9IG51 bGxwdHI7CiAgICAgbV9zaG91bGRTY3JvbGxUb0ZvY3VzZWRFbGVtZW50ID0gZmFsc2U7CkBAIC0y MjkwLDcgKzIyOTMsNyBAQCB2b2lkIEZyYW1lVmlldzo6c2V0U2Nyb2xsUG9zaXRpb24oY29uc3Qg U2Nyb2xsUG9zaXRpb24mIHNjcm9sbFBvc2l0aW9uKQogICAgICAgICBzY3JvbGxBbmltYXRvcigp LnNldFdoZWVsRXZlbnRUZXN0VHJpZ2dlcihwYWdlLT50ZXN0VHJpZ2dlcigpKTsKICAgICBTY3Jv bGxWaWV3OjpzZXRTY3JvbGxQb3NpdGlvbihzY3JvbGxQb3NpdGlvbik7CiAKLSAgICBzZXRJblBy b2dyYW1tYXRpY1Njcm9sbCh3YXNJblByb2dyYW1tYXRpY1Njcm9sbCk7CisgICAgc2V0Q3VycmVu dFNjcm9sbFR5cGUob2xkU2Nyb2xsVHlwZSk7CiB9CiAKIHZvaWQgRnJhbWVWaWV3OjpyZXNldFNj cm9sbEFuY2hvcigpCkBAIC0yNTY0LDcgKzI1NjcsNyBAQCBib29sIEZyYW1lVmlldzo6c2hvdWxk VXBkYXRlQ29tcG9zaXRpbmdMYXllcnNBZnRlclNjcm9sbGluZygpIGNvbnN0CiAgICAgaWYgKHNj cm9sbGluZ0Nvb3JkaW5hdG9yLT5zaG91bGRVcGRhdGVTY3JvbGxMYXllclBvc2l0aW9uU3luY2hy b25vdXNseSgqdGhpcykpCiAgICAgICAgIHJldHVybiB0cnVlOwogCi0gICAgaWYgKGluUHJvZ3Jh bW1hdGljU2Nyb2xsKCkpCisgICAgaWYgKGN1cnJlbnRTY3JvbGxUeXBlKCkgPT0gU2Nyb2xsVHlw ZTo6UHJvZ3JhbW1hdGljKQogICAgICAgICByZXR1cm4gdHJ1ZTsKIAogICAgIHJldHVybiBmYWxz ZTsKQEAgLTQxMDksNyArNDExMiw3IEBAIHZvaWQgRnJhbWVWaWV3OjpzZXRXYXNTY3JvbGxlZEJ5 VXNlcihib29sIHdhc1Njcm9sbGVkQnlVc2VyKQogCiAgICAgbV9zaG91bGRTY3JvbGxUb0ZvY3Vz ZWRFbGVtZW50ID0gZmFsc2U7CiAgICAgbV9kZWxheWVkU2Nyb2xsVG9Gb2N1c2VkRWxlbWVudFRp bWVyLnN0b3AoKTsKLSAgICBpZiAoaW5Qcm9ncmFtbWF0aWNTY3JvbGwoKSkKKyAgICBpZiAoY3Vy cmVudFNjcm9sbFR5cGUoKSA9PSBTY3JvbGxUeXBlOjpQcm9ncmFtbWF0aWMpCiAgICAgICAgIHJl dHVybjsKICAgICBtX21haW50YWluU2Nyb2xsUG9zaXRpb25BbmNob3IgPSBudWxscHRyOwogICAg IGlmIChtX3dhc1Njcm9sbGVkQnlVc2VyID09IHdhc1Njcm9sbGVkQnlVc2VyKQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXdMYXlvdXRDb250ZXh0LmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3TGF5b3V0Q29udGV4dC5jcHAKaW5kZXggNDljM2ZlODE1 OWU0YmFmZmYxMTI3NDc3NTFhZDgxNTY2YzAyZTBiYS4uNmRmMGYzOTFlNWVlNGM0YzhjZWE3NjJk YjgwYWVlYzQzOTNhMDVjNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZp ZXdMYXlvdXRDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlld0xh eW91dENvbnRleHQuY3BwCkBAIC0xMTYsMjEgKzExNiwyMSBAQCBwdWJsaWM6CiAgICAgICAgIDog bV92aWV3KGxheW91dENvbnRleHQudmlldygpKQogICAgICAgICAsIG1fbmVzdGVkU3RhdGUobGF5 b3V0Q29udGV4dC5tX2xheW91dE5lc3RlZFN0YXRlLCBsYXlvdXRDb250ZXh0Lm1fbGF5b3V0TmVz dGVkU3RhdGUgPT0gRnJhbWVWaWV3TGF5b3V0Q29udGV4dDo6TGF5b3V0TmVzdGVkU3RhdGU6Ok5v dEluTGF5b3V0ID8gRnJhbWVWaWV3TGF5b3V0Q29udGV4dDo6TGF5b3V0TmVzdGVkU3RhdGU6Ok5v dE5lc3RlZCA6IEZyYW1lVmlld0xheW91dENvbnRleHQ6OkxheW91dE5lc3RlZFN0YXRlOjpOZXN0 ZWQpCiAgICAgICAgICwgbV9zY2hlZHVsaW5nSXNFbmFibGVkKGxheW91dENvbnRleHQubV9sYXlv dXRTY2hlZHVsaW5nSXNFbmFibGVkLCBmYWxzZSkKLSAgICAgICAgLCBtX2luUHJvZ3JhbW1hdGlj U2Nyb2xsKGxheW91dENvbnRleHQudmlldygpLmluUHJvZ3JhbW1hdGljU2Nyb2xsKCkpCisgICAg ICAgICwgbV9wcmV2aW91c1Njcm9sbFR5cGUobGF5b3V0Q29udGV4dC52aWV3KCkuY3VycmVudFNj cm9sbFR5cGUoKSkKICAgICB7Ci0gICAgICAgIG1fdmlldy5zZXRJblByb2dyYW1tYXRpY1Njcm9s bCh0cnVlKTsKKyAgICAgICAgbV92aWV3LnNldEN1cnJlbnRTY3JvbGxUeXBlKFNjcm9sbFR5cGU6 OlByb2dyYW1tYXRpYyk7CiAgICAgfQogICAgICAgICAKICAgICB+TGF5b3V0U2NvcGUoKQogICAg IHsKLSAgICAgICAgbV92aWV3LnNldEluUHJvZ3JhbW1hdGljU2Nyb2xsKG1faW5Qcm9ncmFtbWF0 aWNTY3JvbGwpOworICAgICAgICBtX3ZpZXcuc2V0Q3VycmVudFNjcm9sbFR5cGUobV9wcmV2aW91 c1Njcm9sbFR5cGUpOwogICAgIH0KICAgICAgICAgCiBwcml2YXRlOgogICAgIEZyYW1lVmlldyYg bV92aWV3OwogICAgIFNldEZvclNjb3BlPEZyYW1lVmlld0xheW91dENvbnRleHQ6OkxheW91dE5l c3RlZFN0YXRlPiBtX25lc3RlZFN0YXRlOwogICAgIFNldEZvclNjb3BlPGJvb2w+IG1fc2NoZWR1 bGluZ0lzRW5hYmxlZDsKLSAgICBib29sIG1faW5Qcm9ncmFtbWF0aWNTY3JvbGwgeyBmYWxzZSB9 OworICAgIFNjcm9sbFR5cGUgbV9wcmV2aW91c1Njcm9sbFR5cGU7CiB9OwogCiBGcmFtZVZpZXdM YXlvdXRDb250ZXh0OjpGcmFtZVZpZXdMYXlvdXRDb250ZXh0KEZyYW1lVmlldyYgZnJhbWVWaWV3 KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9pb3MvRnJhbWVJT1MubW0gYi9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL2lvcy9GcmFtZUlPUy5tbQppbmRleCA0MDA4Y2IzNThmZjk0NzY3N2Mw NTVhNmYxY2JmY2FiMzRhNTBkMzAxLi40MGRiMmRlYWVmNTFiNDIwZWEwNWRmMjI1Y2UwMmNjOTA2 OGJiNTM3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL2lvcy9GcmFtZUlPUy5tbQor KysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL2lvcy9GcmFtZUlPUy5tbQpAQCAtNzA1LDkgKzcwNSwx MSBAQCB2b2lkIEZyYW1lOjpvdmVyZmxvd1Njcm9sbFBvc2l0aW9uQ2hhbmdlZEZvck5vZGUoY29u c3QgSW50UG9pbnQmIHBvc2l0aW9uLCBOb2RlKgogCiAgICAgUmVuZGVyTGF5ZXImIGxheWVyID0g KmRvd25jYXN0PFJlbmRlckJveE1vZGVsT2JqZWN0PigqcmVuZGVyZXIpLmxheWVyKCk7CiAKLSAg ICBsYXllci5zZXRJc1VzZXJTY3JvbGwoaXNVc2VyU2Nyb2xsKTsKKyAgICBhdXRvIG9sZFNjcm9s bFR5cGUgPSBsYXllci5jdXJyZW50U2Nyb2xsVHlwZSgpOworICAgIGxheWVyLnNldEN1cnJlbnRT Y3JvbGxUeXBlKGlzVXNlclNjcm9sbCA/IFNjcm9sbFR5cGU6OlVzZXIgOiBTY3JvbGxUeXBlOjpQ cm9ncmFtbWF0aWMpOwogICAgIGxheWVyLnNjcm9sbFRvT2Zmc2V0V2l0aG91dEFuaW1hdGlvbihw b3NpdGlvbik7Ci0gICAgbGF5ZXIuc2V0SXNVc2VyU2Nyb2xsKGZhbHNlKTsKKyAgICBsYXllci5z ZXRDdXJyZW50U2Nyb2xsVHlwZShvbGRTY3JvbGxUeXBlKTsKKwogICAgIGxheWVyLmRpZEVuZFNj cm9sbCgpOyAvLyBGSVhNRTogU2hvdWxkIHdlIGFsd2F5cyBjYWxsIHRoaXM/CiB9CiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL0FzeW5jU2Nyb2xsaW5nQ29vcmRp bmF0b3IuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvQXN5bmNTY3JvbGxpbmdD b29yZGluYXRvci5jcHAKaW5kZXggMTA5MGY5NThjYTRiYjU3MjkzMTgxNmM4YTE5ZDNiMWU3NmNi ZDM4NS4uOTA1MDBkNzFhZmZjODY0MTllNGQ4NGE5NmU3OTllZmMyYTJkZDI0ZSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvQXN5bmNTY3JvbGxpbmdDb29yZGluYXRv ci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvQXN5bmNTY3JvbGxpbmdD b29yZGluYXRvci5jcHAKQEAgLTIxMyw3ICsyMTMsNyBAQCBib29sIEFzeW5jU2Nyb2xsaW5nQ29v cmRpbmF0b3I6OnJlcXVlc3RTY3JvbGxQb3NpdGlvblVwZGF0ZShGcmFtZVZpZXcmIGZyYW1lVmll dwogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICBib29sIGluUGFnZUNhY2hlID0gZnJhbWVW aWV3LmZyYW1lKCkuZG9jdW1lbnQoKS0+cGFnZUNhY2hlU3RhdGUoKSAhPSBEb2N1bWVudDo6Tm90 SW5QYWdlQ2FjaGU7Ci0gICAgYm9vbCBpblByb2dyYW1tYXRpY1Njcm9sbCA9IGZyYW1lVmlldy5p blByb2dyYW1tYXRpY1Njcm9sbCgpOworICAgIGJvb2wgaW5Qcm9ncmFtbWF0aWNTY3JvbGwgPSBm cmFtZVZpZXcuY3VycmVudFNjcm9sbFR5cGUoKSA9PSBTY3JvbGxUeXBlOjpQcm9ncmFtbWF0aWM7 CiAgICAgaWYgKGluUHJvZ3JhbW1hdGljU2Nyb2xsIHx8IGluUGFnZUNhY2hlKQogICAgICAgICB1 cGRhdGVTY3JvbGxQb3NpdGlvbkFmdGVyQXN5bmNTY3JvbGwoZnJhbWVWaWV3LnNjcm9sbGluZ05v ZGVJRCgpLCBzY3JvbGxQb3NpdGlvbiwgeyB9LCBTY3JvbGxUeXBlOjpQcm9ncmFtbWF0aWMsIFNj cm9sbGluZ0xheWVyUG9zaXRpb25BY3Rpb246OlNldCk7CiAKQEAgLTMyNSw5ICszMjUsMTEgQEAg dm9pZCBBc3luY1Njcm9sbGluZ0Nvb3JkaW5hdG9yOjp1cGRhdGVTY3JvbGxQb3NpdGlvbkFmdGVy QXN5bmNTY3JvbGwoU2Nyb2xsaW5nTm8KIAogICAgIC8vIE92ZXJmbG93LXNjcm9sbCBhcmVhLgog ICAgIGlmIChhdXRvKiBzY3JvbGxhYmxlQXJlYSA9IGZyYW1lVmlldy5zY3JvbGxhYmxlQXJlYUZv clNjcm9sbExheWVySUQoc2Nyb2xsaW5nTm9kZUlEKSkgewotICAgICAgICBzY3JvbGxhYmxlQXJl YS0+c2V0SXNVc2VyU2Nyb2xsKHNjcm9sbGluZ0xheWVyUG9zaXRpb25BY3Rpb24gPT0gU2Nyb2xs aW5nTGF5ZXJQb3NpdGlvbkFjdGlvbjo6U3luYyk7CisgICAgICAgIGF1dG8gcHJldmlvdXNTY3Jv bGxUeXBlID0gc2Nyb2xsYWJsZUFyZWEtPmN1cnJlbnRTY3JvbGxUeXBlKCk7CisgICAgICAgIHNj cm9sbGFibGVBcmVhLT5zZXRDdXJyZW50U2Nyb2xsVHlwZShzY3JvbGxUeXBlKTsKICAgICAgICAg c2Nyb2xsYWJsZUFyZWEtPnNjcm9sbFRvT2Zmc2V0V2l0aG91dEFuaW1hdGlvbihzY3JvbGxQb3Np dGlvbik7Ci0gICAgICAgIHNjcm9sbGFibGVBcmVhLT5zZXRJc1VzZXJTY3JvbGwoZmFsc2UpOwor ICAgICAgICBzY3JvbGxhYmxlQXJlYS0+c2V0Q3VycmVudFNjcm9sbFR5cGUocHJldmlvdXNTY3Jv bGxUeXBlKTsKKwogICAgICAgICBpZiAoc2Nyb2xsaW5nTGF5ZXJQb3NpdGlvbkFjdGlvbiA9PSBT Y3JvbGxpbmdMYXllclBvc2l0aW9uQWN0aW9uOjpTZXQpCiAgICAgICAgICAgICBtX3BhZ2UtPmVk aXRvckNsaWVudCgpLm92ZXJmbG93U2Nyb2xsUG9zaXRpb25DaGFuZ2VkKCk7CiAKQEAgLTM0Myw4 ICszNDUsOCBAQCB2b2lkIEFzeW5jU2Nyb2xsaW5nQ29vcmRpbmF0b3I6OnVwZGF0ZVNjcm9sbFBv c2l0aW9uQWZ0ZXJBc3luY1Njcm9sbChTY3JvbGxpbmdObwogCiB2b2lkIEFzeW5jU2Nyb2xsaW5n Q29vcmRpbmF0b3I6OnJlY29uY2lsZVNjcm9sbGluZ1N0YXRlKEZyYW1lVmlldyYgZnJhbWVWaWV3 LCBjb25zdCBGbG9hdFBvaW50JiBzY3JvbGxQb3NpdGlvbiwgY29uc3QgTGF5b3V0Vmlld3BvcnRP cmlnaW5Pck92ZXJyaWRlUmVjdCYgbGF5b3V0Vmlld3BvcnRPcmlnaW5Pck92ZXJyaWRlUmVjdCwg U2Nyb2xsVHlwZSBzY3JvbGxUeXBlLCBWaWV3cG9ydFJlY3RTdGFiaWxpdHkgdmlld3BvcnRSZWN0 U3RhYmlsaXR5LCBTY3JvbGxpbmdMYXllclBvc2l0aW9uQWN0aW9uIHNjcm9sbGluZ0xheWVyUG9z aXRpb25BY3Rpb24pCiB7Ci0gICAgYm9vbCBvbGRQcm9ncmFtbWF0aWNTY3JvbGwgPSBmcmFtZVZp ZXcuaW5Qcm9ncmFtbWF0aWNTY3JvbGwoKTsKLSAgICBmcmFtZVZpZXcuc2V0SW5Qcm9ncmFtbWF0 aWNTY3JvbGwoc2Nyb2xsVHlwZSA9PSBTY3JvbGxUeXBlOjpQcm9ncmFtbWF0aWMpOworICAgIGF1 dG8gcHJldmlvdXNTY3JvbGxUeXBlID0gZnJhbWVWaWV3LmN1cnJlbnRTY3JvbGxUeXBlKCk7Cisg ICAgZnJhbWVWaWV3LnNldEN1cnJlbnRTY3JvbGxUeXBlKHNjcm9sbFR5cGUpOwogCiAgICAgTE9H X1dJVEhfU1RSRUFNKFNjcm9sbGluZywgc3RyZWFtIDw8IGdldEN1cnJlbnRQcm9jZXNzSUQoKSA8 PCAiIEFzeW5jU2Nyb2xsaW5nQ29vcmRpbmF0b3IgIiA8PCB0aGlzIDw8ICIgcmVjb25jaWxlU2Ny b2xsaW5nU3RhdGUgc2Nyb2xsUG9zaXRpb24gIiA8PCBzY3JvbGxQb3NpdGlvbiA8PCAiIHR5cGUg IiA8PCBzY3JvbGxUeXBlIDw8ICIgc3RhYmlsaXR5ICIgPDwgdmlld3BvcnRSZWN0U3RhYmlsaXR5 IDw8ICIgIiA8PCBzY3JvbGxpbmdMYXllclBvc2l0aW9uQWN0aW9uKTsKIApAQCAtMzY3LDcgKzM2 OSw4IEBAIHZvaWQgQXN5bmNTY3JvbGxpbmdDb29yZGluYXRvcjo6cmVjb25jaWxlU2Nyb2xsaW5n U3RhdGUoRnJhbWVWaWV3JiBmcmFtZVZpZXcsIGNvCiAgICAgZnJhbWVWaWV3LnNldENvbnN0cmFp bnNTY3JvbGxpbmdUb0NvbnRlbnRFZGdlKGZhbHNlKTsKICAgICBmcmFtZVZpZXcubm90aWZ5U2Ny b2xsUG9zaXRpb25DaGFuZ2VkKHJvdW5kZWRJbnRQb2ludChzY3JvbGxQb3NpdGlvbikpOwogICAg IGZyYW1lVmlldy5zZXRDb25zdHJhaW5zU2Nyb2xsaW5nVG9Db250ZW50RWRnZSh0cnVlKTsKLSAg ICBmcmFtZVZpZXcuc2V0SW5Qcm9ncmFtbWF0aWNTY3JvbGwob2xkUHJvZ3JhbW1hdGljU2Nyb2xs KTsKKworICAgIGZyYW1lVmlldy5zZXRDdXJyZW50U2Nyb2xsVHlwZShwcmV2aW91c1Njcm9sbFR5 cGUpOwogCiAgICAgaWYgKHNjcm9sbFR5cGUgPT0gU2Nyb2xsVHlwZTo6VXNlciAmJiBzY3JvbGxp bmdMYXllclBvc2l0aW9uQWN0aW9uICE9IFNjcm9sbGluZ0xheWVyUG9zaXRpb25BY3Rpb246OlNl dCkgewogICAgICAgICBhdXRvIHNjcm9sbGluZ05vZGVJRCA9IGZyYW1lVmlldy5zY3JvbGxpbmdO b2RlSUQoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFZpZXcu Y3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsVmlldy5jcHAKaW5kZXggYTU5ODk0 N2ZiM2IwNGYzYmQxOTAwYzQ2NjgzOTAyMzQ0NmU5ZDhmMi4uMjU1ZmY2N2Y0NTY4NmU5N2RiMTEw YTIxNjM4NWM3YTQ4ZjQ4NzM1NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v U2Nyb2xsVmlldy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsVmlldy5j cHAKQEAgLTUwMSw3ICs1MDEsNyBAQCB2b2lkIFNjcm9sbFZpZXc6OnNldFNjcm9sbFBvc2l0aW9u KGNvbnN0IFNjcm9sbFBvc2l0aW9uJiBzY3JvbGxQb3NpdGlvbikKIAogICAgIFNjcm9sbFBvc2l0 aW9uIG5ld1Njcm9sbFBvc2l0aW9uID0gIWRlbGVnYXRlc1Njcm9sbGluZygpID8gYWRqdXN0U2Ny b2xsUG9zaXRpb25XaXRoaW5SYW5nZShzY3JvbGxQb3NpdGlvbikgOiBzY3JvbGxQb3NpdGlvbjsK IAotICAgIGlmICgoIWRlbGVnYXRlc1Njcm9sbGluZygpIHx8ICFpblByb2dyYW1tYXRpY1Njcm9s bCgpKSAmJiBuZXdTY3JvbGxQb3NpdGlvbiA9PSB0aGlzLT5zY3JvbGxQb3NpdGlvbigpKQorICAg IGlmICgoIWRlbGVnYXRlc1Njcm9sbGluZygpIHx8IGN1cnJlbnRTY3JvbGxUeXBlKCkgPT0gU2Ny b2xsVHlwZTo6VXNlcikgJiYgbmV3U2Nyb2xsUG9zaXRpb24gPT0gdGhpcy0+c2Nyb2xsUG9zaXRp b24oKSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgaWYgKHJlcXVlc3RTY3JvbGxQb3NpdGlvblVw ZGF0ZShuZXdTY3JvbGxQb3NpdGlvbikpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9TY3JvbGxhYmxlQXJlYS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxh YmxlQXJlYS5jcHAKaW5kZXggNzQ1OWNkZWJmYTQwMTNjYzZhNzZmMWQ1ODUzNGNjMzE2YjdiMmVh OS4uYTk4ZTVkYWI2ZWY2MGRjYWIyZjk3NzE5ZDVmMGQ4ZWNlNWVmMTMxYiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsYWJsZUFyZWEuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL1Njcm9sbGFibGVBcmVhLmNwcApAQCAtNjYsNyArNjYsNyBAQCBTY3Jv bGxhYmxlQXJlYTo6U2Nyb2xsYWJsZUFyZWEoKQogICAgICwgbV9ob3Jpem9udGFsU2Nyb2xsRWxh c3RpY2l0eShTY3JvbGxFbGFzdGljaXR5Tm9uZSkKICAgICAsIG1fc2Nyb2xsYmFyT3ZlcmxheVN0 eWxlKFNjcm9sbGJhck92ZXJsYXlTdHlsZURlZmF1bHQpCiAgICAgLCBtX3Njcm9sbE9yaWdpbkNo YW5nZWQoZmFsc2UpCi0gICAgLCBtX2luUHJvZ3JhbW1hdGljU2Nyb2xsKGZhbHNlKQorICAgICwg bV9jdXJyZW50U2Nyb2xsVHlwZShzdGF0aWNfY2FzdDx1bnNpZ25lZD4oU2Nyb2xsVHlwZTo6VXNl cikpCiAgICAgLCBtX3Njcm9sbFNob3VsZENsZWFyTGF0Y2hlZFN0YXRlKGZhbHNlKQogewogfQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsYWJsZUFyZWEuaCBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbGFibGVBcmVhLmgKaW5kZXggZjBhMDBiNjhhNDJi MTAyOWJmNGVmMjI0ZGFhODkyM2RlOWQyNDY2Ny4uZmRlNjA3ZjM4NjgyZTM5MGI5MTRlNDg2MTc4 MWZmZmExM2VhMjhhZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xs YWJsZUFyZWEuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxhYmxlQXJlYS5o CkBAIC05NSw3ICs5NSw2IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgZGlkRW5kU2Nyb2xs KCkgeyB9CiAgICAgdmlydHVhbCB2b2lkIGRpZFVwZGF0ZVNjcm9sbCgpIHsgfQogI2VuZGlmCi0g ICAgdmlydHVhbCB2b2lkIHNldElzVXNlclNjcm9sbChib29sKSB7IH0KIAogICAgIC8vIEZ1bmN0 aW9ucyBmb3IgY29udHJvbGxpbmcgaWYgeW91IGNhbiBzY3JvbGwgcGFzdCB0aGUgZW5kIG9mIHRo ZSBkb2N1bWVudC4KICAgICBib29sIGNvbnN0cmFpbnNTY3JvbGxpbmdUb0NvbnRlbnRFZGdlKCkg Y29uc3QgeyByZXR1cm4gbV9jb25zdHJhaW5zU2Nyb2xsaW5nVG9Db250ZW50RWRnZTsgfQpAQCAt MjI4LDggKzIyNyw4IEBAIHB1YmxpYzoKICAgICBXRUJDT1JFX0VYUE9SVCB2aXJ0dWFsIGJvb2wg c2Nyb2xsZWRUb0xlZnQoKSBjb25zdDsKICAgICBXRUJDT1JFX0VYUE9SVCB2aXJ0dWFsIGJvb2wg c2Nyb2xsZWRUb1JpZ2h0KCkgY29uc3Q7CiAKLSAgICBib29sIGluUHJvZ3JhbW1hdGljU2Nyb2xs KCkgY29uc3QgeyByZXR1cm4gbV9pblByb2dyYW1tYXRpY1Njcm9sbDsgfQotICAgIHZvaWQgc2V0 SW5Qcm9ncmFtbWF0aWNTY3JvbGwoYm9vbCBpblByb2dyYW1tYXRpY1Njcm9sbCkgeyBtX2luUHJv Z3JhbW1hdGljU2Nyb2xsID0gaW5Qcm9ncmFtbWF0aWNTY3JvbGw7IH0KKyAgICBTY3JvbGxUeXBl IGN1cnJlbnRTY3JvbGxUeXBlKCkgY29uc3QgeyByZXR1cm4gc3RhdGljX2Nhc3Q8U2Nyb2xsVHlw ZT4obV9jdXJyZW50U2Nyb2xsVHlwZSk7IH0KKyAgICB2b2lkIHNldEN1cnJlbnRTY3JvbGxUeXBl KFNjcm9sbFR5cGUgc2Nyb2xsVHlwZSkgeyBtX2N1cnJlbnRTY3JvbGxUeXBlID0gc3RhdGljX2Nh c3Q8dW5zaWduZWQ+KHNjcm9sbFR5cGUpOyB9CiAKICAgICBib29sIHNjcm9sbFNob3VsZENsZWFy TGF0Y2hlZFN0YXRlKCkgY29uc3QgeyByZXR1cm4gbV9zY3JvbGxTaG91bGRDbGVhckxhdGNoZWRT dGF0ZTsgfQogICAgIHZvaWQgc2V0U2Nyb2xsU2hvdWxkQ2xlYXJMYXRjaGVkU3RhdGUoYm9vbCBz aG91bGRDbGVhcikgeyBtX3Njcm9sbFNob3VsZENsZWFyTGF0Y2hlZFN0YXRlID0gc2hvdWxkQ2xl YXI7IH0KQEAgLTM5NCw3ICszOTMsNyBAQCBwcml2YXRlOgogICAgIHVuc2lnbmVkIG1fc2Nyb2xs YmFyT3ZlcmxheVN0eWxlIDogMjsgLy8gU2Nyb2xsYmFyT3ZlcmxheVN0eWxlCiAKICAgICB1bnNp Z25lZCBtX3Njcm9sbE9yaWdpbkNoYW5nZWQgOiAxOwotICAgIHVuc2lnbmVkIG1faW5Qcm9ncmFt bWF0aWNTY3JvbGwgOiAxOworICAgIHVuc2lnbmVkIG1fY3VycmVudFNjcm9sbFR5cGUgOiAxOyAv LyBTY3JvbGxUeXBlCiAgICAgdW5zaWduZWQgbV9zY3JvbGxTaG91bGRDbGVhckxhdGNoZWRTdGF0 ZSA6IDE7CiB9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy TGF5ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcAppbmRl eCAzMGRjMjQ5ZmQ5NGZkYjYwNTU4ZGY5ODQ0ZGM0YzIxOWZiOGJlOGY0Li5iMzhkMzhkMjUzMTJi MzJhMzNjMDczYTJjOTlmYzdjMmUzYzQ1ZTcwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJMYXllci5jcHAKQEAgLTMwMSw3ICszMDEsNiBAQCBSZW5kZXJMYXllcjo6UmVuZGVyTGF5 ZXIoUmVuZGVyTGF5ZXJNb2RlbE9iamVjdCYgcmVuZGVyZXJMYXllck1vZGVsT2JqZWN0KQogI2Vu ZGlmCiAgICAgLCBtX2FkanVzdEZvcklPU0NhcmV0V2hlblNjcm9sbGluZyhmYWxzZSkKICNlbmRp ZgotICAgICwgbV9pblVzZXJTY3JvbGwoZmFsc2UpCiAgICAgLCBtX3JlcXVpcmVzU2Nyb2xsUG9z aXRpb25SZWNvbmNpbGlhdGlvbihmYWxzZSkKICAgICAsIG1fY29udGFpbnNEaXJ0eU92ZXJsYXlT Y3JvbGxiYXJzKGZhbHNlKQogICAgICwgbV91cGRhdGluZ01hcnF1ZWVQb3NpdGlvbihmYWxzZSkK QEAgLTIzMjEsMTYgKzIzMjAsMTYgQEAgdm9pZCBSZW5kZXJMYXllcjo6YXBwbHlQb3N0TGF5b3V0 U2Nyb2xsUG9zaXRpb25JZk5lZWRlZCgpCiAgICAgbV9wb3N0TGF5b3V0U2Nyb2xsUG9zaXRpb24g PSBXVEY6Om51bGxvcHQ7CiB9CiAKLXZvaWQgUmVuZGVyTGF5ZXI6OnNjcm9sbFRvWFBvc2l0aW9u KGludCB4LCBTY3JvbGxUeXBlLCBTY3JvbGxDbGFtcGluZyBjbGFtcGluZykKK3ZvaWQgUmVuZGVy TGF5ZXI6OnNjcm9sbFRvWFBvc2l0aW9uKGludCB4LCBTY3JvbGxUeXBlIHNjcm9sbFR5cGUsIFNj cm9sbENsYW1waW5nIGNsYW1waW5nKQogewogICAgIFNjcm9sbFBvc2l0aW9uIHBvc2l0aW9uKHgs IG1fc2Nyb2xsUG9zaXRpb24ueSgpKTsKLSAgICBzY3JvbGxUb09mZnNldChzY3JvbGxPZmZzZXRG cm9tUG9zaXRpb24ocG9zaXRpb24pLCBjbGFtcGluZyk7CisgICAgc2Nyb2xsVG9PZmZzZXQoc2Ny b2xsT2Zmc2V0RnJvbVBvc2l0aW9uKHBvc2l0aW9uKSwgc2Nyb2xsVHlwZSwgY2xhbXBpbmcpOwog fQogCi12b2lkIFJlbmRlckxheWVyOjpzY3JvbGxUb1lQb3NpdGlvbihpbnQgeSwgU2Nyb2xsVHlw ZSwgU2Nyb2xsQ2xhbXBpbmcgY2xhbXBpbmcpCit2b2lkIFJlbmRlckxheWVyOjpzY3JvbGxUb1lQ b3NpdGlvbihpbnQgeSwgU2Nyb2xsVHlwZSBzY3JvbGxUeXBlLCBTY3JvbGxDbGFtcGluZyBjbGFt cGluZykKIHsKICAgICBTY3JvbGxQb3NpdGlvbiBwb3NpdGlvbihtX3Njcm9sbFBvc2l0aW9uLngo KSwgeSk7Ci0gICAgc2Nyb2xsVG9PZmZzZXQoc2Nyb2xsT2Zmc2V0RnJvbVBvc2l0aW9uKHBvc2l0 aW9uKSwgY2xhbXBpbmcpOworICAgIHNjcm9sbFRvT2Zmc2V0KHNjcm9sbE9mZnNldEZyb21Qb3Np dGlvbihwb3NpdGlvbiksIHNjcm9sbFR5cGUsIGNsYW1waW5nKTsKIH0KIAogU2Nyb2xsT2Zmc2V0 IFJlbmRlckxheWVyOjpjbGFtcFNjcm9sbE9mZnNldChjb25zdCBTY3JvbGxPZmZzZXQmIHNjcm9s bE9mZnNldCkgY29uc3QKQEAgLTIzMzgsMTEgKzIzMzcsMTggQEAgU2Nyb2xsT2Zmc2V0IFJlbmRl ckxheWVyOjpjbGFtcFNjcm9sbE9mZnNldChjb25zdCBTY3JvbGxPZmZzZXQmIHNjcm9sbE9mZnNl dCkgY28KICAgICByZXR1cm4gc2Nyb2xsT2Zmc2V0LmNvbnN0cmFpbmVkQmV0d2VlbihJbnRQb2lu dCgpLCBtYXhpbXVtU2Nyb2xsT2Zmc2V0KCkpOwogfQogCi12b2lkIFJlbmRlckxheWVyOjpzY3Jv bGxUb09mZnNldChjb25zdCBTY3JvbGxPZmZzZXQmIHNjcm9sbE9mZnNldCwgU2Nyb2xsQ2xhbXBp bmcgY2xhbXBpbmcpCit2b2lkIFJlbmRlckxheWVyOjpzY3JvbGxUb09mZnNldChjb25zdCBTY3Jv bGxPZmZzZXQmIHNjcm9sbE9mZnNldCwgU2Nyb2xsVHlwZSBzY3JvbGxUeXBlLCBTY3JvbGxDbGFt cGluZyBjbGFtcGluZykKIHsKICAgICBTY3JvbGxPZmZzZXQgbmV3U2Nyb2xsT2Zmc2V0ID0gY2xh bXBpbmcgPT0gU2Nyb2xsQ2xhbXBpbmc6OkNsYW1wZWQgPyBjbGFtcFNjcm9sbE9mZnNldChzY3Jv bGxPZmZzZXQpIDogc2Nyb2xsT2Zmc2V0OwotICAgIGlmIChuZXdTY3JvbGxPZmZzZXQgIT0gdGhp cy0+c2Nyb2xsT2Zmc2V0KCkpCi0gICAgICAgIHNjcm9sbFRvT2Zmc2V0V2l0aG91dEFuaW1hdGlv bihuZXdTY3JvbGxPZmZzZXQsIGNsYW1waW5nKTsKKyAgICBpZiAobmV3U2Nyb2xsT2Zmc2V0ID09 IHRoaXMtPnNjcm9sbE9mZnNldCgpKQorICAgICAgICByZXR1cm47CisKKyAgICBhdXRvIHByZXZp b3VzU2Nyb2xsVHlwZSA9IGN1cnJlbnRTY3JvbGxUeXBlKCk7CisgICAgc2V0Q3VycmVudFNjcm9s bFR5cGUoc2Nyb2xsVHlwZSk7CisKKyAgICBzY3JvbGxUb09mZnNldFdpdGhvdXRBbmltYXRpb24o bmV3U2Nyb2xsT2Zmc2V0LCBjbGFtcGluZyk7CisKKyAgICBzZXRDdXJyZW50U2Nyb2xsVHlwZShw cmV2aW91c1Njcm9sbFR5cGUpOwogfQogCiB2b2lkIFJlbmRlckxheWVyOjpzY3JvbGxUbyhjb25z dCBTY3JvbGxQb3NpdGlvbiYgcG9zaXRpb24pCkBAIC0yMzUxLDcgKzIzNTcsNyBAQCB2b2lkIFJl bmRlckxheWVyOjpzY3JvbGxUbyhjb25zdCBTY3JvbGxQb3NpdGlvbiYgcG9zaXRpb24pCiAgICAg aWYgKCFib3gpCiAgICAgICAgIHJldHVybjsKIAotICAgIExPR19XSVRIX1NUUkVBTShTY3JvbGxp bmcsIHN0cmVhbSA8PCAiUmVuZGVyTGF5ZXI6OnNjcm9sbFRvICIgPDwgcG9zaXRpb24gPDwgIiBm cm9tICIgPDwgbV9zY3JvbGxQb3NpdGlvbiA8PCAiIChpbiB1c2VyIHNjcm9sbCAiIDw8IGlzSW5V c2VyU2Nyb2xsKCkgPDwgIikiKTsKKyAgICBMT0dfV0lUSF9TVFJFQU0oU2Nyb2xsaW5nLCBzdHJl YW0gPDwgIlJlbmRlckxheWVyOjpzY3JvbGxUbyAiIDw8IHBvc2l0aW9uIDw8ICIgZnJvbSAiIDw8 IG1fc2Nyb2xsUG9zaXRpb24gPDwgIiAoaXMgdXNlciBzY3JvbGwgIiA8PCAoY3VycmVudFNjcm9s bFR5cGUoKSA9PSBTY3JvbGxUeXBlOjpVc2VyKSA8PCAiKSIpOwogCiAgICAgU2Nyb2xsUG9zaXRp b24gbmV3UG9zaXRpb24gPSBwb3NpdGlvbjsKICAgICBpZiAoIWJveC0+aXNIVE1MTWFycXVlZSgp KSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaCBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5oCmluZGV4IGE0NjlkYzg2OTdl YTIxNjdiNDkwNmNiM2I3NGFhM2YyMWFkY2RlMTAuLjc4MmE5NjU5OTU5Y2FjZDAyYTMwYzFhNDA3 YTk4NTZhODA5MDk3MDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJMYXllci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5oCkBA IC00MTQsMTMgKzQxNCwxNSBAQCBwdWJsaWM6CiAgICAgLy8gU2Nyb2xsaW5nIG1ldGhvZHMgZm9y IGxheWVycyB0aGF0IGNhbiBzY3JvbGwgdGhlaXIgb3ZlcmZsb3cuCiAgICAgdm9pZCBzY3JvbGxC eVJlY3Vyc2l2ZWx5KGNvbnN0IEludFNpemUmIGRlbHRhLCBTY3JvbGxhYmxlQXJlYSoqIHNjcm9s bGVkQXJlYSA9IG51bGxwdHIpOwogCi0gICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBzY3JvbGxUb09m ZnNldChjb25zdCBTY3JvbGxPZmZzZXQmLCBTY3JvbGxDbGFtcGluZyA9IFNjcm9sbENsYW1waW5n OjpDbGFtcGVkKTsKLSAgICB2b2lkIHNjcm9sbFRvWE9mZnNldChpbnQgeCwgU2Nyb2xsQ2xhbXBp bmcgY2xhbXBpbmcgPSBTY3JvbGxDbGFtcGluZzo6Q2xhbXBlZCkgeyBzY3JvbGxUb09mZnNldChT Y3JvbGxPZmZzZXQoeCwgc2Nyb2xsT2Zmc2V0KCkueSgpKSwgY2xhbXBpbmcpOyB9Ci0gICAgdm9p ZCBzY3JvbGxUb1lPZmZzZXQoaW50IHksIFNjcm9sbENsYW1waW5nIGNsYW1waW5nID0gU2Nyb2xs Q2xhbXBpbmc6OkNsYW1wZWQpIHsgc2Nyb2xsVG9PZmZzZXQoU2Nyb2xsT2Zmc2V0KHNjcm9sbE9m ZnNldCgpLngoKSwgeSksIGNsYW1waW5nKTsgfQorICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgc2Ny b2xsVG9PZmZzZXQoY29uc3QgU2Nyb2xsT2Zmc2V0JiwgU2Nyb2xsVHlwZSA9IFNjcm9sbFR5cGU6 OlByb2dyYW1tYXRpYywgU2Nyb2xsQ2xhbXBpbmcgPSBTY3JvbGxDbGFtcGluZzo6Q2xhbXBlZCk7 CiAKICAgICB2b2lkIHNjcm9sbFRvWFBvc2l0aW9uKGludCB4LCBTY3JvbGxUeXBlLCBTY3JvbGxD bGFtcGluZyA9IFNjcm9sbENsYW1waW5nOjpDbGFtcGVkKTsKICAgICB2b2lkIHNjcm9sbFRvWVBv c2l0aW9uKGludCB5LCBTY3JvbGxUeXBlLCBTY3JvbGxDbGFtcGluZyA9IFNjcm9sbENsYW1waW5n OjpDbGFtcGVkKTsKIAorICAgIC8vIFRoZXNlIGFyZSBvbmx5IHVzZWQgYnkgbWFycXVlZS4KKyAg ICB2b2lkIHNjcm9sbFRvWE9mZnNldChpbnQgeCwgU2Nyb2xsQ2xhbXBpbmcgY2xhbXBpbmcgPSBT Y3JvbGxDbGFtcGluZzo6Q2xhbXBlZCkgeyBzY3JvbGxUb09mZnNldChTY3JvbGxPZmZzZXQoeCwg c2Nyb2xsT2Zmc2V0KCkueSgpKSwgU2Nyb2xsVHlwZTo6UHJvZ3JhbW1hdGljLCBjbGFtcGluZyk7 IH0KKyAgICB2b2lkIHNjcm9sbFRvWU9mZnNldChpbnQgeSwgU2Nyb2xsQ2xhbXBpbmcgY2xhbXBp bmcgPSBTY3JvbGxDbGFtcGluZzo6Q2xhbXBlZCkgeyBzY3JvbGxUb09mZnNldChTY3JvbGxPZmZz ZXQoc2Nyb2xsT2Zmc2V0KCkueCgpLCB5KSwgU2Nyb2xsVHlwZTo6UHJvZ3JhbW1hdGljLCBjbGFt cGluZyk7IH0KKwogICAgIHZvaWQgc2V0UG9zdExheW91dFNjcm9sbFBvc2l0aW9uKE9wdGlvbmFs PFNjcm9sbFBvc2l0aW9uPik7CiAgICAgdm9pZCBhcHBseVBvc3RMYXlvdXRTY3JvbGxQb3NpdGlv bklmTmVlZGVkKCk7CiAKQEAgLTQ1OSw5ICs0NjEsNiBAQCBwdWJsaWM6CiAgICAgdm9pZCB1cGRh dGVTbmFwT2Zmc2V0cygpIG92ZXJyaWRlOwogI2VuZGlmCiAKLSAgICB2b2lkIHNldElzVXNlclNj cm9sbChib29sIGlzVXNlclNjcm9sbCkgb3ZlcnJpZGUgeyBtX2luVXNlclNjcm9sbCA9IGlzVXNl clNjcm9sbDsgfQotICAgIGJvb2wgaXNJblVzZXJTY3JvbGwoKSBjb25zdCB7IHJldHVybiBtX2lu VXNlclNjcm9sbDsgfQotCiAgICAgYm9vbCByZXF1aXJlc1Njcm9sbFBvc2l0aW9uUmVjb25jaWxp YXRpb24oKSBjb25zdCB7IHJldHVybiBtX3JlcXVpcmVzU2Nyb2xsUG9zaXRpb25SZWNvbmNpbGlh dGlvbjsgfQogICAgIHZvaWQgc2V0UmVxdWlyZXNTY3JvbGxQb3NpdGlvblJlY29uY2lsaWF0aW9u KGJvb2wgcmVxdWlyZXNSZWNvbmNpbGlhdGlvbiA9IHRydWUpIHsgbV9yZXF1aXJlc1Njcm9sbFBv c2l0aW9uUmVjb25jaWxpYXRpb24gPSByZXF1aXJlc1JlY29uY2lsaWF0aW9uOyB9CiAKQEAgLTEy MjAsNyArMTIxOSw2IEBAIHByaXZhdGU6CiAgICAgYm9vbCBtX2FkanVzdEZvcklPU0NhcmV0V2hl blNjcm9sbGluZyA6IDE7CiAjZW5kaWYKIAotICAgIGJvb2wgbV9pblVzZXJTY3JvbGwgOiAxOwog ICAgIGJvb2wgbV9yZXF1aXJlc1Njcm9sbFBvc2l0aW9uUmVjb25jaWxpYXRpb24gOiAxOwogICAg IGJvb2wgbV9jb250YWluc0RpcnR5T3ZlcmxheVNjcm9sbGJhcnMgOiAxOwogICAgIGJvb2wgbV91 cGRhdGluZ01hcnF1ZWVQb3NpdGlvbiA6IDE7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJMYXllckJhY2tpbmcuY3BwCmluZGV4IDVlMmYxZjhmYTU2MDc2NjE5YmZlM2VmZmI4 ZjdjYWE4MDYyYzFkOTYuLmU3NDY5ZDU5Yzk5YTQwZTJiZDdhZWMxZTBmY2I0ZWQzMTcxNGJiNWUg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3Bw CkBAIC0xMjYyLDcgKzEyNjIsNyBAQCB2b2lkIFJlbmRlckxheWVyQmFja2luZzo6c2V0TG9jYXRp b25PZlNjcm9sbGVkQ29udGVudHMoU2Nyb2xsT2Zmc2V0IHNjcm9sbE9mZnNldAogCiB2b2lkIFJl bmRlckxheWVyQmFja2luZzo6dXBkYXRlU2Nyb2xsT2Zmc2V0KFNjcm9sbE9mZnNldCBzY3JvbGxP ZmZzZXQpCiB7Ci0gICAgaWYgKG1fb3duaW5nTGF5ZXIuaXNJblVzZXJTY3JvbGwoKSkgeworICAg IGlmIChtX293bmluZ0xheWVyLmN1cnJlbnRTY3JvbGxUeXBlKCkgPT0gU2Nyb2xsVHlwZTo6VXNl cikgewogICAgICAgICAvLyBJZiBzY3JvbGxpbmcgaXMgaGFwcGVuaW5nIGV4dGVybmFsbHksIHdl IGRvbid0IHdhbnQgdG8gdG91Y2ggdGhlIGxheWVyIGJvdW5kcyBvcmlnaW4gaGVyZSBiZWNhdXNl IHRoYXQgd2lsbCBjYXVzZSBqaXR0ZXIuCiAgICAgICAgIHNldExvY2F0aW9uT2ZTY3JvbGxlZENv bnRlbnRzKHNjcm9sbE9mZnNldCwgU2Nyb2xsaW5nTGF5ZXJQb3NpdGlvbkFjdGlvbjo6U3luYyk7 CiAgICAgICAgIG1fb3duaW5nTGF5ZXIuc2V0UmVxdWlyZXNTY3JvbGxQb3NpdGlvblJlY29uY2ls aWF0aW9uKHRydWUpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ck1hcnF1ZWUuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck1hcnF1ZWUuY3Bw CmluZGV4IGYxYjcwM2I5N2Q4NGExZThkMDA2NzdjMjk3ZTI3ZTU2ZjUzYmRkYjMuLjk4ODQxNjlk ZTg5MTNmNzU5ZWM3YWVjMDI0YTBkZWMwNjk1NjA4ZTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJNYXJxdWVlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyTWFycXVlZS5jcHAKQEAgLTE3Myw5ICsxNzMsOSBAQCB2b2lkIFJlbmRlck1h cnF1ZWU6OnN0YXJ0KCkKIAogICAgIGlmICghbV9zdXNwZW5kZWQgJiYgIW1fc3RvcHBlZCkgewog ICAgICAgICBpZiAoaXNIb3Jpem9udGFsKCkpCi0gICAgICAgICAgICBtX2xheWVyLT5zY3JvbGxU b09mZnNldChTY3JvbGxPZmZzZXQobV9zdGFydCwgMCksIFNjcm9sbENsYW1waW5nOjpVbmNsYW1w ZWQpOworICAgICAgICAgICAgbV9sYXllci0+c2Nyb2xsVG9PZmZzZXQoU2Nyb2xsT2Zmc2V0KG1f c3RhcnQsIDApLCBTY3JvbGxUeXBlOjpQcm9ncmFtbWF0aWMsIFNjcm9sbENsYW1waW5nOjpVbmNs YW1wZWQpOwogICAgICAgICBlbHNlCi0gICAgICAgICAgICBtX2xheWVyLT5zY3JvbGxUb09mZnNl dChTY3JvbGxPZmZzZXQoMCwgbV9zdGFydCksIFNjcm9sbENsYW1waW5nOjpVbmNsYW1wZWQpOwor ICAgICAgICAgICAgbV9sYXllci0+c2Nyb2xsVG9PZmZzZXQoU2Nyb2xsT2Zmc2V0KDAsIG1fc3Rh cnQpLCBTY3JvbGxUeXBlOjpQcm9ncmFtbWF0aWMsIFNjcm9sbENsYW1waW5nOjpVbmNsYW1wZWQp OwogICAgIH0gZWxzZSB7CiAgICAgICAgIG1fc3VzcGVuZGVkID0gZmFsc2U7CiAgICAgICAgIG1f c3RvcHBlZCA9IGZhbHNlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvRE9N L0RPTUhUTUwubW0gYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9ET00vRE9NSFRNTC5tbQppbmRl eCAyMmIwMDk3OWNlMDQyNjI2NGRmY2I4MGNjN2FkMTY5MGRjMzE5OTE5Li4xMDE2ODM1ZDY1YmFh MTRiZTMwMTUwZTNjMzIxYTQ2MzIzNGE5ZTFlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0TGVn YWN5L21hYy9ET00vRE9NSFRNTC5tbQorKysgYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9ET00v RE9NSFRNTC5tbQpAQCAtMTE1LDcgKzExNSw3IEBAIC0gKHZvaWQpc2V0U2Nyb2xsWE9mZnNldDoo aW50KXggc2Nyb2xsWU9mZnNldDooaW50KXkgYWRqdXN0Rm9ySU9TQ2FyZXQ6KEJPT0wpYWRqCiAg ICAgUmVuZGVyTGF5ZXIqIGxheWVyID0gZG93bmNhc3Q8UmVuZGVyQm94PigqcmVuZGVyZXIpLmxh eWVyKCk7CiAgICAgaWYgKGFkanVzdEZvcklPU0NhcmV0KQogICAgICAgICBsYXllci0+c2V0QWRq dXN0Rm9ySU9TQ2FyZXRXaGVuU2Nyb2xsaW5nKHRydWUpOwotICAgIGxheWVyLT5zY3JvbGxUb09m ZnNldChTY3JvbGxPZmZzZXQoeCwgeSksIFNjcm9sbENsYW1waW5nOjpVbmNsYW1wZWQpOworICAg IGxheWVyLT5zY3JvbGxUb09mZnNldChTY3JvbGxPZmZzZXQoeCwgeSksIFNjcm9sbFR5cGU6OlBy b2dyYW1tYXRpYywgU2Nyb2xsQ2xhbXBpbmc6OlVuY2xhbXBlZCk7CiAgICAgaWYgKGFkanVzdEZv cklPU0NhcmV0KQogICAgICAgICBsYXllci0+c2V0QWRqdXN0Rm9ySU9TQ2FyZXRXaGVuU2Nyb2xs aW5nKGZhbHNlKTsKIH0K