181715 2018-01-16 21:04:09 -0800 input and textarea elements should reveal selection in setSelection when focused 2018-01-23 23:24:22 -0800 1 1 1 Unclassified WebKit Forms WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 rniwa rniwa cdumez commit-queue csaavedra koivisto simon.fraser thorton webkit-bug-importer wenson_hsieh zalan oldest_to_newest 1389858 0 rniwa 2018-01-16 21:04:09 -0800 Right now, input and textarea elements manually invokes FrameSelection::revealSelection. Use FrameSelection::setSelection to reveal selection instead. 1389859 1 webkit-bug-importer 2018-01-16 21:04:58 -0800 <rdar://problem/36570546> 1389872 2 331465 rniwa 2018-01-16 21:40:30 -0800 Created attachment 331465 Cleanup 1389878 3 rniwa 2018-01-16 22:13:53 -0800 Thanks for the review. Waiting for EWS first. 1390043 4 331465 simon.fraser 2018-01-17 09:32:49 -0800 Comment on attachment 331465 Cleanup Is there any behavior change here? 1390228 5 rniwa 2018-01-17 14:55:13 -0800 (In reply to Simon Fraser (smfr) from comment #4) > Comment on attachment 331465 [details] > Cleanup > > Is there any behavior change here? I don't think there is any. 1390239 6 331465 commit-queue 2018-01-17 15:19:50 -0800 Comment on attachment 331465 Cleanup Clearing flags on attachment: 331465 Committed r227092: <https://trac.webkit.org/changeset/227092> 1390240 7 commit-queue 2018-01-17 15:19:51 -0800 All reviewed patches have been landed. Closing bug. 1390922 8 csaavedra 2018-01-19 08:06:21 -0800 (In reply to Ryosuke Niwa from comment #5) > (In reply to Simon Fraser (smfr) from comment #4) > > Comment on attachment 331465 [details] > > Cleanup > > > > Is there any behavior change here? > > I don't think there is any. This broke two tests in wkgtk, but I haven't had time to investigate yet. http://webkit-test-results.webkit.org/dashboards/flakiness_dashboard.html#showAllRuns=true&tests=fast%2Fforms%2Ftextarea-scrolled-type.html%20fast%2Fforms%2Ffocus-selection-textarea.html 1390925 9 csaavedra 2018-01-19 08:17:04 -0800 Also this one: editing/input/reveal-edit-on-paste-vertically.html 1390941 10 csaavedra 2018-01-19 08:47:24 -0800 https://build.webkit.org/results/GTK%20Linux%2064-bit%20Release%20(Tests)/r227193%20(5131)/editing/input/reveal-edit-on-paste-vertically-pretty-diff.html -ScrollVertically: PASS +ScrollVertically: FAIL +viewportMiddle: 300, offsetOfInput: 9 https://build.webkit.org/results/GTK%20Linux%2064-bit%20Release%20(Tests)/r227193%20(5131)/fast/forms/focus-selection-textarea-pretty-diff.html Diff a bit long, but this should give a clue: -PASS fourth.selectionStart is 0 -PASS fourth.selectionEnd is 0 +FAIL fourth.selectionStart should be 0. Was 11. +FAIL fourth.selectionEnd should be 0. Was 18. The third one might be related, but it could as well just be that an updated expectation for gtk+ is needed. Hope the above is useful! 1391173 11 rniwa 2018-01-19 14:11:53 -0800 You might need to wait until the scrolling happens because the scrolling is now happens after the layout asynchronously. 1391599 12 csaavedra 2018-01-22 05:00:59 -0800 (In reply to Ryosuke Niwa from comment #11) > You might need to wait until the scrolling happens because the scrolling is > now happens after the layout asynchronously. Where do you mean? In the EventSenderProxy? 1391733 13 rniwa 2018-01-22 12:04:07 -0800 (In reply to Claudio Saavedra from comment #12) > (In reply to Ryosuke Niwa from comment #11) > > You might need to wait until the scrolling happens because the scrolling is > > now happens after the layout asynchronously. > > Where do you mean? In the EventSenderProxy? In those tests. 331465 2018-01-16 21:40:30 -0800 2018-01-17 15:19:50 -0800 Cleanup bug-181715-20180116214030.patch text/plain 15582 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIyNzA0NSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM2IEBACisyMDE4LTAxLTE2ICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIGlucHV0IGFuZCB0ZXh0YXJlYSBl bGVtZW50cyBzaG91bGQgcmV2ZWFsIHNlbGVjdGlvbiBpbiBzZXRTZWxlY3Rpb24gd2hlbiBmb2N1 c2VkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODE3 MTUKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzM2NTcwNTQ2PgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1hZGUgaW5wdXQgYW5kIHRleHRhcmVhIGVs ZW1lbnRzIHJldmVhbCBzZWxlY3Rpb24gaW4gRnJhbWVTZWxlY3Rpb246OnNldFNlbGVjdGlvbiBp bnN0ZWFkIG9mIGJ5IGRpcmVjdGx5CisgICAgICAgIGludm9raW5nIEZyYW1lU2VsZWN0aW9uOjpy ZXZlYWxTZWxlY3Rpb24gaW4gdGhlaXIgcmVzcGVjdGl2ZSB1cGRhdGVGb2N1c0FwcGVhcmFuY2Ug dG8gdW5pZnkgY29kZSBwYXRocy4KKworICAgICAgICBBbHNvIGFkZGVkIG9wdGlvbnMgdG8gcmV2 ZWFsIHNlbGVjdGlvbiB1cCB0byB0aGUgbWFpbiBmcmFtZSB0byBTZXRTZWxlY3Rpb25PcHRpb24g dG8gYmUgdXNlZCBpbiBpT1MuCisKKyAgICAgICAgKiBlZGl0aW5nL0ZyYW1lU2VsZWN0aW9uLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lU2VsZWN0aW9uOjpGcmFtZVNlbGVjdGlvbik6Cisg ICAgICAgIChXZWJDb3JlOjpGcmFtZVNlbGVjdGlvbjo6bW92ZVdpdGhvdXRWYWxpZGF0aW9uVG8p OiBUYWtlcyBTZWxlY3Rpb25SZXZlYWxNb2RlIGFzIGFuIGFyZ3VtZW50IGFuZCBjb252ZXJ0cwor ICAgICAgICBzZXRzIGFwcHJvcHJpYXRlIHNlbGVjdGlvbiBvcHRpb25zLgorICAgICAgICAoV2Vi Q29yZTo6RnJhbWVTZWxlY3Rpb246OnNldFNlbGVjdGlvbik6IFJlY29uc3RydWN0IFNlbGVjdGlv blJldmVhbE1vZGUgb3V0IG9mIHNlbGVjdGlvbiBvcHRpb24gc2V0cy4KKyAgICAgICAgKFdlYkNv cmU6OkZyYW1lU2VsZWN0aW9uOjp1cGRhdGVBbmRSZXZlYWxTZWxlY3Rpb24pOgorICAgICAgICAq IGVkaXRpbmcvRnJhbWVTZWxlY3Rpb24uaDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lU2VsZWN0 aW9uKTogQWRkZWQgUmV2ZWFsU2VsZWN0aW9uVXBUb01haW5GcmFtZSBhcyBhIFNlbGVjdGlvblJl dmVhbE1vZGUgYW5kIHJlcGxhY2VkCisgICAgICAgIG1fc2hvdWxkUmV2ZWFsU2VsZWN0aW9uIGJ5 IG1fc2VsZWN0aW9uUmV2ZWFsTW9kZS4KKyAgICAgICAgKiBodG1sL0hUTUxJbnB1dEVsZW1lbnQu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTElucHV0RWxlbWVudDo6dXBkYXRlRm9jdXNBcHBl YXJhbmNlKTogUGFzcyBTZWxlY3Rpb25SZXZlYWxNb2RlIHRvIEhUTUxUZXh0Rm9ybUNvbnRyb2xF bGVtZW50J3MKKyAgICAgICAgc2VsZWN0IGFuZCByZXN0b3JlQ2FjaGVkU2VsZWN0aW9uIGluc3Rl YWQgb2YgZGlyZWN0bHkgaW52b2tpbmcgRnJhbWVTZWxlY3Rpb246OnJldmVhbFNlbGVjdGlvbi4K KyAgICAgICAgKiBodG1sL0hUTUxUZXh0QXJlYUVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6SFRNTFRleHRBcmVhRWxlbWVudDo6dXBkYXRlRm9jdXNBcHBlYXJhbmNlKTogRGl0dG8uCisg ICAgICAgICogaHRtbC9IVE1MVGV4dEZvcm1Db250cm9sRWxlbWVudC5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpIVE1MVGV4dEZvcm1Db250cm9sRWxlbWVudDo6c2VsZWN0KToKKyAgICAgICAgKFdl YkNvcmU6OkhUTUxUZXh0Rm9ybUNvbnRyb2xFbGVtZW50OjpzZXRTZWxlY3Rpb25SYW5nZSk6Cisg ICAgICAgIChXZWJDb3JlOjpIVE1MVGV4dEZvcm1Db250cm9sRWxlbWVudDo6cmVzdG9yZUNhY2hl ZFNlbGVjdGlvbik6CisgICAgICAgICogaHRtbC9IVE1MVGV4dEZvcm1Db250cm9sRWxlbWVudC5o OgorCiAyMDE4LTAxLTE2ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgog CiAgICAgICAgIENhbid0IHNjcm9sbCBpZnJhbWUgYWZ0ZXIgdG9nZ2xpbmcgaXQgdG8gZGlzcGxh eTpub25lIGFuZCBiYWNrCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0ZyYW1lU2VsZWN0 aW9uLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0ZyYW1lU2VsZWN0 aW9uLmNwcAkocmV2aXNpb24gMjI2OTk5KQorKysgU291cmNlL1dlYkNvcmUvZWRpdGluZy9GcmFt ZVNlbGVjdGlvbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEzMiw3ICsxMzIsNiBAQCBGcmFtZVNl bGVjdGlvbjo6RnJhbWVTZWxlY3Rpb24oRnJhbWUqIGZyCiAgICAgLCBtX2ZvY3VzZWQoZnJhbWUg JiYgZnJhbWUtPnBhZ2UoKSAmJiBmcmFtZS0+cGFnZSgpLT5mb2N1c0NvbnRyb2xsZXIoKS5mb2N1 c2VkRnJhbWUoKSA9PSBmcmFtZSkKICAgICAsIG1fc2hvdWxkU2hvd0Jsb2NrQ3Vyc29yKGZhbHNl KQogICAgICwgbV9wZW5kaW5nU2VsZWN0aW9uVXBkYXRlKGZhbHNlKQotICAgICwgbV9zaG91bGRS ZXZlYWxTZWxlY3Rpb24oZmFsc2UpCiAgICAgLCBtX2Fsd2F5c0FsaWduQ3Vyc29yT25TY3JvbGxX aGVuUmV2ZWFsaW5nU2VsZWN0aW9uKGZhbHNlKQogI2lmIFBMQVRGT1JNKElPUykKICAgICAsIG1f dXBkYXRlQXBwZWFyYW5jZUVuYWJsZWQoZmFsc2UpCkBAIC0xNzgsMTMgKzE3NywyNiBAQCB2b2lk IEZyYW1lU2VsZWN0aW9uOjptb3ZlVG8oY29uc3QgUG9zaXRpCiAgICAgc2V0U2VsZWN0aW9uKFZp c2libGVTZWxlY3Rpb24oYmFzZSwgZXh0ZW50LCBhZmZpbml0eSwgc2VsZWN0aW9uSGFzRGlyZWN0 aW9uKSwgZGVmYXVsdFNldFNlbGVjdGlvbk9wdGlvbnModXNlclRyaWdnZXJlZCkpOwogfQogCi12 b2lkIEZyYW1lU2VsZWN0aW9uOjptb3ZlV2l0aG91dFZhbGlkYXRpb25Ubyhjb25zdCBQb3NpdGlv biYgYmFzZSwgY29uc3QgUG9zaXRpb24mIGV4dGVudCwgYm9vbCBzZWxlY3Rpb25IYXNEaXJlY3Rp b24sIGJvb2wgc2hvdWxkU2V0Rm9jdXMsIGNvbnN0IEFYVGV4dFN0YXRlQ2hhbmdlSW50ZW50JiBp bnRlbnQpCit2b2lkIEZyYW1lU2VsZWN0aW9uOjptb3ZlV2l0aG91dFZhbGlkYXRpb25Ubyhjb25z dCBQb3NpdGlvbiYgYmFzZSwgY29uc3QgUG9zaXRpb24mIGV4dGVudCwgYm9vbCBzZWxlY3Rpb25I YXNEaXJlY3Rpb24sIGJvb2wgc2hvdWxkU2V0Rm9jdXMsIFNlbGVjdGlvblJldmVhbE1vZGUgcmV2 ZWFsTW9kZSwgY29uc3QgQVhUZXh0U3RhdGVDaGFuZ2VJbnRlbnQmIGludGVudCkKIHsKICAgICBW aXNpYmxlU2VsZWN0aW9uIG5ld1NlbGVjdGlvbjsKICAgICBuZXdTZWxlY3Rpb24uc2V0V2l0aG91 dFZhbGlkYXRpb24oYmFzZSwgZXh0ZW50KTsKICAgICBuZXdTZWxlY3Rpb24uc2V0SXNEaXJlY3Rp b25hbChzZWxlY3Rpb25IYXNEaXJlY3Rpb24pOwogICAgIEFYVGV4dFN0YXRlQ2hhbmdlSW50ZW50 IG5ld0ludGVudCA9IGludGVudC50eXBlID09IEFYVGV4dFN0YXRlQ2hhbmdlVHlwZVVua25vd24g PyBBWFRleHRTdGF0ZUNoYW5nZUludGVudChBWFRleHRTdGF0ZUNoYW5nZVR5cGVTZWxlY3Rpb25N b3ZlLCBBWFRleHRTZWxlY3Rpb24geyBBWFRleHRTZWxlY3Rpb25EaXJlY3Rpb25EaXNjb250aWd1 b3VzLCBBWFRleHRTZWxlY3Rpb25HcmFudWxhcml0eVVua25vd24sIGZhbHNlIH0pIDogaW50ZW50 OwotICAgIHNldFNlbGVjdGlvbihuZXdTZWxlY3Rpb24sIGRlZmF1bHRTZXRTZWxlY3Rpb25PcHRp b25zKCkgfCAoc2hvdWxkU2V0Rm9jdXMgPyAwIDogRG9Ob3RTZXRGb2N1cyksIG5ld0ludGVudCk7 CisgICAgU2V0U2VsZWN0aW9uT3B0aW9ucyBvcHRpb25zID0gZGVmYXVsdFNldFNlbGVjdGlvbk9w dGlvbnMoKTsKKyAgICBpZiAoIXNob3VsZFNldEZvY3VzKQorICAgICAgICBvcHRpb25zIHw9IERv Tm90U2V0Rm9jdXM7CisgICAgc3dpdGNoIChyZXZlYWxNb2RlKSB7CisgICAgY2FzZSBTZWxlY3Rp b25SZXZlYWxNb2RlOjpEb05vdFJldmVhbDoKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBTZWxl Y3Rpb25SZXZlYWxNb2RlOjpSZXZlYWw6CisgICAgICAgIG9wdGlvbnMgfD0gUmV2ZWFsU2VsZWN0 aW9uOworICAgICAgICBicmVhazsKKyAgICBjYXNlIFNlbGVjdGlvblJldmVhbE1vZGU6OlJldmVh bFVwVG9NYWluRnJhbWU6CisgICAgICAgIG9wdGlvbnMgfD0gUmV2ZWFsU2VsZWN0aW9uVXBUb01h aW5GcmFtZTsKKyAgICAgICAgYnJlYWs7CisgICAgfQorICAgIHNldFNlbGVjdGlvbihuZXdTZWxl Y3Rpb24sIG9wdGlvbnMsIG5ld0ludGVudCk7CiB9CiAKIHZvaWQgRHJhZ0NhcmV0Q29udHJvbGxl cjo6c2V0Q2FyZXRQb3NpdGlvbihjb25zdCBWaXNpYmxlUG9zaXRpb24mIHBvc2l0aW9uKQpAQCAt MzU0LDcgKzM2NiwxMiBAQCB2b2lkIEZyYW1lU2VsZWN0aW9uOjpzZXRTZWxlY3Rpb24oY29uc3Qg CiAgICAgaWYgKCFkb2N1bWVudCkKICAgICAgICAgcmV0dXJuOwogCi0gICAgbV9zaG91bGRSZXZl YWxTZWxlY3Rpb24gPSBvcHRpb25zICYgUmV2ZWFsU2VsZWN0aW9uOworICAgIGlmIChvcHRpb25z ICYgUmV2ZWFsU2VsZWN0aW9uVXBUb01haW5GcmFtZSkKKyAgICAgICAgbV9zZWxlY3Rpb25SZXZl YWxNb2RlID0gU2VsZWN0aW9uUmV2ZWFsTW9kZTo6UmV2ZWFsVXBUb01haW5GcmFtZTsKKyAgICBl bHNlIGlmIChvcHRpb25zICYgUmV2ZWFsU2VsZWN0aW9uKQorICAgICAgICBtX3NlbGVjdGlvblJl dmVhbE1vZGUgPSBTZWxlY3Rpb25SZXZlYWxNb2RlOjpSZXZlYWw7CisgICAgZWxzZQorICAgICAg ICBtX3NlbGVjdGlvblJldmVhbE1vZGUgPSBTZWxlY3Rpb25SZXZlYWxNb2RlOjpEb05vdFJldmVh bDsKICAgICBtX2Fsd2F5c0FsaWduQ3Vyc29yT25TY3JvbGxXaGVuUmV2ZWFsaW5nU2VsZWN0aW9u ID0gYWxpZ24gPT0gQWxpZ25DdXJzb3JPblNjcm9sbEFsd2F5czsKIAogICAgIG1fcGVuZGluZ1Nl bGVjdGlvblVwZGF0ZSA9IHRydWU7CkBAIC0zOTksNyArNDE2LDcgQEAgdm9pZCBGcmFtZVNlbGVj dGlvbjo6dXBkYXRlQW5kUmV2ZWFsU2VsZQogCiAgICAgdXBkYXRlQXBwZWFyYW5jZSgpOwogCi0g ICAgaWYgKG1fc2hvdWxkUmV2ZWFsU2VsZWN0aW9uKSB7CisgICAgaWYgKG1fc2VsZWN0aW9uUmV2 ZWFsTW9kZSAhPSBTZWxlY3Rpb25SZXZlYWxNb2RlOjpEb05vdFJldmVhbCkgewogICAgICAgICBT Y3JvbGxBbGlnbm1lbnQgYWxpZ25tZW50OwogCiAgICAgICAgIGlmIChtX2ZyYW1lLT5lZGl0b3Io KS5iZWhhdmlvcigpLnNob3VsZENlbnRlckFsaWduV2hlblNlbGVjdGlvbklzUmV2ZWFsZWQoKSkK QEAgLTQwNyw3ICs0MjQsNyBAQCB2b2lkIEZyYW1lU2VsZWN0aW9uOjp1cGRhdGVBbmRSZXZlYWxT ZWxlCiAgICAgICAgIGVsc2UKICAgICAgICAgICAgIGFsaWdubWVudCA9IG1fYWx3YXlzQWxpZ25D dXJzb3JPblNjcm9sbFdoZW5SZXZlYWxpbmdTZWxlY3Rpb24gPyBTY3JvbGxBbGlnbm1lbnQ6OmFs aWduVG9wQWx3YXlzIDogU2Nyb2xsQWxpZ25tZW50OjphbGlnblRvRWRnZUlmTmVlZGVkOwogCi0g ICAgICAgIHJldmVhbFNlbGVjdGlvbihTZWxlY3Rpb25SZXZlYWxNb2RlOjpSZXZlYWwsIGFsaWdu bWVudCwgUmV2ZWFsRXh0ZW50KTsKKyAgICAgICAgcmV2ZWFsU2VsZWN0aW9uKG1fc2VsZWN0aW9u UmV2ZWFsTW9kZSwgYWxpZ25tZW50LCBSZXZlYWxFeHRlbnQpOwogICAgIH0KIAogICAgIG5vdGlm eUFjY2Vzc2liaWxpdHlGb3JTZWxlY3Rpb25DaGFuZ2UoaW50ZW50KTsKSW5kZXg6IFNvdXJjZS9X ZWJDb3JlL2VkaXRpbmcvRnJhbWVTZWxlY3Rpb24uaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9lZGl0aW5nL0ZyYW1lU2VsZWN0aW9uLmgJKHJldmlzaW9uIDIyNjk5OSkKKysrIFNvdXJj ZS9XZWJDb3JlL2VkaXRpbmcvRnJhbWVTZWxlY3Rpb24uaAkod29ya2luZyBjb3B5KQpAQCAtMTI1 LDggKzEyNSw5IEBAIHB1YmxpYzoKICAgICAgICAgU3BlbGxDb3JyZWN0aW9uVHJpZ2dlcmVkID0g MSA8PCAzLAogICAgICAgICBEb05vdFNldEZvY3VzID0gMSA8PCA0LAogICAgICAgICBEaWN0YXRp b25UcmlnZ2VyZWQgPSAxIDw8IDUsCi0gICAgICAgIFJldmVhbFNlbGVjdGlvbiA9IDEgPDwgNiwK LSAgICAgICAgSXNVc2VyVHJpZ2dlcmVkID0gMSA8PCA3LAorICAgICAgICBJc1VzZXJUcmlnZ2Vy ZWQgPSAxIDw8IDYsCisgICAgICAgIFJldmVhbFNlbGVjdGlvbiA9IDEgPDwgNywKKyAgICAgICAg UmV2ZWFsU2VsZWN0aW9uVXBUb01haW5GcmFtZSA9IDEgPDwgOCwKICAgICB9OwogICAgIHR5cGVk ZWYgdW5zaWduZWQgU2V0U2VsZWN0aW9uT3B0aW9uczsgLy8gVW5pb24gb2YgdmFsdWVzIGluIFNl dFNlbGVjdGlvbk9wdGlvbiBhbmQgRVVzZXJUcmlnZ2VyZWQKICAgICBzdGF0aWMgaW5saW5lIFNl dFNlbGVjdGlvbk9wdGlvbnMgZGVmYXVsdFNldFNlbGVjdGlvbk9wdGlvbnMoRVVzZXJUcmlnZ2Vy ZWQgdXNlclRyaWdnZXJlZCA9IE5vdFVzZXJUcmlnZ2VyZWQpCkBAIC0xNDMsNyArMTQ0LDcgQEAg cHVibGljOgogICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgbW92ZVRvKGNvbnN0IFZpc2libGVQb3Np dGlvbiYsIGNvbnN0IFZpc2libGVQb3NpdGlvbiYsIEVVc2VyVHJpZ2dlcmVkID0gTm90VXNlclRy aWdnZXJlZCk7CiAgICAgdm9pZCBtb3ZlVG8oY29uc3QgUG9zaXRpb24mLCBFQWZmaW5pdHksIEVV c2VyVHJpZ2dlcmVkID0gTm90VXNlclRyaWdnZXJlZCk7CiAgICAgdm9pZCBtb3ZlVG8oY29uc3Qg UG9zaXRpb24mLCBjb25zdCBQb3NpdGlvbiYsIEVBZmZpbml0eSwgRVVzZXJUcmlnZ2VyZWQgPSBO b3RVc2VyVHJpZ2dlcmVkKTsKLSAgICB2b2lkIG1vdmVXaXRob3V0VmFsaWRhdGlvblRvKGNvbnN0 IFBvc2l0aW9uJiwgY29uc3QgUG9zaXRpb24mLCBib29sIHNlbGVjdGlvbkhhc0RpcmVjdGlvbiwg Ym9vbCBzaG91bGRTZXRGb2N1cywgY29uc3QgQVhUZXh0U3RhdGVDaGFuZ2VJbnRlbnQmID0gQVhU ZXh0U3RhdGVDaGFuZ2VJbnRlbnQoKSk7CisgICAgdm9pZCBtb3ZlV2l0aG91dFZhbGlkYXRpb25U byhjb25zdCBQb3NpdGlvbiYsIGNvbnN0IFBvc2l0aW9uJiwgYm9vbCBzZWxlY3Rpb25IYXNEaXJl Y3Rpb24sIGJvb2wgc2hvdWxkU2V0Rm9jdXMsIFNlbGVjdGlvblJldmVhbE1vZGUsIGNvbnN0IEFY VGV4dFN0YXRlQ2hhbmdlSW50ZW50JiA9IEFYVGV4dFN0YXRlQ2hhbmdlSW50ZW50KCkpOwogCiAg ICAgY29uc3QgVmlzaWJsZVNlbGVjdGlvbiYgc2VsZWN0aW9uKCkgY29uc3QgeyByZXR1cm4gbV9z ZWxlY3Rpb247IH0KICAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIHNldFNlbGVjdGlvbihjb25zdCBW aXNpYmxlU2VsZWN0aW9uJiwgU2V0U2VsZWN0aW9uT3B0aW9ucyA9IGRlZmF1bHRTZXRTZWxlY3Rp b25PcHRpb25zKCksIEFYVGV4dFN0YXRlQ2hhbmdlSW50ZW50ID0gQVhUZXh0U3RhdGVDaGFuZ2VJ bnRlbnQoKSwgQ3Vyc29yQWxpZ25PblNjcm9sbCA9IEFsaWduQ3Vyc29yT25TY3JvbGxJZk5lZWRl ZCwgVGV4dEdyYW51bGFyaXR5ID0gQ2hhcmFjdGVyR3JhbnVsYXJpdHkpOwpAQCAtMzQ0LDYgKzM0 NSw5IEBAIHByaXZhdGU6CiAgICAgVGltZXIgbV9hcHBlYXJhbmNlVXBkYXRlVGltZXI7CiAgICAg Ly8gVGhlIHBhaW50ZWQgYm91bmRzIG9mIHRoZSBjYXJldCBpbiBhYnNvbHV0ZSBjb29yZGluYXRl cwogICAgIEludFJlY3QgbV9hYnNDYXJldEJvdW5kczsKKworICAgIFNlbGVjdGlvblJldmVhbE1v ZGUgbV9zZWxlY3Rpb25SZXZlYWxNb2RlIHsgU2VsZWN0aW9uUmV2ZWFsTW9kZTo6RG9Ob3RSZXZl YWwgfTsKKwogICAgIGJvb2wgbV9jYXJldEluc2lkZVBvc2l0aW9uRml4ZWQgOiAxOwogICAgIGJv b2wgbV9hYnNDYXJldEJvdW5kc0RpcnR5IDogMTsKICAgICBib29sIG1fY2FyZXRQYWludCA6IDE7 CkBAIC0zNTEsNyArMzU1LDYgQEAgcHJpdmF0ZToKICAgICBib29sIG1fZm9jdXNlZCA6IDE7CiAg ICAgYm9vbCBtX3Nob3VsZFNob3dCbG9ja0N1cnNvciA6IDE7CiAgICAgYm9vbCBtX3BlbmRpbmdT ZWxlY3Rpb25VcGRhdGUgOiAxOwotICAgIGJvb2wgbV9zaG91bGRSZXZlYWxTZWxlY3Rpb24gOiAx OwogICAgIGJvb2wgbV9hbHdheXNBbGlnbkN1cnNvck9uU2Nyb2xsV2hlblJldmVhbGluZ1NlbGVj dGlvbiA6IDE7CiAKICNpZiBQTEFURk9STShJT1MpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1s L0hUTUxJbnB1dEVsZW1lbnQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwv SFRNTElucHV0RWxlbWVudC5jcHAJKHJldmlzaW9uIDIyNjk5OSkKKysrIFNvdXJjZS9XZWJDb3Jl L2h0bWwvSFRNTElucHV0RWxlbWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ0NCwxMSArNDQ0 LDkgQEAgdm9pZCBIVE1MSW5wdXRFbGVtZW50Ojp1cGRhdGVGb2N1c0FwcGVhcgogewogICAgIGlm IChpc1RleHRGaWVsZCgpKSB7CiAgICAgICAgIGlmIChyZXN0b3JhdGlvbk1vZGUgPT0gU2VsZWN0 aW9uUmVzdG9yYXRpb25Nb2RlOjpTZXREZWZhdWx0IHx8ICFoYXNDYWNoZWRTZWxlY3Rpb24oKSkK LSAgICAgICAgICAgIHNlbGVjdChFbGVtZW50OjpkZWZhdWx0Rm9jdXNUZXh0U3RhdGVDaGFuZ2VJ bnRlbnQoKSk7CisgICAgICAgICAgICBzZWxlY3QocmV2ZWFsTW9kZSwgRWxlbWVudDo6ZGVmYXVs dEZvY3VzVGV4dFN0YXRlQ2hhbmdlSW50ZW50KCkpOwogICAgICAgICBlbHNlCi0gICAgICAgICAg ICByZXN0b3JlQ2FjaGVkU2VsZWN0aW9uKCk7Ci0gICAgICAgIGlmIChkb2N1bWVudCgpLmZyYW1l KCkpCi0gICAgICAgICAgICBkb2N1bWVudCgpLmZyYW1lKCktPnNlbGVjdGlvbigpLnJldmVhbFNl bGVjdGlvbihyZXZlYWxNb2RlKTsKKyAgICAgICAgICAgIHJlc3RvcmVDYWNoZWRTZWxlY3Rpb24o cmV2ZWFsTW9kZSk7CiAgICAgfSBlbHNlCiAgICAgICAgIEhUTUxUZXh0Rm9ybUNvbnRyb2xFbGVt ZW50Ojp1cGRhdGVGb2N1c0FwcGVhcmFuY2UocmVzdG9yYXRpb25Nb2RlLCByZXZlYWxNb2RlKTsK IH0KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFRleHRBcmVhRWxlbWVudC5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MVGV4dEFyZWFFbGVtZW50LmNwcAko cmV2aXNpb24gMjI2OTk5KQorKysgU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MVGV4dEFyZWFFbGVt ZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjYwLDEyICsyNjAsOSBAQCB2b2lkIEhUTUxUZXh0 QXJlYUVsZW1lbnQ6OnVwZGF0ZUZvY3VzQXBwCiAgICAgICAgIC8vIElmIHRoaXMgaXMgdGhlIGZp cnN0IGZvY3VzLCBzZXQgYSBjYXJldCBhdCB0aGUgYmVnaW5uaW5nIG9mIHRoZSB0ZXh0LiAgCiAg ICAgICAgIC8vIFRoaXMgbWF0Y2hlcyBzb21lIGJyb3dzZXJzJyBiZWhhdmlvcjsgc2VlIGJ1ZyAx MTc0NiBDb21tZW50ICMxNS4KICAgICAgICAgLy8gaHR0cDovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTE3NDYjYzE1Ci0gICAgICAgIHNldFNlbGVjdGlvblJhbmdlKDAsIDAsIFNl bGVjdGlvbkhhc05vRGlyZWN0aW9uLCBFbGVtZW50OjpkZWZhdWx0Rm9jdXNUZXh0U3RhdGVDaGFu Z2VJbnRlbnQoKSk7CisgICAgICAgIHNldFNlbGVjdGlvblJhbmdlKDAsIDAsIFNlbGVjdGlvbkhh c05vRGlyZWN0aW9uLCByZXZlYWxNb2RlLCBFbGVtZW50OjpkZWZhdWx0Rm9jdXNUZXh0U3RhdGVD aGFuZ2VJbnRlbnQoKSk7CiAgICAgfSBlbHNlCi0gICAgICAgIHJlc3RvcmVDYWNoZWRTZWxlY3Rp b24oRWxlbWVudDo6ZGVmYXVsdEZvY3VzVGV4dFN0YXRlQ2hhbmdlSW50ZW50KCkpOwotCi0gICAg aWYgKGRvY3VtZW50KCkuZnJhbWUoKSkKLSAgICAgICAgZG9jdW1lbnQoKS5mcmFtZSgpLT5zZWxl Y3Rpb24oKS5yZXZlYWxTZWxlY3Rpb24ocmV2ZWFsTW9kZSk7CisgICAgICAgIHJlc3RvcmVDYWNo ZWRTZWxlY3Rpb24ocmV2ZWFsTW9kZSwgRWxlbWVudDo6ZGVmYXVsdEZvY3VzVGV4dFN0YXRlQ2hh bmdlSW50ZW50KCkpOwogfQogCiB2b2lkIEhUTUxUZXh0QXJlYUVsZW1lbnQ6OmRlZmF1bHRFdmVu dEhhbmRsZXIoRXZlbnQmIGV2ZW50KQpJbmRleDogU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MVGV4 dEZvcm1Db250cm9sRWxlbWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRt bC9IVE1MVGV4dEZvcm1Db250cm9sRWxlbWVudC5jcHAJKHJldmlzaW9uIDIyNjk5OSkKKysrIFNv dXJjZS9XZWJDb3JlL2h0bWwvSFRNTFRleHRGb3JtQ29udHJvbEVsZW1lbnQuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC0xODQsMTUgKzE4NCwxNSBAQCB2b2lkIEhUTUxUZXh0Rm9ybUNvbnRyb2xFbGVt ZW50OjpzZXRTZWxlCiAgICAgc2V0U2VsZWN0aW9uUmFuZ2Uoc2VsZWN0aW9uU3RhcnQoKSwgc2Vs ZWN0aW9uRW5kKCksIGRpcmVjdGlvbik7CiB9CiAKLXZvaWQgSFRNTFRleHRGb3JtQ29udHJvbEVs ZW1lbnQ6OnNlbGVjdChjb25zdCBBWFRleHRTdGF0ZUNoYW5nZUludGVudCYgaW50ZW50KQordm9p ZCBIVE1MVGV4dEZvcm1Db250cm9sRWxlbWVudDo6c2VsZWN0KFNlbGVjdGlvblJldmVhbE1vZGUg cmV2ZWFsTW9kZSwgY29uc3QgQVhUZXh0U3RhdGVDaGFuZ2VJbnRlbnQmIGludGVudCkKIHsKICAg ICAvLyBGSVhNRTogV2Ugc2hvdWxkIGFic3RyYWN0IHRoZSBzZWxlY3Rpb24gYmVoYXZpb3IgaW50 byBhbiBFZGl0aW5nQmVoYXZpb3IgZnVuY3Rpb24gaW5zdGVhZAogICAgIC8vIG9mIGhhcmRjb2Rp bmcgdGhlIGJlaGF2aW9yIHVzaW5nIGEgbWFjcm8gZGVmaW5lLgogI2lmIFBMQVRGT1JNKElPUykK ICAgICAvLyBXZSBkb24ndCB3YW50IHRvIHNlbGVjdCBhbGwgdGhlIHRleHQgb24gaU9TLiBJbnN0 ZWFkIHVzZSB0aGUgc3RhbmRhcmQgdGV4dGZpZWxkIGJlaGF2aW9yIG9mIGdvaW5nIHRvIHRoZSBl bmQgb2YgdGhlIGxpbmUuCi0gICAgc2V0U2VsZWN0aW9uUmFuZ2Uoc3RkOjpudW1lcmljX2xpbWl0 czxpbnQ+OjptYXgoKSwgc3RkOjpudW1lcmljX2xpbWl0czxpbnQ+OjptYXgoKSwgU2VsZWN0aW9u SGFzRm9yd2FyZERpcmVjdGlvbiwgaW50ZW50KTsKKyAgICBzZXRTZWxlY3Rpb25SYW5nZShzdGQ6 Om51bWVyaWNfbGltaXRzPGludD46Om1heCgpLCBzdGQ6Om51bWVyaWNfbGltaXRzPGludD46Om1h eCgpLCBTZWxlY3Rpb25IYXNGb3J3YXJkRGlyZWN0aW9uLCByZXZlYWxNb2RlLCBpbnRlbnQpOwog I2Vsc2UKLSAgICBzZXRTZWxlY3Rpb25SYW5nZSgwLCBzdGQ6Om51bWVyaWNfbGltaXRzPGludD46 Om1heCgpLCBTZWxlY3Rpb25IYXNOb0RpcmVjdGlvbiwgaW50ZW50KTsKKyAgICBzZXRTZWxlY3Rp b25SYW5nZSgwLCBzdGQ6Om51bWVyaWNfbGltaXRzPGludD46Om1heCgpLCBTZWxlY3Rpb25IYXNO b0RpcmVjdGlvbiwgcmV2ZWFsTW9kZSwgaW50ZW50KTsKICNlbmRpZgogfQogCkBAIC0yNzksMTAg KzI3OSwxMCBAQCB2b2lkIEhUTUxUZXh0Rm9ybUNvbnRyb2xFbGVtZW50OjpzZXRTZWxlCiAgICAg ZWxzZSBpZiAoZGlyZWN0aW9uU3RyaW5nID09ICJiYWNrd2FyZCIpCiAgICAgICAgIGRpcmVjdGlv biA9IFNlbGVjdGlvbkhhc0JhY2t3YXJkRGlyZWN0aW9uOwogCi0gICAgcmV0dXJuIHNldFNlbGVj dGlvblJhbmdlKHN0YXJ0LCBlbmQsIGRpcmVjdGlvbiwgaW50ZW50KTsKKyAgICByZXR1cm4gc2V0 U2VsZWN0aW9uUmFuZ2Uoc3RhcnQsIGVuZCwgZGlyZWN0aW9uLCBTZWxlY3Rpb25SZXZlYWxNb2Rl OjpEb05vdFJldmVhbCwgaW50ZW50KTsKIH0KIAotdm9pZCBIVE1MVGV4dEZvcm1Db250cm9sRWxl bWVudDo6c2V0U2VsZWN0aW9uUmFuZ2UoaW50IHN0YXJ0LCBpbnQgZW5kLCBUZXh0RmllbGRTZWxl Y3Rpb25EaXJlY3Rpb24gZGlyZWN0aW9uLCBjb25zdCBBWFRleHRTdGF0ZUNoYW5nZUludGVudCYg aW50ZW50KQordm9pZCBIVE1MVGV4dEZvcm1Db250cm9sRWxlbWVudDo6c2V0U2VsZWN0aW9uUmFu Z2UoaW50IHN0YXJ0LCBpbnQgZW5kLCBUZXh0RmllbGRTZWxlY3Rpb25EaXJlY3Rpb24gZGlyZWN0 aW9uLCBTZWxlY3Rpb25SZXZlYWxNb2RlIHJldmVhbE1vZGUsIGNvbnN0IEFYVGV4dFN0YXRlQ2hh bmdlSW50ZW50JiBpbnRlbnQpCiB7CiAgICAgaWYgKCFpc1RleHRGaWVsZCgpKQogICAgICAgICBy ZXR1cm47CkBAIC0zMjEsNyArMzIxLDcgQEAgdm9pZCBIVE1MVGV4dEZvcm1Db250cm9sRWxlbWVu dDo6c2V0U2VsZQogICAgIH0KIAogICAgIGlmIChSZWZQdHI8RnJhbWU+IGZyYW1lID0gZG9jdW1l bnQoKS5mcmFtZSgpKQotICAgICAgICBmcmFtZS0+c2VsZWN0aW9uKCkubW92ZVdpdGhvdXRWYWxp ZGF0aW9uVG8oc3RhcnRQb3NpdGlvbiwgZW5kUG9zaXRpb24sIGRpcmVjdGlvbiAhPSBTZWxlY3Rp b25IYXNOb0RpcmVjdGlvbiwgIWhhc0ZvY3VzLCBpbnRlbnQpOworICAgICAgICBmcmFtZS0+c2Vs ZWN0aW9uKCkubW92ZVdpdGhvdXRWYWxpZGF0aW9uVG8oc3RhcnRQb3NpdGlvbiwgZW5kUG9zaXRp b24sIGRpcmVjdGlvbiAhPSBTZWxlY3Rpb25IYXNOb0RpcmVjdGlvbiwgIWhhc0ZvY3VzLCByZXZl YWxNb2RlLCBpbnRlbnQpOwogfQogCiBpbnQgSFRNTFRleHRGb3JtQ29udHJvbEVsZW1lbnQ6Omlu ZGV4Rm9yVmlzaWJsZVBvc2l0aW9uKGNvbnN0IFZpc2libGVQb3NpdGlvbiYgcG9zaXRpb24pIGNv bnN0CkBAIC00NzIsOSArNDcyLDkgQEAgUmVmUHRyPFJhbmdlPiBIVE1MVGV4dEZvcm1Db250cm9s RWxlbWVudAogICAgIHJldHVybiBSYW5nZTo6Y3JlYXRlKGRvY3VtZW50KCksIHN0YXJ0Tm9kZSwg c3RhcnQsIGVuZE5vZGUsIGVuZCk7CiB9CiAKLXZvaWQgSFRNTFRleHRGb3JtQ29udHJvbEVsZW1l bnQ6OnJlc3RvcmVDYWNoZWRTZWxlY3Rpb24oY29uc3QgQVhUZXh0U3RhdGVDaGFuZ2VJbnRlbnQm IGludGVudCkKK3ZvaWQgSFRNTFRleHRGb3JtQ29udHJvbEVsZW1lbnQ6OnJlc3RvcmVDYWNoZWRT ZWxlY3Rpb24oU2VsZWN0aW9uUmV2ZWFsTW9kZSByZXZlYWxNb2RlLCBjb25zdCBBWFRleHRTdGF0 ZUNoYW5nZUludGVudCYgaW50ZW50KQogewotICAgIHNldFNlbGVjdGlvblJhbmdlKG1fY2FjaGVk U2VsZWN0aW9uU3RhcnQsIG1fY2FjaGVkU2VsZWN0aW9uRW5kLCBjYWNoZWRTZWxlY3Rpb25EaXJl Y3Rpb24oKSwgaW50ZW50KTsKKyAgICBzZXRTZWxlY3Rpb25SYW5nZShtX2NhY2hlZFNlbGVjdGlv blN0YXJ0LCBtX2NhY2hlZFNlbGVjdGlvbkVuZCwgY2FjaGVkU2VsZWN0aW9uRGlyZWN0aW9uKCks IHJldmVhbE1vZGUsIGludGVudCk7CiB9CiAKIHZvaWQgSFRNTFRleHRGb3JtQ29udHJvbEVsZW1l bnQ6OnNlbGVjdGlvbkNoYW5nZWQoYm9vbCBzaG91bGRGaXJlU2VsZWN0RXZlbnQpCkluZGV4OiBT b3VyY2UvV2ViQ29yZS9odG1sL0hUTUxUZXh0Rm9ybUNvbnRyb2xFbGVtZW50LmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MVGV4dEZvcm1Db250cm9sRWxlbWVudC5oCShy ZXZpc2lvbiAyMjY5OTkpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxUZXh0Rm9ybUNvbnRy b2xFbGVtZW50LmgJKHdvcmtpbmcgY29weSkKQEAgLTY5LDExICs2OSwxMSBAQCBwdWJsaWM6CiAg ICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBzZXRTZWxlY3Rpb25TdGFydChpbnQpOwogICAgIFdFQkNP UkVfRVhQT1JUIHZvaWQgc2V0U2VsZWN0aW9uRW5kKGludCk7CiAgICAgV0VCQ09SRV9FWFBPUlQg dm9pZCBzZXRTZWxlY3Rpb25EaXJlY3Rpb24oY29uc3QgU3RyaW5nJik7Ci0gICAgV0VCQ09SRV9F WFBPUlQgdm9pZCBzZWxlY3QoY29uc3QgQVhUZXh0U3RhdGVDaGFuZ2VJbnRlbnQmID0gQVhUZXh0 U3RhdGVDaGFuZ2VJbnRlbnQoKSk7CisgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBzZWxlY3QoU2Vs ZWN0aW9uUmV2ZWFsTW9kZSA9IFNlbGVjdGlvblJldmVhbE1vZGU6OkRvTm90UmV2ZWFsLCBjb25z dCBBWFRleHRTdGF0ZUNoYW5nZUludGVudCYgPSBBWFRleHRTdGF0ZUNoYW5nZUludGVudCgpKTsK ICAgICBXRUJDT1JFX0VYUE9SVCB2aXJ0dWFsIEV4Y2VwdGlvbk9yPHZvaWQ+IHNldFJhbmdlVGV4 dChjb25zdCBTdHJpbmcmIHJlcGxhY2VtZW50KTsKICAgICBXRUJDT1JFX0VYUE9SVCB2aXJ0dWFs IEV4Y2VwdGlvbk9yPHZvaWQ+IHNldFJhbmdlVGV4dChjb25zdCBTdHJpbmcmIHJlcGxhY2VtZW50 LCB1bnNpZ25lZCBzdGFydCwgdW5zaWduZWQgZW5kLCBjb25zdCBTdHJpbmcmIHNlbGVjdGlvbk1v ZGUpOwogICAgIHZvaWQgc2V0U2VsZWN0aW9uUmFuZ2UoaW50IHN0YXJ0LCBpbnQgZW5kLCBjb25z dCBTdHJpbmcmIGRpcmVjdGlvbiwgY29uc3QgQVhUZXh0U3RhdGVDaGFuZ2VJbnRlbnQmID0gQVhU ZXh0U3RhdGVDaGFuZ2VJbnRlbnQoKSk7Ci0gICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBzZXRTZWxl Y3Rpb25SYW5nZShpbnQgc3RhcnQsIGludCBlbmQsIFRleHRGaWVsZFNlbGVjdGlvbkRpcmVjdGlv biA9IFNlbGVjdGlvbkhhc05vRGlyZWN0aW9uLCBjb25zdCBBWFRleHRTdGF0ZUNoYW5nZUludGVu dCYgPSBBWFRleHRTdGF0ZUNoYW5nZUludGVudCgpKTsKKyAgICBXRUJDT1JFX0VYUE9SVCB2b2lk IHNldFNlbGVjdGlvblJhbmdlKGludCBzdGFydCwgaW50IGVuZCwgVGV4dEZpZWxkU2VsZWN0aW9u RGlyZWN0aW9uID0gU2VsZWN0aW9uSGFzTm9EaXJlY3Rpb24sIFNlbGVjdGlvblJldmVhbE1vZGUg PSBTZWxlY3Rpb25SZXZlYWxNb2RlOjpEb05vdFJldmVhbCwgY29uc3QgQVhUZXh0U3RhdGVDaGFu Z2VJbnRlbnQmID0gQVhUZXh0U3RhdGVDaGFuZ2VJbnRlbnQoKSk7CiAgICAgUmVmUHRyPFJhbmdl PiBzZWxlY3Rpb24oKSBjb25zdDsKICAgICBTdHJpbmcgc2VsZWN0ZWRUZXh0KCkgY29uc3Q7CiAK QEAgLTExNiw3ICsxMTYsNyBAQCBwcm90ZWN0ZWQ6CiAgICAgICAgIG1fY2FjaGVkU2VsZWN0aW9u RGlyZWN0aW9uID0gZGlyZWN0aW9uOwogICAgIH0KIAotICAgIHZvaWQgcmVzdG9yZUNhY2hlZFNl bGVjdGlvbihjb25zdCBBWFRleHRTdGF0ZUNoYW5nZUludGVudCYgPSBBWFRleHRTdGF0ZUNoYW5n ZUludGVudCgpKTsKKyAgICB2b2lkIHJlc3RvcmVDYWNoZWRTZWxlY3Rpb24oU2VsZWN0aW9uUmV2 ZWFsTW9kZSwgY29uc3QgQVhUZXh0U3RhdGVDaGFuZ2VJbnRlbnQmID0gQVhUZXh0U3RhdGVDaGFu Z2VJbnRlbnQoKSk7CiAgICAgYm9vbCBoYXNDYWNoZWRTZWxlY3Rpb24oKSBjb25zdCB7IHJldHVy biBtX2NhY2hlZFNlbGVjdGlvblN0YXJ0ID49IDA7IH0KIAogICAgIHZpcnR1YWwgdm9pZCBzdWJ0 cmVlSGFzQ2hhbmdlZCgpID0gMDsK