213746 2020-06-29 11:57:15 -0700 [iOS 14] A couple of tests in editing/selection/ios fail after <rdar://problem/60978283> 2020-06-29 16:59:04 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 wenson_hsieh wenson_hsieh hi megan_gardner thorton webkit-bug-importer oldest_to_newest 1667213 0 wenson_hsieh 2020-06-29 11:57:15 -0700 More work towards <rdar://problem/64808138> These two tests are: • editing/selection/ios/select-text-in-existing-selection.html • editing/selection/ios/selection-extends-into-overflow-area.html 1667282 1 403116 wenson_hsieh 2020-06-29 14:41:43 -0700 Created attachment 403116 Patch 1667290 2 403116 hi 2020-06-29 15:12:33 -0700 Comment on attachment 403116 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=403116&action=review r=me, with some NITs > LayoutTests/editing/selection/ios/select-text-in-existing-selection.html:28 > +editor = document.querySelector("div[contenteditable]"); > +target = document.getElementById("target"); NIT: `let`? > LayoutTests/resources/ui-helper.js:135 > + const x = element.offsetLeft + element.offsetWidth / 2; > + const y = element.offsetTop + element.offsetHeight / 2; NIT: I'd add parenthesis around the `/ 2` to avoid ambiguity/complexity while reading > LayoutTests/resources/ui-helper.js:1103 > + new Promise(resolve => target.addEventListener(eventName, e => { NIT: for readability, I usually avoid using inlined arrow functions unless I am intentionally using the implicit return value ``` new Promise((eventListenerResolve) => { target.addEventListener(eventName, (e) => { event = e; eventListenerResolve(); }, {once: true}) }), ``` NIT: I'd also recommend using a different variable name other than `resolve` to avoid shadowing 1667332 3 403116 wenson_hsieh 2020-06-29 16:05:30 -0700 Comment on attachment 403116 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=403116&action=review >> LayoutTests/editing/selection/ios/select-text-in-existing-selection.html:28 >> +target = document.getElementById("target"); > > NIT: `let`? 👍🏻 >> LayoutTests/resources/ui-helper.js:135 >> + const y = element.offsetTop + element.offsetHeight / 2; > > NIT: I'd add parenthesis around the `/ 2` to avoid ambiguity/complexity while reading 👍🏻 >> LayoutTests/resources/ui-helper.js:1103 >> + new Promise(resolve => target.addEventListener(eventName, e => { > > NIT: for readability, I usually avoid using inlined arrow functions unless I am intentionally using the implicit return value > ``` > new Promise((eventListenerResolve) => { > target.addEventListener(eventName, (e) => { > event = e; > eventListenerResolve(); > }, {once: true}) > }), > ``` > > NIT: I'd also recommend using a different variable name other than `resolve` to avoid shadowing Sounds good! Changed from inline => to => { … }, and also renamed the two inner `resolve`s to avoid shadowing. 1667334 4 403130 wenson_hsieh 2020-06-29 16:09:28 -0700 Created attachment 403130 Patch for landing 1667362 5 ews-feeder 2020-06-29 16:59:04 -0700 Committed r263708: <https://trac.webkit.org/changeset/263708> All reviewed patches have been landed. Closing bug and clearing flags on attachment 403130. 403116 2020-06-29 14:41:43 -0700 2020-06-29 15:12:33 -0700 Patch bug-213746-20200629144142.patch text/plain 9166 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjYzNjI3CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggOGQwOGM5ZWI0YjI4MDQwM2EwNzIx ZjRkZmQ3ZTE5ZjUzODI1Mzk0OS4uNjMxN2M5OTM2NWY4YWIxMTc5NmI1ZjM1MWYzNjczNDMxZTEx NjIwZiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwpAQCAtMSwzICsxLDM5IEBACisyMDIwLTA2LTI5ICBXZW5zb24gSHNpZWggIDx3 ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIFtpT1MgMTRdIEEgY291cGxlIG9mIHRl c3RzIGluIGVkaXRpbmcvc2VsZWN0aW9uL2lvcyBmYWlsIGFmdGVyIDxyZGFyOi8vcHJvYmxlbS82 MDk3ODI4Mz4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIxMzc0NgorICAgICAgICBNb3JlIHdvcmsgdG93YXJkcyA8cmRhcjovL3Byb2JsZW0vNjQ4MDgx Mzg+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhl IFVJS2l0IGNoYW5nZSBpbiA8cmRhcjovL3Byb2JsZW0vNjA5NzgyODM+IGFkanVzdHMgdGV4dCBp bnRlcmFjdGlvbiBiZWhhdmlvcnMgc3VjaCB0aGF0IGEgbG9uZyBwcmVzcyBnZXN0dXJlCisgICAg ICAgIHdoaWxlIGVkaXRpbmcgbWFrZXMgYSBuZXcgY2FyZXQgc2VsZWN0aW9uLCByYXRoZXIgdGhh biBhIG5ldyB3b3JkLWdyYW51bGFyaXR5IHNlbGVjdGlvbi4gVHdlYWsgYSBjb3VwbGUgb2YKKyAg ICAgICAgbGF5b3V0IHRlc3RzIGluIGVkaXRpbmcvc2VsZWN0aW9uL2lvcyB0aGF0IGN1cnJlbnRs eSBhc3N1bWUgdGhhdCBsb25nIHByZXNzZXMgd2hpbGUgZWRpdGluZyB3aWxsIHNlbGVjdCBhIHdv cmQuCisKKyAgICAgICAgKiBlZGl0aW5nL3NlbGVjdGlvbi9pb3Mvc2VsZWN0LXRleHQtaW4tZXhp c3Rpbmctc2VsZWN0aW9uLWV4cGVjdGVkLnR4dDoKKyAgICAgICAgKiBlZGl0aW5nL3NlbGVjdGlv bi9pb3Mvc2VsZWN0LXRleHQtaW4tZXhpc3Rpbmctc2VsZWN0aW9uLmh0bWw6CisKKyAgICAgICAg VGhpcyB0ZXN0IHZlcmlmaWVzIHRoYXQgdGhlIHNlbGVjdGlvbiBjYW4gYmUgY2hhbmdlZCBieSBt YWtpbmcgYSBsb25nIHByZXNzIGluc2lkZSBhbiBleGlzdGluZyBzZWxlY3Rpb24uCisgICAgICAg IEhvd2V2ZXIsIGl0IG5vdyBmYWlscyBhZnRlciB0aGUgY2hhbmdlcyBpbiA8cmRhcjovL3Byb2Js ZW0vNjA5NzgyODM+IGJlY2F1c2UgaXQgZXhwZWN0cyB0aGUgc2VsZWN0ZWQgdGV4dCB0byBiZQor ICAgICAgICAianVtcGVkIiwgYnV0IGluc3RlYWQsIHRoZSBzZWxlY3Rpb24gZW5kcyB1cCBiZWlu ZyBhIGNhcmV0IGluc2lkZSB0aGUgd29yZCAianVtcGVkIi4gVHdlYWsgdGhpcyB0ZXN0IHRvIHZl cmlmeQorICAgICAgICB0aGF0IHRoZSBzZWxlY3Rpb24gYW5jaG9ycycgY29tbW9uIGFuY2VzdG9y IG5vZGUgaXMgdGhlIHRleHQgbm9kZSB3aXRoIHRoZSB0ZXh0ICJqdW1wZWQiIGluc3RlYWQsIHRv IGhhbmRsZSBib3RoCisgICAgICAgIHBvc3NpYmlsaXRpZXMgKHdoZXJlIGEgbG9uZyBwcmVzcyBz ZWxlY3RzIGEgd29yZCB2cy4gc2V0cyBhIGNhcmV0IHNlbGVjdGlvbikuCisKKyAgICAgICAgKiBl ZGl0aW5nL3NlbGVjdGlvbi9pb3Mvc2VsZWN0aW9uLWV4dGVuZHMtaW50by1vdmVyZmxvdy1hcmVh Lmh0bWw6CisKKyAgICAgICAgVGhpcyB0ZXN0IHZlcmlmaWVzIHRoZSBwb3NpdGlvbiBhbmQgc2l6 ZSBvZiBhIHJhbmdlZCBzZWxlY3Rpb24gbWFkZSBpbnNpZGUgY29udGVudCB0aGF0IHZpc2libHkg b3ZlcmZsb3dzIGl0cworICAgICAgICBwYXJlbnQgY29udGFpbmVyLiBJdCBub3cgZmFpbHMgYmVj YXVzZSBpdCB0cmllcyB0byBsb25nIHByZXNzIHRoZSB3b3JkIHRvIG1ha2UgYSBzZWxlY3Rpb247 IGluc3RlYWQsIHVzZSBhCisgICAgICAgIGRvdWJsZSB0YXAgZ2VzdHVyZSB0byBtYWtlIHRoZSB3 b3JkIHNlbGVjdGlvbi4KKworICAgICAgICAqIHJlc291cmNlcy91aS1oZWxwZXIuanM6CisgICAg ICAgICh3aW5kb3cuVUlIZWxwZXIuZG91YmxlVGFwRWxlbWVudCk6CisKKyAgICAgICAgQWRkIGEg bmV3IGhlbHBlciBtZXRob2QgdGhhdCBkb3VibGUgdGFwcyBpbiB0aGUgbWlkZGxlIG9mIHRoZSBn aXZlbiBlbGVtZW50LgorCisgICAgICAgICh3aW5kb3cuVUlIZWxwZXIuY2FsbEZ1bmN0aW9uQW5k V2FpdEZvckV2ZW50KToKKworICAgICAgICBBZGp1c3QgdGhpcyBoZWxwZXIgbWV0aG9kIHRvIHdh aXQgZm9yIHRoZSBnaXZlbiBmdW5jdGlvbiB0byByZXNvbHZlLCBpZiB0aGUgZ2l2ZW4gZnVuY3Rp b24gcmV0dXJucyBhIFByb21pc2UuCisKIDIwMjAtMDYtMjcgIENocmlzIER1bWV6ICA8Y2R1bWV6 QGFwcGxlLmNvbT4KIAogICAgICAgICBVcGRhdGUgd2ViLXBsYXRmb3JtLXRlc3RzL2NvcnMgZnJv bSB1cHN0cmVhbQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZWRpdGluZy9zZWxlY3Rpb24vaW9z L3NlbGVjdC10ZXh0LWluLWV4aXN0aW5nLXNlbGVjdGlvbi1leHBlY3RlZC50eHQgYi9MYXlvdXRU ZXN0cy9lZGl0aW5nL3NlbGVjdGlvbi9pb3Mvc2VsZWN0LXRleHQtaW4tZXhpc3Rpbmctc2VsZWN0 aW9uLWV4cGVjdGVkLnR4dAppbmRleCA1ZWViYjgzMGM2MGNkZTUyMmIzY2FlNTZjN2FkOGFmNjA4 MmRhNmFmLi4wYmU2OGJhMmE4ZDM5Y2M4MDNhOTA5MmQ5MGFhODliYjU1MmIxNzM4IDEwMDY0NAot LS0gYS9MYXlvdXRUZXN0cy9lZGl0aW5nL3NlbGVjdGlvbi9pb3Mvc2VsZWN0LXRleHQtaW4tZXhp c3Rpbmctc2VsZWN0aW9uLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9lZGl0aW5nL3Nl bGVjdGlvbi9pb3Mvc2VsZWN0LXRleHQtaW4tZXhpc3Rpbmctc2VsZWN0aW9uLWV4cGVjdGVkLnR4 dApAQCAtMSwxMCArMSwxMCBAQAogVGhlIHF1aWNrIGJyb3duIGZveCBqdW1wZWQgb3ZlciB0aGUg bGF6eSBkb2cuCi1UaGlzIHRlc3QgdmVyaWZpZXMgdGhhdCB0aGUgc2VsZWN0aW9uIGNhbiBiZSBt b2RpZmllZCB2aWEgbG9uZyBwcmVzcyBpbnNpZGUgYW4gZXhpc3Rpbmcgc2VsZWN0aW9uLiBUbyBt YW51YWxseSB0ZXN0LCBzZWxlY3QgYWxsIHRoZSB0ZXh0IGluIHRoZSBlZGl0YWJsZSBhcmVhIGFu ZCBsb25nIHByZXNzIG9uIGEgd29yZCB0byBzZWxlY3QgaXQuCitUaGlzIHRlc3QgdmVyaWZpZXMg dGhhdCB0aGUgc2VsZWN0aW9uIGNhbiBiZSBtb2RpZmllZCB2aWEgbG9uZyBwcmVzcyBpbnNpZGUg YW4gZXhpc3Rpbmcgc2VsZWN0aW9uLiBUbyBtYW51YWxseSB0ZXN0LCBzZWxlY3QgYWxsIHRoZSB0 ZXh0IGluIHRoZSBlZGl0YWJsZSBhcmVhIGFuZCBsb25nIHByZXNzIG9uIGEgd29yZCB0byBjaGFu Z2UgdGhlIHNlbGVjdGlvbi4KIAogT24gc3VjY2VzcywgeW91IHdpbGwgc2VlIGEgc2VyaWVzIG9m ICJQQVNTIiBtZXNzYWdlcywgZm9sbG93ZWQgYnkgIlRFU1QgQ09NUExFVEUiLgogCiAKLVBBU1Mg Z2V0U2VsZWN0aW9uKCkudG9TdHJpbmcoKSBpcyAianVtcGVkIgorUEFTUyBnZXRTZWxlY3Rpb24o KS5nZXRSYW5nZUF0KDApLmNvbW1vbkFuY2VzdG9yQ29udGFpbmVyIGlzIHRhcmdldC5jaGlsZE5v ZGVzWzBdCiBQQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCiAKIFRFU1QgQ09NUExFVEUK ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2VkaXRpbmcvc2VsZWN0aW9uL2lvcy9zZWxlY3QtdGV4 dC1pbi1leGlzdGluZy1zZWxlY3Rpb24uaHRtbCBiL0xheW91dFRlc3RzL2VkaXRpbmcvc2VsZWN0 aW9uL2lvcy9zZWxlY3QtdGV4dC1pbi1leGlzdGluZy1zZWxlY3Rpb24uaHRtbAppbmRleCA2OTcz Nzk1MzkyMjcxNTM3NWEzNmRmMWYwNWMyMTZmNDMzY2IwZjQ3Li41NTNhYjhmMmJjNzJhOThlYzIz OTVlODkyYzk1OWY4N2NjMTFjMWM3IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9lZGl0aW5nL3Nl bGVjdGlvbi9pb3Mvc2VsZWN0LXRleHQtaW4tZXhpc3Rpbmctc2VsZWN0aW9uLmh0bWwKKysrIGIv TGF5b3V0VGVzdHMvZWRpdGluZy9zZWxlY3Rpb24vaW9zL3NlbGVjdC10ZXh0LWluLWV4aXN0aW5n LXNlbGVjdGlvbi5odG1sCkBAIC0xMiw5ICsxMiw5IEBAIGJvZHksIGh0bWwgewogCiBkaXZbY29u dGVudGVkaXRhYmxlXSB7CiAgICAgd2lkdGg6IDMwMHB4OwotICAgIGhlaWdodDogMzAwcHg7Cisg ICAgaGVpZ2h0OiA0MDBweDsKICAgICBib3JkZXI6IDFweCBzb2xpZCBibGFjazsKLSAgICBmb250 LXNpemU6IDMycHg7CisgICAgZm9udC1zaXplOiA2NHB4OwogfQogPC9zdHlsZT4KIDwvaGVhZD4K QEAgLTI0LDE5ICsyNCwxOCBAQCBkaXZbY29udGVudGVkaXRhYmxlXSB7CiA8cCBpZD0iY29uc29s ZSI+PC9wPgogPHNjcmlwdD4KIGpzVGVzdElzQXN5bmMgPSB0cnVlOwotZGVzY3JpcHRpb24oIlRo aXMgdGVzdCB2ZXJpZmllcyB0aGF0IHRoZSBzZWxlY3Rpb24gY2FuIGJlIG1vZGlmaWVkIHZpYSBs b25nIHByZXNzIGluc2lkZSBhbiBleGlzdGluZyBzZWxlY3Rpb24uIFRvIG1hbnVhbGx5IHRlc3Qs IHNlbGVjdCBhbGwgdGhlIHRleHQgaW4gdGhlIGVkaXRhYmxlIGFyZWEgYW5kIGxvbmcgcHJlc3Mg b24gYSB3b3JkIHRvIHNlbGVjdCBpdC4iKTsKK2VkaXRvciA9IGRvY3VtZW50LnF1ZXJ5U2VsZWN0 b3IoImRpdltjb250ZW50ZWRpdGFibGVdIik7Cit0YXJnZXQgPSBkb2N1bWVudC5nZXRFbGVtZW50 QnlJZCgidGFyZ2V0Iik7CisKK2Rlc2NyaXB0aW9uKCJUaGlzIHRlc3QgdmVyaWZpZXMgdGhhdCB0 aGUgc2VsZWN0aW9uIGNhbiBiZSBtb2RpZmllZCB2aWEgbG9uZyBwcmVzcyBpbnNpZGUgYW4gZXhp c3Rpbmcgc2VsZWN0aW9uLiBUbyBtYW51YWxseSB0ZXN0LCBzZWxlY3QgYWxsIHRoZSB0ZXh0IGlu IHRoZSBlZGl0YWJsZSBhcmVhIGFuZCBsb25nIHByZXNzIG9uIGEgd29yZCB0byBjaGFuZ2UgdGhl IHNlbGVjdGlvbi4iKTsKIGRvY3VtZW50LmFkZEV2ZW50TGlzdGVuZXIoImRyYWdzdGFydCIsIGV2 ZW50ID0+IGV2ZW50LnByZXZlbnREZWZhdWx0KCkpOwogCiBhZGRFdmVudExpc3RlbmVyKCJsb2Fk IiwgYXN5bmMgKCkgPT4gewotICAgIGNvbnN0IGVkaXRvciA9IGRvY3VtZW50LnF1ZXJ5U2VsZWN0 b3IoImRpdltjb250ZW50ZWRpdGFibGVdIik7Ci0gICAgY29uc3QgbG9uZ1ByZXNzVGFyZ2V0ID0g ZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInRhcmdldCIpOwotCiAgICAgYXdhaXQgVUlIZWxwZXIu YWN0aXZhdGVFbGVtZW50QW5kV2FpdEZvcklucHV0U2Vzc2lvbihlZGl0b3IpOwogICAgIGRvY3Vt ZW50LmV4ZWNDb21tYW5kKCJTZWxlY3RBbGwiKTsKICAgICBhd2FpdCBVSUhlbHBlci53YWl0Rm9y U2VsZWN0aW9uVG9BcHBlYXIoKTsKLSAgICBhd2FpdCBVSUhlbHBlci5sb25nUHJlc3NFbGVtZW50 KGxvbmdQcmVzc1RhcmdldCk7Ci0KLSAgICBzaG91bGRCZUVxdWFsVG9TdHJpbmcoImdldFNlbGVj dGlvbigpLnRvU3RyaW5nKCkiLCAianVtcGVkIik7CisgICAgYXdhaXQgVUlIZWxwZXIubG9uZ1By ZXNzRWxlbWVudCh0YXJnZXQpOworICAgIHNob3VsZEJlKCJnZXRTZWxlY3Rpb24oKS5nZXRSYW5n ZUF0KDApLmNvbW1vbkFuY2VzdG9yQ29udGFpbmVyIiwgInRhcmdldC5jaGlsZE5vZGVzWzBdIik7 CiAgICAgZmluaXNoSlNUZXN0KCk7CiB9KTsKIDwvc2NyaXB0PgpkaWZmIC0tZ2l0IGEvTGF5b3V0 VGVzdHMvZWRpdGluZy9zZWxlY3Rpb24vaW9zL3NlbGVjdGlvbi1leHRlbmRzLWludG8tb3ZlcmZs b3ctYXJlYS5odG1sIGIvTGF5b3V0VGVzdHMvZWRpdGluZy9zZWxlY3Rpb24vaW9zL3NlbGVjdGlv bi1leHRlbmRzLWludG8tb3ZlcmZsb3ctYXJlYS5odG1sCmluZGV4IDczZmNiZWI0YTU4NzdlNmI3 ZTg3YjRmY2I5YTg0ZWU1MDEwNGI2NmEuLmMxYWUxY2Q4MTI3ZjQzMjk5ZDMxNGI5NTUyY2U0ZWZh YTRlNWJhMzIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2VkaXRpbmcvc2VsZWN0aW9uL2lvcy9z ZWxlY3Rpb24tZXh0ZW5kcy1pbnRvLW92ZXJmbG93LWFyZWEuaHRtbAorKysgYi9MYXlvdXRUZXN0 cy9lZGl0aW5nL3NlbGVjdGlvbi9pb3Mvc2VsZWN0aW9uLWV4dGVuZHMtaW50by1vdmVyZmxvdy1h cmVhLmh0bWwKQEAgLTIzLDE4ICsyMyw2IEBACiAgICAgICAgICAgICB0ZXN0UnVubmVyLndhaXRV bnRpbERvbmUoKTsKICAgICAgICAgfQogCi0gICAgICAgIGZ1bmN0aW9uIHNlbGVjdFRleHRBdCh0 YXBYLCB0YXBZKQotICAgICAgICB7Ci0gICAgICAgICAgICByZXR1cm4gbmV3IFByb21pc2UocmVz b2x2ZSA9PiB7Ci0gICAgICAgICAgICAgICAgdGVzdFJ1bm5lci5ydW5VSVNjcmlwdChgCi0gICAg ICAgICAgICAgICAgICAgIChmdW5jdGlvbigpIHsKLSAgICAgICAgICAgICAgICAgICAgICAgIHVp Q29udHJvbGxlci5sb25nUHJlc3NBdFBvaW50KCR7dGFwWH0sICR7dGFwWX0sIGZ1bmN0aW9uKCkg ewotICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVpQ29udHJvbGxlci51aVNjcmlwdENvbXBs ZXRlKCJEb25lIik7Ci0gICAgICAgICAgICAgICAgICAgICAgICB9KTsKLSAgICAgICAgICAgICAg ICAgICAgfSkoKTtgLCByZXNvbHZlKTsKLSAgICAgICAgICAgIH0pOwotICAgICAgICB9Ci0KICAg ICAgICAgZnVuY3Rpb24gcmVjdFRvU3RyaW5nKHJlY3QpCiAgICAgICAgIHsKICAgICAgICAgICAg IHJldHVybiBgKGxlZnQgPSAke01hdGgucm91bmQocmVjdC5sZWZ0KX0sIHRvcCA9ICR7TWF0aC5y b3VuZChyZWN0LnRvcCl9LCB3aWR0aCA9ICR7TWF0aC5yb3VuZChyZWN0LndpZHRoKX0sIGhlaWdo dCA9ICR7TWF0aC5yb3VuZChyZWN0LmhlaWdodCl9KWA7CkBAIC00NCwxMSArMzIsMTAgQEAKICAg ICAgICAgewogICAgICAgICAgICAgbGV0IGNvbnRhaW5lciA9IGRvY3VtZW50LmdldEVsZW1lbnRC eUlkKCdlZGl0YWJsZScpOwogICAgICAgICAgICAgYXdhaXQgVUlIZWxwZXIuYWN0aXZhdGVBbmRX YWl0Rm9ySW5wdXRTZXNzaW9uQXQoMjUsIDI1KTsKLQotICAgICAgICAgICAgYXdhaXQgc2VsZWN0 VGV4dEF0KDI1LCA0MDApCi0gICAgICAgICAgICBjb25zdCBzZWxlY3Rpb25SZWN0cyA9IGF3YWl0 IFVJSGVscGVyLmdldFVJU2VsZWN0aW9uUmVjdHMoKTsKKyAgICAgICAgICAgIGF3YWl0IFVJSGVs cGVyLmNhbGxGdW5jdGlvbkFuZFdhaXRGb3JFdmVudCgoKSA9PiBVSUhlbHBlci5kb3VibGVUYXBF bGVtZW50KHRhcmdldCksIGRvY3VtZW50LCAic2VsZWN0aW9uY2hhbmdlIik7CisgICAgICAgICAg ICBhd2FpdCBVSUhlbHBlci5lbnN1cmVQcmVzZW50YXRpb25VcGRhdGUoKTsKICAgICAgICAgICAg IGxldCByZWN0c1N0cmluZyA9ICIiOwotICAgICAgICAgICAgZm9yIChsZXQgcmVjdCBvZiBzZWxl Y3Rpb25SZWN0cykKKyAgICAgICAgICAgIGZvciAobGV0IHJlY3Qgb2YgYXdhaXQgVUlIZWxwZXIu Z2V0VUlTZWxlY3Rpb25SZWN0cygpKQogICAgICAgICAgICAgICAgIHJlY3RzU3RyaW5nICs9IHJl Y3RUb1N0cmluZyhyZWN0KSArICcgJzsKIAogICAgICAgICAgICAgZG9jdW1lbnQucXVlcnlTZWxl Y3RvcigiI3NlbGVjdGlvbi1yZWN0cyIpLnRleHRDb250ZW50ID0gcmVjdHNTdHJpbmc7CkBAIC04 MSw3ICs2OCw3IEBACiAgICAgICAgIGxpbmU8YnI+CiAgICAgICAgIGxpbmU8YnI+CiAgICAgICAg IGxpbmU8YnI+Ci0gICAgICAgIGxpbmU8YnI+CisgICAgICAgIDxzcGFuIGlkPSJ0YXJnZXQiPmxp bmU8L3NwYW4+PGJyPgogICAgICAgICBsaW5lPGJyPgogICAgICAgICBsaW5lPGJyPgogICAgICAg ICBsaW5lPGJyPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcmVzb3VyY2VzL3VpLWhlbHBlci5q cyBiL0xheW91dFRlc3RzL3Jlc291cmNlcy91aS1oZWxwZXIuanMKaW5kZXggNzlkMGM3NmM2YzY5 MDA4ZjQyNzEwMDllY2Q1ZjViMGU1NDVjNDBlMS4uOWQ5OGNkZjE4N2I3NDdlN2E5Mjk0YjI4ZGU0 OWUwNTVlYjNlOWJkYiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcmVzb3VyY2VzL3VpLWhlbHBl ci5qcworKysgYi9MYXlvdXRUZXN0cy9yZXNvdXJjZXMvdWktaGVscGVyLmpzCkBAIC0xMjksNiAr MTI5LDEzIEBAIHdpbmRvdy5VSUhlbHBlciA9IGNsYXNzIFVJSGVscGVyIHsKICAgICAgICAgfSk7 CiAgICAgfQogCisgICAgc3RhdGljIGRvdWJsZVRhcEVsZW1lbnQoZWxlbWVudCwgZGVsYXkgPSAw KQorICAgIHsKKyAgICAgICAgY29uc3QgeCA9IGVsZW1lbnQub2Zmc2V0TGVmdCArIGVsZW1lbnQu b2Zmc2V0V2lkdGggLyAyOworICAgICAgICBjb25zdCB5ID0gZWxlbWVudC5vZmZzZXRUb3AgKyBl bGVtZW50Lm9mZnNldEhlaWdodCAvIDI7CisgICAgICAgIHRoaXMuZG91YmxlVGFwQXQoeCwgeSwg ZGVsYXkpOworICAgIH0KKwogICAgIHN0YXRpYyBkb3VibGVUYXBBdCh4LCB5LCBkZWxheSA9IDAp CiAgICAgewogICAgICAgICBjb25zb2xlLmFzc2VydCh0aGlzLmlzSU9TRmFtaWx5KCkpOwpAQCAt MTA5MCw5ICsxMDk3LDE5IEBAIHdpbmRvdy5VSUhlbHBlciA9IGNsYXNzIFVJSGVscGVyIHsKIAog ICAgIHN0YXRpYyBjYWxsRnVuY3Rpb25BbmRXYWl0Rm9yRXZlbnQoZnVuY3Rpb25Ub0NhbGwsIHRh cmdldCwgZXZlbnROYW1lKQogICAgIHsKLSAgICAgICAgcmV0dXJuIG5ldyBQcm9taXNlKChyZXNv bHZlKSA9PiB7Ci0gICAgICAgICAgICB0YXJnZXQuYWRkRXZlbnRMaXN0ZW5lcihldmVudE5hbWUs IHJlc29sdmUsIHsgb25jZTogdHJ1ZSB9KTsKLSAgICAgICAgICAgIGZ1bmN0aW9uVG9DYWxsKCk7 CisgICAgICAgIHJldHVybiBuZXcgUHJvbWlzZShhc3luYyByZXNvbHZlID0+IHsKKyAgICAgICAg ICAgIGxldCBldmVudDsKKyAgICAgICAgICAgIGF3YWl0IFByb21pc2UuYWxsKFsKKyAgICAgICAg ICAgICAgICBuZXcgUHJvbWlzZShyZXNvbHZlID0+IHRhcmdldC5hZGRFdmVudExpc3RlbmVyKGV2 ZW50TmFtZSwgZSA9PiB7CisgICAgICAgICAgICAgICAgICAgIGV2ZW50ID0gZTsKKyAgICAgICAg ICAgICAgICAgICAgcmVzb2x2ZSgpOworICAgICAgICAgICAgICAgIH0sIHsgb25jZTogdHJ1ZSB9 KSksCisgICAgICAgICAgICAgICAgbmV3IFByb21pc2UoYXN5bmMgcmVzb2x2ZSA9PiB7CisgICAg ICAgICAgICAgICAgICAgIGF3YWl0IGZ1bmN0aW9uVG9DYWxsKCk7CisgICAgICAgICAgICAgICAg ICAgIHJlc29sdmUoKTsKKyAgICAgICAgICAgICAgICB9KQorICAgICAgICAgICAgXSk7CisgICAg ICAgICAgICByZXNvbHZlKGV2ZW50KTsKICAgICAgICAgfSk7CiAgICAgfQogCg== 403130 2020-06-29 16:09:28 -0700 2020-06-29 16:59:04 -0700 Patch for landing bug-213746-20200629160927.patch text/plain 9340 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjYzNjk3CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggYmM1ZjU3ZTc4ODllYWJhNzhlMDNi YmFmYTgxMTFhMjhlNzZkZmIyNS4uNDRhMzgwZjgyODM3YWEyNDc3MGUyNjU5NzQ2YThmMjZjN2Vk ZWY5YSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwpAQCAtMSwzICsxLDM5IEBACisyMDIwLTA2LTI5ICBXZW5zb24gSHNpZWggIDx3 ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIFtpT1MgMTRdIEEgY291cGxlIG9mIHRl c3RzIGluIGVkaXRpbmcvc2VsZWN0aW9uL2lvcyBmYWlsIGFmdGVyIDxyZGFyOi8vcHJvYmxlbS82 MDk3ODI4Mz4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIxMzc0NgorICAgICAgICBNb3JlIHdvcmsgdG93YXJkcyA8cmRhcjovL3Byb2JsZW0vNjQ4MDgx Mzg+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRGV2aW4gUm91c3NvLgorCisgICAgICAgIFRoZSBV SUtpdCBjaGFuZ2UgaW4gPHJkYXI6Ly9wcm9ibGVtLzYwOTc4MjgzPiBhZGp1c3RzIHRleHQgaW50 ZXJhY3Rpb24gYmVoYXZpb3JzIHN1Y2ggdGhhdCBhIGxvbmcgcHJlc3MgZ2VzdHVyZQorICAgICAg ICB3aGlsZSBlZGl0aW5nIG1ha2VzIGEgbmV3IGNhcmV0IHNlbGVjdGlvbiwgcmF0aGVyIHRoYW4g YSBuZXcgd29yZC1ncmFudWxhcml0eSBzZWxlY3Rpb24uIFR3ZWFrIGEgY291cGxlIG9mCisgICAg ICAgIGxheW91dCB0ZXN0cyBpbiBlZGl0aW5nL3NlbGVjdGlvbi9pb3MgdGhhdCBjdXJyZW50bHkg YXNzdW1lIHRoYXQgbG9uZyBwcmVzc2VzIHdoaWxlIGVkaXRpbmcgd2lsbCBzZWxlY3QgYSB3b3Jk LgorCisgICAgICAgICogZWRpdGluZy9zZWxlY3Rpb24vaW9zL3NlbGVjdC10ZXh0LWluLWV4aXN0 aW5nLXNlbGVjdGlvbi1leHBlY3RlZC50eHQ6CisgICAgICAgICogZWRpdGluZy9zZWxlY3Rpb24v aW9zL3NlbGVjdC10ZXh0LWluLWV4aXN0aW5nLXNlbGVjdGlvbi5odG1sOgorCisgICAgICAgIFRo aXMgdGVzdCB2ZXJpZmllcyB0aGF0IHRoZSBzZWxlY3Rpb24gY2FuIGJlIGNoYW5nZWQgYnkgbWFr aW5nIGEgbG9uZyBwcmVzcyBpbnNpZGUgYW4gZXhpc3Rpbmcgc2VsZWN0aW9uLgorICAgICAgICBI b3dldmVyLCBpdCBub3cgZmFpbHMgYWZ0ZXIgdGhlIGNoYW5nZXMgaW4gPHJkYXI6Ly9wcm9ibGVt LzYwOTc4MjgzPiBiZWNhdXNlIGl0IGV4cGVjdHMgdGhlIHNlbGVjdGVkIHRleHQgdG8gYmUKKyAg ICAgICAgImp1bXBlZCIsIGJ1dCBpbnN0ZWFkLCB0aGUgc2VsZWN0aW9uIGVuZHMgdXAgYmVpbmcg YSBjYXJldCBpbnNpZGUgdGhlIHdvcmQgImp1bXBlZCIuIFR3ZWFrIHRoaXMgdGVzdCB0byB2ZXJp ZnkKKyAgICAgICAgdGhhdCB0aGUgc2VsZWN0aW9uIGFuY2hvcnMnIGNvbW1vbiBhbmNlc3RvciBu b2RlIGlzIHRoZSB0ZXh0IG5vZGUgd2l0aCB0aGUgdGV4dCAianVtcGVkIiBpbnN0ZWFkLCB0byBo YW5kbGUgYm90aAorICAgICAgICBwb3NzaWJpbGl0aWVzICh3aGVyZSBhIGxvbmcgcHJlc3Mgc2Vs ZWN0cyBhIHdvcmQgdnMuIHNldHMgYSBjYXJldCBzZWxlY3Rpb24pLgorCisgICAgICAgICogZWRp dGluZy9zZWxlY3Rpb24vaW9zL3NlbGVjdGlvbi1leHRlbmRzLWludG8tb3ZlcmZsb3ctYXJlYS5o dG1sOgorCisgICAgICAgIFRoaXMgdGVzdCB2ZXJpZmllcyB0aGUgcG9zaXRpb24gYW5kIHNpemUg b2YgYSByYW5nZWQgc2VsZWN0aW9uIG1hZGUgaW5zaWRlIGNvbnRlbnQgdGhhdCB2aXNpYmx5IG92 ZXJmbG93cyBpdHMKKyAgICAgICAgcGFyZW50IGNvbnRhaW5lci4gSXQgbm93IGZhaWxzIGJlY2F1 c2UgaXQgdHJpZXMgdG8gbG9uZyBwcmVzcyB0aGUgd29yZCB0byBtYWtlIGEgc2VsZWN0aW9uOyBp bnN0ZWFkLCB1c2UgYQorICAgICAgICBkb3VibGUgdGFwIGdlc3R1cmUgdG8gbWFrZSB0aGUgd29y ZCBzZWxlY3Rpb24uCisKKyAgICAgICAgKiByZXNvdXJjZXMvdWktaGVscGVyLmpzOgorICAgICAg ICAod2luZG93LlVJSGVscGVyLmRvdWJsZVRhcEVsZW1lbnQpOgorCisgICAgICAgIEFkZCBhIG5l dyBoZWxwZXIgbWV0aG9kIHRoYXQgZG91YmxlIHRhcHMgaW4gdGhlIG1pZGRsZSBvZiB0aGUgZ2l2 ZW4gZWxlbWVudC4KKworICAgICAgICAod2luZG93LlVJSGVscGVyLmNhbGxGdW5jdGlvbkFuZFdh aXRGb3JFdmVudCk6CisKKyAgICAgICAgQWRqdXN0IHRoaXMgaGVscGVyIG1ldGhvZCB0byB3YWl0 IGZvciB0aGUgZ2l2ZW4gZnVuY3Rpb24gdG8gcmVzb2x2ZSwgaWYgdGhlIGdpdmVuIGZ1bmN0aW9u IHJldHVybnMgYSBQcm9taXNlLgorCiAyMDIwLTA2LTI5ICBLYXJsIFJhY2tsZXIgIDxyYWNrbGVy QGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUgZXhwZWN0YXRpb24gZm9yIG1lZGlhL2Z1bGxz Y3JlZW4tYXBpLWVuYWJsZWQtbWVkaWEtd2l0aC1wcmVzZW50YXRpb24tbW9kZS5odG1sIGFzIHRo ZXkgYXJlIHBhc3NpbmcuIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZWRpdGluZy9zZWxlY3Rp b24vaW9zL3NlbGVjdC10ZXh0LWluLWV4aXN0aW5nLXNlbGVjdGlvbi1leHBlY3RlZC50eHQgYi9M YXlvdXRUZXN0cy9lZGl0aW5nL3NlbGVjdGlvbi9pb3Mvc2VsZWN0LXRleHQtaW4tZXhpc3Rpbmct c2VsZWN0aW9uLWV4cGVjdGVkLnR4dAppbmRleCA1ZWViYjgzMGM2MGNkZTUyMmIzY2FlNTZjN2Fk OGFmNjA4MmRhNmFmLi4wYmU2OGJhMmE4ZDM5Y2M4MDNhOTA5MmQ5MGFhODliYjU1MmIxNzM4IDEw MDY0NAotLS0gYS9MYXlvdXRUZXN0cy9lZGl0aW5nL3NlbGVjdGlvbi9pb3Mvc2VsZWN0LXRleHQt aW4tZXhpc3Rpbmctc2VsZWN0aW9uLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9lZGl0 aW5nL3NlbGVjdGlvbi9pb3Mvc2VsZWN0LXRleHQtaW4tZXhpc3Rpbmctc2VsZWN0aW9uLWV4cGVj dGVkLnR4dApAQCAtMSwxMCArMSwxMCBAQAogVGhlIHF1aWNrIGJyb3duIGZveCBqdW1wZWQgb3Zl ciB0aGUgbGF6eSBkb2cuCi1UaGlzIHRlc3QgdmVyaWZpZXMgdGhhdCB0aGUgc2VsZWN0aW9uIGNh biBiZSBtb2RpZmllZCB2aWEgbG9uZyBwcmVzcyBpbnNpZGUgYW4gZXhpc3Rpbmcgc2VsZWN0aW9u LiBUbyBtYW51YWxseSB0ZXN0LCBzZWxlY3QgYWxsIHRoZSB0ZXh0IGluIHRoZSBlZGl0YWJsZSBh cmVhIGFuZCBsb25nIHByZXNzIG9uIGEgd29yZCB0byBzZWxlY3QgaXQuCitUaGlzIHRlc3QgdmVy aWZpZXMgdGhhdCB0aGUgc2VsZWN0aW9uIGNhbiBiZSBtb2RpZmllZCB2aWEgbG9uZyBwcmVzcyBp bnNpZGUgYW4gZXhpc3Rpbmcgc2VsZWN0aW9uLiBUbyBtYW51YWxseSB0ZXN0LCBzZWxlY3QgYWxs IHRoZSB0ZXh0IGluIHRoZSBlZGl0YWJsZSBhcmVhIGFuZCBsb25nIHByZXNzIG9uIGEgd29yZCB0 byBjaGFuZ2UgdGhlIHNlbGVjdGlvbi4KIAogT24gc3VjY2VzcywgeW91IHdpbGwgc2VlIGEgc2Vy aWVzIG9mICJQQVNTIiBtZXNzYWdlcywgZm9sbG93ZWQgYnkgIlRFU1QgQ09NUExFVEUiLgogCiAK LVBBU1MgZ2V0U2VsZWN0aW9uKCkudG9TdHJpbmcoKSBpcyAianVtcGVkIgorUEFTUyBnZXRTZWxl Y3Rpb24oKS5nZXRSYW5nZUF0KDApLmNvbW1vbkFuY2VzdG9yQ29udGFpbmVyIGlzIHRhcmdldC5j aGlsZE5vZGVzWzBdCiBQQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCiAKIFRFU1QgQ09N UExFVEUKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2VkaXRpbmcvc2VsZWN0aW9uL2lvcy9zZWxl Y3QtdGV4dC1pbi1leGlzdGluZy1zZWxlY3Rpb24uaHRtbCBiL0xheW91dFRlc3RzL2VkaXRpbmcv c2VsZWN0aW9uL2lvcy9zZWxlY3QtdGV4dC1pbi1leGlzdGluZy1zZWxlY3Rpb24uaHRtbAppbmRl eCA2OTczNzk1MzkyMjcxNTM3NWEzNmRmMWYwNWMyMTZmNDMzY2IwZjQ3Li41YjE2MDlmMTVlMjMw ODM0N2NmNDYyNzZkOWIyMmFkYTM2ZWZlOWUxIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9lZGl0 aW5nL3NlbGVjdGlvbi9pb3Mvc2VsZWN0LXRleHQtaW4tZXhpc3Rpbmctc2VsZWN0aW9uLmh0bWwK KysrIGIvTGF5b3V0VGVzdHMvZWRpdGluZy9zZWxlY3Rpb24vaW9zL3NlbGVjdC10ZXh0LWluLWV4 aXN0aW5nLXNlbGVjdGlvbi5odG1sCkBAIC0xMiw5ICsxMiw5IEBAIGJvZHksIGh0bWwgewogCiBk aXZbY29udGVudGVkaXRhYmxlXSB7CiAgICAgd2lkdGg6IDMwMHB4OwotICAgIGhlaWdodDogMzAw cHg7CisgICAgaGVpZ2h0OiA0MDBweDsKICAgICBib3JkZXI6IDFweCBzb2xpZCBibGFjazsKLSAg ICBmb250LXNpemU6IDMycHg7CisgICAgZm9udC1zaXplOiA2NHB4OwogfQogPC9zdHlsZT4KIDwv aGVhZD4KQEAgLTI0LDE5ICsyNCwxOCBAQCBkaXZbY29udGVudGVkaXRhYmxlXSB7CiA8cCBpZD0i Y29uc29sZSI+PC9wPgogPHNjcmlwdD4KIGpzVGVzdElzQXN5bmMgPSB0cnVlOwotZGVzY3JpcHRp b24oIlRoaXMgdGVzdCB2ZXJpZmllcyB0aGF0IHRoZSBzZWxlY3Rpb24gY2FuIGJlIG1vZGlmaWVk IHZpYSBsb25nIHByZXNzIGluc2lkZSBhbiBleGlzdGluZyBzZWxlY3Rpb24uIFRvIG1hbnVhbGx5 IHRlc3QsIHNlbGVjdCBhbGwgdGhlIHRleHQgaW4gdGhlIGVkaXRhYmxlIGFyZWEgYW5kIGxvbmcg cHJlc3Mgb24gYSB3b3JkIHRvIHNlbGVjdCBpdC4iKTsKK2xldCBlZGl0b3IgPSBkb2N1bWVudC5x dWVyeVNlbGVjdG9yKCJkaXZbY29udGVudGVkaXRhYmxlXSIpOworbGV0IHRhcmdldCA9IGRvY3Vt ZW50LmdldEVsZW1lbnRCeUlkKCJ0YXJnZXQiKTsKKworZGVzY3JpcHRpb24oIlRoaXMgdGVzdCB2 ZXJpZmllcyB0aGF0IHRoZSBzZWxlY3Rpb24gY2FuIGJlIG1vZGlmaWVkIHZpYSBsb25nIHByZXNz IGluc2lkZSBhbiBleGlzdGluZyBzZWxlY3Rpb24uIFRvIG1hbnVhbGx5IHRlc3QsIHNlbGVjdCBh bGwgdGhlIHRleHQgaW4gdGhlIGVkaXRhYmxlIGFyZWEgYW5kIGxvbmcgcHJlc3Mgb24gYSB3b3Jk IHRvIGNoYW5nZSB0aGUgc2VsZWN0aW9uLiIpOwogZG9jdW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigi ZHJhZ3N0YXJ0IiwgZXZlbnQgPT4gZXZlbnQucHJldmVudERlZmF1bHQoKSk7CiAKIGFkZEV2ZW50 TGlzdGVuZXIoImxvYWQiLCBhc3luYyAoKSA9PiB7Ci0gICAgY29uc3QgZWRpdG9yID0gZG9jdW1l bnQucXVlcnlTZWxlY3RvcigiZGl2W2NvbnRlbnRlZGl0YWJsZV0iKTsKLSAgICBjb25zdCBsb25n UHJlc3NUYXJnZXQgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgidGFyZ2V0Iik7Ci0KICAgICBh d2FpdCBVSUhlbHBlci5hY3RpdmF0ZUVsZW1lbnRBbmRXYWl0Rm9ySW5wdXRTZXNzaW9uKGVkaXRv cik7CiAgICAgZG9jdW1lbnQuZXhlY0NvbW1hbmQoIlNlbGVjdEFsbCIpOwogICAgIGF3YWl0IFVJ SGVscGVyLndhaXRGb3JTZWxlY3Rpb25Ub0FwcGVhcigpOwotICAgIGF3YWl0IFVJSGVscGVyLmxv bmdQcmVzc0VsZW1lbnQobG9uZ1ByZXNzVGFyZ2V0KTsKLQotICAgIHNob3VsZEJlRXF1YWxUb1N0 cmluZygiZ2V0U2VsZWN0aW9uKCkudG9TdHJpbmcoKSIsICJqdW1wZWQiKTsKKyAgICBhd2FpdCBV SUhlbHBlci5sb25nUHJlc3NFbGVtZW50KHRhcmdldCk7CisgICAgc2hvdWxkQmUoImdldFNlbGVj dGlvbigpLmdldFJhbmdlQXQoMCkuY29tbW9uQW5jZXN0b3JDb250YWluZXIiLCAidGFyZ2V0LmNo aWxkTm9kZXNbMF0iKTsKICAgICBmaW5pc2hKU1Rlc3QoKTsKIH0pOwogPC9zY3JpcHQ+CmRpZmYg LS1naXQgYS9MYXlvdXRUZXN0cy9lZGl0aW5nL3NlbGVjdGlvbi9pb3Mvc2VsZWN0aW9uLWV4dGVu ZHMtaW50by1vdmVyZmxvdy1hcmVhLmh0bWwgYi9MYXlvdXRUZXN0cy9lZGl0aW5nL3NlbGVjdGlv bi9pb3Mvc2VsZWN0aW9uLWV4dGVuZHMtaW50by1vdmVyZmxvdy1hcmVhLmh0bWwKaW5kZXggNzNm Y2JlYjRhNTg3N2U2YjdlODdiNGZjYjlhODRlZTUwMTA0YjY2YS4uYzFhZTFjZDgxMjdmNDMyOTlk MzE0Yjk1NTJjZTRlZmFhNGU1YmEzMiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvZWRpdGluZy9z ZWxlY3Rpb24vaW9zL3NlbGVjdGlvbi1leHRlbmRzLWludG8tb3ZlcmZsb3ctYXJlYS5odG1sCisr KyBiL0xheW91dFRlc3RzL2VkaXRpbmcvc2VsZWN0aW9uL2lvcy9zZWxlY3Rpb24tZXh0ZW5kcy1p bnRvLW92ZXJmbG93LWFyZWEuaHRtbApAQCAtMjMsMTggKzIzLDYgQEAKICAgICAgICAgICAgIHRl c3RSdW5uZXIud2FpdFVudGlsRG9uZSgpOwogICAgICAgICB9CiAKLSAgICAgICAgZnVuY3Rpb24g c2VsZWN0VGV4dEF0KHRhcFgsIHRhcFkpCi0gICAgICAgIHsKLSAgICAgICAgICAgIHJldHVybiBu ZXcgUHJvbWlzZShyZXNvbHZlID0+IHsKLSAgICAgICAgICAgICAgICB0ZXN0UnVubmVyLnJ1blVJ U2NyaXB0KGAKLSAgICAgICAgICAgICAgICAgICAgKGZ1bmN0aW9uKCkgewotICAgICAgICAgICAg ICAgICAgICAgICAgdWlDb250cm9sbGVyLmxvbmdQcmVzc0F0UG9pbnQoJHt0YXBYfSwgJHt0YXBZ fSwgZnVuY3Rpb24oKSB7Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgdWlDb250cm9sbGVy LnVpU2NyaXB0Q29tcGxldGUoIkRvbmUiKTsKLSAgICAgICAgICAgICAgICAgICAgICAgIH0pOwot ICAgICAgICAgICAgICAgICAgICB9KSgpO2AsIHJlc29sdmUpOwotICAgICAgICAgICAgfSk7Ci0g ICAgICAgIH0KLQogICAgICAgICBmdW5jdGlvbiByZWN0VG9TdHJpbmcocmVjdCkKICAgICAgICAg ewogICAgICAgICAgICAgcmV0dXJuIGAobGVmdCA9ICR7TWF0aC5yb3VuZChyZWN0LmxlZnQpfSwg dG9wID0gJHtNYXRoLnJvdW5kKHJlY3QudG9wKX0sIHdpZHRoID0gJHtNYXRoLnJvdW5kKHJlY3Qu d2lkdGgpfSwgaGVpZ2h0ID0gJHtNYXRoLnJvdW5kKHJlY3QuaGVpZ2h0KX0pYDsKQEAgLTQ0LDEx ICszMiwxMCBAQAogICAgICAgICB7CiAgICAgICAgICAgICBsZXQgY29udGFpbmVyID0gZG9jdW1l bnQuZ2V0RWxlbWVudEJ5SWQoJ2VkaXRhYmxlJyk7CiAgICAgICAgICAgICBhd2FpdCBVSUhlbHBl ci5hY3RpdmF0ZUFuZFdhaXRGb3JJbnB1dFNlc3Npb25BdCgyNSwgMjUpOwotCi0gICAgICAgICAg ICBhd2FpdCBzZWxlY3RUZXh0QXQoMjUsIDQwMCkKLSAgICAgICAgICAgIGNvbnN0IHNlbGVjdGlv blJlY3RzID0gYXdhaXQgVUlIZWxwZXIuZ2V0VUlTZWxlY3Rpb25SZWN0cygpOworICAgICAgICAg ICAgYXdhaXQgVUlIZWxwZXIuY2FsbEZ1bmN0aW9uQW5kV2FpdEZvckV2ZW50KCgpID0+IFVJSGVs cGVyLmRvdWJsZVRhcEVsZW1lbnQodGFyZ2V0KSwgZG9jdW1lbnQsICJzZWxlY3Rpb25jaGFuZ2Ui KTsKKyAgICAgICAgICAgIGF3YWl0IFVJSGVscGVyLmVuc3VyZVByZXNlbnRhdGlvblVwZGF0ZSgp OwogICAgICAgICAgICAgbGV0IHJlY3RzU3RyaW5nID0gIiI7Ci0gICAgICAgICAgICBmb3IgKGxl dCByZWN0IG9mIHNlbGVjdGlvblJlY3RzKQorICAgICAgICAgICAgZm9yIChsZXQgcmVjdCBvZiBh d2FpdCBVSUhlbHBlci5nZXRVSVNlbGVjdGlvblJlY3RzKCkpCiAgICAgICAgICAgICAgICAgcmVj dHNTdHJpbmcgKz0gcmVjdFRvU3RyaW5nKHJlY3QpICsgJyAnOwogCiAgICAgICAgICAgICBkb2N1 bWVudC5xdWVyeVNlbGVjdG9yKCIjc2VsZWN0aW9uLXJlY3RzIikudGV4dENvbnRlbnQgPSByZWN0 c1N0cmluZzsKQEAgLTgxLDcgKzY4LDcgQEAKICAgICAgICAgbGluZTxicj4KICAgICAgICAgbGlu ZTxicj4KICAgICAgICAgbGluZTxicj4KLSAgICAgICAgbGluZTxicj4KKyAgICAgICAgPHNwYW4g aWQ9InRhcmdldCI+bGluZTwvc3Bhbj48YnI+CiAgICAgICAgIGxpbmU8YnI+CiAgICAgICAgIGxp bmU8YnI+CiAgICAgICAgIGxpbmU8YnI+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9yZXNvdXJj ZXMvdWktaGVscGVyLmpzIGIvTGF5b3V0VGVzdHMvcmVzb3VyY2VzL3VpLWhlbHBlci5qcwppbmRl eCA3OWQwYzc2YzZjNjkwMDhmNDI3MTAwOWVjZDVmNWIwZTU0NWM0MGUxLi5iZTA4NGEzMGE5NjY2 NzY3ZThjMTMzMDQ4NDQ1ZmUyZWYwNGQzNjY2IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9yZXNv dXJjZXMvdWktaGVscGVyLmpzCisrKyBiL0xheW91dFRlc3RzL3Jlc291cmNlcy91aS1oZWxwZXIu anMKQEAgLTEyOSw2ICsxMjksMTMgQEAgd2luZG93LlVJSGVscGVyID0gY2xhc3MgVUlIZWxwZXIg ewogICAgICAgICB9KTsKICAgICB9CiAKKyAgICBzdGF0aWMgZG91YmxlVGFwRWxlbWVudChlbGVt ZW50LCBkZWxheSA9IDApCisgICAgeworICAgICAgICBjb25zdCB4ID0gZWxlbWVudC5vZmZzZXRM ZWZ0ICsgKGVsZW1lbnQub2Zmc2V0V2lkdGggLyAyKTsKKyAgICAgICAgY29uc3QgeSA9IGVsZW1l bnQub2Zmc2V0VG9wICsgKGVsZW1lbnQub2Zmc2V0SGVpZ2h0IC8gMik7CisgICAgICAgIHRoaXMu ZG91YmxlVGFwQXQoeCwgeSwgZGVsYXkpOworICAgIH0KKwogICAgIHN0YXRpYyBkb3VibGVUYXBB dCh4LCB5LCBkZWxheSA9IDApCiAgICAgewogICAgICAgICBjb25zb2xlLmFzc2VydCh0aGlzLmlz SU9TRmFtaWx5KCkpOwpAQCAtMTA5MCw5ICsxMDk3LDIxIEBAIHdpbmRvdy5VSUhlbHBlciA9IGNs YXNzIFVJSGVscGVyIHsKIAogICAgIHN0YXRpYyBjYWxsRnVuY3Rpb25BbmRXYWl0Rm9yRXZlbnQo ZnVuY3Rpb25Ub0NhbGwsIHRhcmdldCwgZXZlbnROYW1lKQogICAgIHsKLSAgICAgICAgcmV0dXJu IG5ldyBQcm9taXNlKChyZXNvbHZlKSA9PiB7Ci0gICAgICAgICAgICB0YXJnZXQuYWRkRXZlbnRM aXN0ZW5lcihldmVudE5hbWUsIHJlc29sdmUsIHsgb25jZTogdHJ1ZSB9KTsKLSAgICAgICAgICAg IGZ1bmN0aW9uVG9DYWxsKCk7CisgICAgICAgIHJldHVybiBuZXcgUHJvbWlzZShhc3luYyByZXNv bHZlID0+IHsKKyAgICAgICAgICAgIGxldCBldmVudDsKKyAgICAgICAgICAgIGF3YWl0IFByb21p c2UuYWxsKFsKKyAgICAgICAgICAgICAgICBuZXcgUHJvbWlzZSgoZXZlbnRMaXN0ZW5lclJlc29s dmUpID0+IHsKKyAgICAgICAgICAgICAgICAgICAgdGFyZ2V0LmFkZEV2ZW50TGlzdGVuZXIoZXZl bnROYW1lLCAoZSkgPT4geworICAgICAgICAgICAgICAgICAgICAgICAgZXZlbnQgPSBlOworICAg ICAgICAgICAgICAgICAgICAgICAgZXZlbnRMaXN0ZW5lclJlc29sdmUoKTsKKyAgICAgICAgICAg ICAgICAgICAgfSwge29uY2U6IHRydWV9KTsKKyAgICAgICAgICAgICAgICB9KSwKKyAgICAgICAg ICAgICAgICBuZXcgUHJvbWlzZShhc3luYyBmdW5jdGlvblJlc29sdmUgPT4geworICAgICAgICAg ICAgICAgICAgICBhd2FpdCBmdW5jdGlvblRvQ2FsbCgpOworICAgICAgICAgICAgICAgICAgICBm dW5jdGlvblJlc29sdmUoKTsKKyAgICAgICAgICAgICAgICB9KQorICAgICAgICAgICAgXSk7Cisg ICAgICAgICAgICByZXNvbHZlKGV2ZW50KTsKICAgICAgICAgfSk7CiAgICAgfQogCg==