211491 2020-05-05 21:08:26 -0700 EventHandler::dispatchMouseEvent() cleanup 2020-05-05 22:23:12 -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 1649485 0 simon.fraser 2020-05-05 21:08:26 -0700 EventHandler::dispatchMouseEvent() cleanup 1649486 1 398584 simon.fraser 2020-05-05 21:09:30 -0700 Created attachment 398584 Patch 1649505 2 ews-feeder 2020-05-05 22:22:54 -0700 Committed r261213: <https://trac.webkit.org/changeset/261213> All reviewed patches have been landed. Closing bug and clearing flags on attachment 398584. 1649506 3 webkit-bug-importer 2020-05-05 22:23:12 -0700 <rdar://problem/62917340> 398584 2020-05-05 21:09:30 -0700 2020-05-05 22:22:54 -0700 Patch bug-211491-20200505210929.patch text/plain 10897 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjYxMTk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDAwNjJlNzE1Yzc1ZjAy OThiZmY4MzVlM2JjZTY5NzJiZjY4N2E4NC4uYjI5NjU2OGY0ODFiOTcyZWE1MTkzODUxM2Y3ZGE3 NDdiMWUxZDI3NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIwLTA1LTA1ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIEV2ZW50SGFuZGxl cjo6ZGlzcGF0Y2hNb3VzZUV2ZW50KCkgY2xlYW51cAorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjExNDkxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgUmVwbGFjZSB0aGUgbGFzdCBib29sIGFyZ3VtZW50IHdp dGggRmlyZU1vdXNlT3Zlck91dCwgYW5kIHJlbW92ZSB0aGUgImNhbmNlbGFibGUiIGFyZ3VtZW50 IHRoYXQgd2FzIHVudXNlZC4KKworICAgICAgICAqIHBhZ2UvRXZlbnRIYW5kbGVyLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkV2ZW50SGFuZGxlcjo6aGFuZGxlTW91c2VQcmVzc0V2ZW50KToKKyAg ICAgICAgKFdlYkNvcmU6OkV2ZW50SGFuZGxlcjo6aGFuZGxlTW91c2VEb3VibGVDbGlja0V2ZW50 KToKKyAgICAgICAgKFdlYkNvcmU6OkV2ZW50SGFuZGxlcjo6aGFuZGxlTW91c2VNb3ZlRXZlbnQp OgorICAgICAgICAoV2ViQ29yZTo6RXZlbnRIYW5kbGVyOjpoYW5kbGVNb3VzZVJlbGVhc2VFdmVu dCk6CisgICAgICAgIChXZWJDb3JlOjpFdmVudEhhbmRsZXI6OmhhbmRsZU1vdXNlRm9yY2VFdmVu dCk6CisgICAgICAgIChXZWJDb3JlOjpFdmVudEhhbmRsZXI6OmRpc3BhdGNoTW91c2VFdmVudCk6 CisgICAgICAgIChXZWJDb3JlOjpFdmVudEhhbmRsZXI6OnNlbmRDb250ZXh0TWVudUV2ZW50KToK KyAgICAgICAgKiBwYWdlL0V2ZW50SGFuZGxlci5oOgorCiAyMDIwLTA1LTA1ICBTaW1vbiBGcmFz ZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIE1pbm9yIEV2ZW50SGFuZGxl ciBhbmQgdGVzdCBjbGVhbnVwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0V2ZW50 SGFuZGxlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0V2ZW50SGFuZGxlci5jcHAKaW5kZXgg OTJmNTAyM2I0NTJlMmZiNTJmYmQzMTgxYzkzY2YwZTUzMDQ5NjliZi4uNzk4YTNkYzI3ZGEyMzUx NWQ4MjQ4YjlhMThlYTM3MDUwZjQ5OTY4NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFn ZS9FdmVudEhhbmRsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVy LmNwcApAQCAtMTgwNCw3ICsxODA0LDcgQEAgYm9vbCBFdmVudEhhbmRsZXI6OmhhbmRsZU1vdXNl UHJlc3NFdmVudChjb25zdCBQbGF0Zm9ybU1vdXNlRXZlbnQmIHBsYXRmb3JtTW91c2UKIAogICAg IG1fZnJhbWUuc2VsZWN0aW9uKCkuc2V0Q2FyZXRCbGlua2luZ1N1c3BlbmRlZCh0cnVlKTsKIAot ICAgIGJvb2wgc3dhbGxvd0V2ZW50ID0gIWRpc3BhdGNoTW91c2VFdmVudChldmVudE5hbWVzKCku bW91c2Vkb3duRXZlbnQsIG1vdXNlRXZlbnQudGFyZ2V0Tm9kZSgpLCB0cnVlLCBtX2NsaWNrQ291 bnQsIHBsYXRmb3JtTW91c2VFdmVudCwgdHJ1ZSk7CisgICAgYm9vbCBzd2FsbG93RXZlbnQgPSAh ZGlzcGF0Y2hNb3VzZUV2ZW50KGV2ZW50TmFtZXMoKS5tb3VzZWRvd25FdmVudCwgbW91c2VFdmVu dC50YXJnZXROb2RlKCksIG1fY2xpY2tDb3VudCwgcGxhdGZvcm1Nb3VzZUV2ZW50LCBGaXJlTW91 c2VPdmVyT3V0OjpZZXMpOwogICAgIG1fY2FwdHVyZXNEcmFnZ2luZyA9ICFzd2FsbG93RXZlbnQg fHwgbW91c2VFdmVudC5zY3JvbGxiYXIoKTsKIAogICAgIC8vIElmIHRoZSBoaXQgdGVzdGluZyBv cmlnaW5hbGx5IGRldGVybWluZWQgdGhlIGV2ZW50IHdhcyBpbiBhIHNjcm9sbGJhciwgcmVmZXRj aCB0aGUgTW91c2VFdmVudFdpdGhIaXRUZXN0UmVzdWx0cwpAQCAtMTg2Niw5ICsxODY2LDkgQEAg Ym9vbCBFdmVudEhhbmRsZXI6OmhhbmRsZU1vdXNlRG91YmxlQ2xpY2tFdmVudChjb25zdCBQbGF0 Zm9ybU1vdXNlRXZlbnQmIHBsYXRmb3IKICAgICAgICAgcmV0dXJuIHRydWU7CiAKICAgICBtX2Ns aWNrQ291bnQgPSBwbGF0Zm9ybU1vdXNlRXZlbnQuY2xpY2tDb3VudCgpOwotICAgIGJvb2wgc3dh bGxvd01vdXNlVXBFdmVudCA9ICFkaXNwYXRjaE1vdXNlRXZlbnQoZXZlbnROYW1lcygpLm1vdXNl dXBFdmVudCwgbW91c2VFdmVudC50YXJnZXROb2RlKCksIHRydWUsIG1fY2xpY2tDb3VudCwgcGxh dGZvcm1Nb3VzZUV2ZW50LCBmYWxzZSk7CisgICAgYm9vbCBzd2FsbG93TW91c2VVcEV2ZW50ID0g IWRpc3BhdGNoTW91c2VFdmVudChldmVudE5hbWVzKCkubW91c2V1cEV2ZW50LCBtb3VzZUV2ZW50 LnRhcmdldE5vZGUoKSwgbV9jbGlja0NvdW50LCBwbGF0Zm9ybU1vdXNlRXZlbnQsIEZpcmVNb3Vz ZU92ZXJPdXQ6Ok5vKTsKIAotICAgIGJvb2wgc3dhbGxvd0NsaWNrRXZlbnQgPSBwbGF0Zm9ybU1v dXNlRXZlbnQuYnV0dG9uKCkgIT0gUmlnaHRCdXR0b24gJiYgbW91c2VFdmVudC50YXJnZXROb2Rl KCkgPT0gbV9jbGlja05vZGUgJiYgIWRpc3BhdGNoTW91c2VFdmVudChldmVudE5hbWVzKCkuY2xp Y2tFdmVudCwgbW91c2VFdmVudC50YXJnZXROb2RlKCksIHRydWUsIG1fY2xpY2tDb3VudCwgcGxh dGZvcm1Nb3VzZUV2ZW50LCB0cnVlKTsKKyAgICBib29sIHN3YWxsb3dDbGlja0V2ZW50ID0gcGxh dGZvcm1Nb3VzZUV2ZW50LmJ1dHRvbigpICE9IFJpZ2h0QnV0dG9uICYmIG1vdXNlRXZlbnQudGFy Z2V0Tm9kZSgpID09IG1fY2xpY2tOb2RlICYmICFkaXNwYXRjaE1vdXNlRXZlbnQoZXZlbnROYW1l cygpLmNsaWNrRXZlbnQsIG1vdXNlRXZlbnQudGFyZ2V0Tm9kZSgpLCBtX2NsaWNrQ291bnQsIHBs YXRmb3JtTW91c2VFdmVudCwgRmlyZU1vdXNlT3Zlck91dDo6WWVzKTsKIAogICAgIGlmIChtX2xh c3RTY3JvbGxiYXJVbmRlck1vdXNlKQogICAgICAgICBzd2FsbG93TW91c2VVcEV2ZW50ID0gbV9s YXN0U2Nyb2xsYmFyVW5kZXJNb3VzZS0+bW91c2VVcChwbGF0Zm9ybU1vdXNlRXZlbnQpOwpAQCAt MTk3OCw3ICsxOTc4LDcgQEAgYm9vbCBFdmVudEhhbmRsZXI6OmhhbmRsZU1vdXNlTW92ZUV2ZW50 KGNvbnN0IFBsYXRmb3JtTW91c2VFdmVudCYgcGxhdGZvcm1Nb3VzZUUKICAgICB9CiAKICAgICBp ZiAobV9mcmFtZVNldEJlaW5nUmVzaXplZCkKLSAgICAgICAgcmV0dXJuICFkaXNwYXRjaE1vdXNl RXZlbnQoZXZlbnROYW1lcygpLm1vdXNlbW92ZUV2ZW50LCBtX2ZyYW1lU2V0QmVpbmdSZXNpemVk LmdldCgpLCBmYWxzZSwgMCwgcGxhdGZvcm1Nb3VzZUV2ZW50LCBmYWxzZSk7CisgICAgICAgIHJl dHVybiAhZGlzcGF0Y2hNb3VzZUV2ZW50KGV2ZW50TmFtZXMoKS5tb3VzZW1vdmVFdmVudCwgbV9m cmFtZVNldEJlaW5nUmVzaXplZC5nZXQoKSwgMCwgcGxhdGZvcm1Nb3VzZUV2ZW50LCBGaXJlTW91 c2VPdmVyT3V0OjpObyk7CiAKICAgICAvLyBPbiBpT1MsIG91ciBzY3JvbGxiYXJzIGFyZSBtYW5h Z2VkIGJ5IFVJS2l0LgogI2lmICFQTEFURk9STShJT1NfRkFNSUxZKQpAQCAtMjA1MCwxMyArMjA1 MCwxNCBAQCBib29sIEV2ZW50SGFuZGxlcjo6aGFuZGxlTW91c2VNb3ZlRXZlbnQoY29uc3QgUGxh dGZvcm1Nb3VzZUV2ZW50JiBwbGF0Zm9ybU1vdXNlRQogICAgICAgICBpZiAoYXV0byogdmlldyA9 IG1fZnJhbWUudmlldygpKQogICAgICAgICAgICAgdXBkYXRlQ3Vyc29yKCp2aWV3LCBtb3VzZUV2 ZW50LmhpdFRlc3RSZXN1bHQoKSwgcGxhdGZvcm1Nb3VzZUV2ZW50LnNoaWZ0S2V5KCkpOwogICAg IH0KLSAgICAKKwogICAgIG1fbGFzdE1vdXNlTW92ZUV2ZW50U3ViZnJhbWUgPSBuZXdTdWJmcmFt ZTsKIAogICAgIGlmIChzd2FsbG93RXZlbnQpCiAgICAgICAgIHJldHVybiB0cnVlOwogICAgIAot ICAgIHN3YWxsb3dFdmVudCA9ICFkaXNwYXRjaE1vdXNlRXZlbnQoZXZlbnROYW1lcygpLm1vdXNl bW92ZUV2ZW50LCBtb3VzZUV2ZW50LnRhcmdldE5vZGUoKSwgZmFsc2UsIDAsIHBsYXRmb3JtTW91 c2VFdmVudCwgdHJ1ZSk7CisgICAgc3dhbGxvd0V2ZW50ID0gIWRpc3BhdGNoTW91c2VFdmVudChl dmVudE5hbWVzKCkubW91c2Vtb3ZlRXZlbnQsIG1vdXNlRXZlbnQudGFyZ2V0Tm9kZSgpLCAwLCBw bGF0Zm9ybU1vdXNlRXZlbnQsIEZpcmVNb3VzZU92ZXJPdXQ6Olllcyk7CisKICNpZiBFTkFCTEUo RFJBR19TVVBQT1JUKQogICAgIGlmICghc3dhbGxvd0V2ZW50KQogICAgICAgICBzd2FsbG93RXZl bnQgPSBoYW5kbGVNb3VzZURyYWdnZWRFdmVudChtb3VzZUV2ZW50KTsKQEAgLTIxNDMsMjIgKzIx NDQsMjAgQEAgYm9vbCBFdmVudEhhbmRsZXI6OmhhbmRsZU1vdXNlUmVsZWFzZUV2ZW50KGNvbnN0 IFBsYXRmb3JtTW91c2VFdmVudCYgcGxhdGZvcm1Nb3UKICAgICB9CiAKICAgICBpZiAobV9mcmFt ZVNldEJlaW5nUmVzaXplZCkKLSAgICAgICAgcmV0dXJuICFkaXNwYXRjaE1vdXNlRXZlbnQoZXZl bnROYW1lcygpLm1vdXNldXBFdmVudCwgbV9mcmFtZVNldEJlaW5nUmVzaXplZC5nZXQoKSwgdHJ1 ZSwgbV9jbGlja0NvdW50LCBwbGF0Zm9ybU1vdXNlRXZlbnQsIGZhbHNlKTsKKyAgICAgICAgcmV0 dXJuICFkaXNwYXRjaE1vdXNlRXZlbnQoZXZlbnROYW1lcygpLm1vdXNldXBFdmVudCwgbV9mcmFt ZVNldEJlaW5nUmVzaXplZC5nZXQoKSwgbV9jbGlja0NvdW50LCBwbGF0Zm9ybU1vdXNlRXZlbnQs IEZpcmVNb3VzZU92ZXJPdXQ6Ok5vKTsKIAogICAgIC8vIElmIGFuIGltbWVkaWF0ZSBhY3Rpb24g YmVnYW4gb3Igd2FzIGNvbXBsZXRlZCB1c2luZyB0aGlzIHNlcmllcyBvZiBtb3VzZSBldmVudHMs IHRoZW4gd2Ugc2hvdWxkIHNlbmQgbW91c2V1cCB0bwogICAgIC8vIHRoZSBET00gYW5kIHJldHVy biBub3cgc28gdGhhdCB3ZSBkb24ndCBwZXJmb3JtIG91ciBvd24gZGVmYXVsdCBiZWhhdmlvcnMu CiAgICAgaWYgKG1faW1tZWRpYXRlQWN0aW9uU3RhZ2UgPT0gSW1tZWRpYXRlQWN0aW9uU3RhZ2U6 OkFjdGlvbkNvbXBsZXRlZCB8fCBtX2ltbWVkaWF0ZUFjdGlvblN0YWdlID09IEltbWVkaWF0ZUFj dGlvblN0YWdlOjpBY3Rpb25VcGRhdGVkIHx8IG1faW1tZWRpYXRlQWN0aW9uU3RhZ2UgPT0gSW1t ZWRpYXRlQWN0aW9uU3RhZ2U6OkFjdGlvbkNhbmNlbGxlZEFmdGVyVXBkYXRlKSB7CiAgICAgICAg IG1faW1tZWRpYXRlQWN0aW9uU3RhZ2UgPSBJbW1lZGlhdGVBY3Rpb25TdGFnZTo6Tm9uZTsKLSAg ICAgICAgcmV0dXJuICFkaXNwYXRjaE1vdXNlRXZlbnQoZXZlbnROYW1lcygpLm1vdXNldXBFdmVu dCwgbV9sYXN0RWxlbWVudFVuZGVyTW91c2UuZ2V0KCksIHRydWUsIG1fY2xpY2tDb3VudCwgcGxh dGZvcm1Nb3VzZUV2ZW50LCBmYWxzZSk7CisgICAgICAgIHJldHVybiAhZGlzcGF0Y2hNb3VzZUV2 ZW50KGV2ZW50TmFtZXMoKS5tb3VzZXVwRXZlbnQsIG1fbGFzdEVsZW1lbnRVbmRlck1vdXNlLmdl dCgpLCBtX2NsaWNrQ291bnQsIHBsYXRmb3JtTW91c2VFdmVudCwgRmlyZU1vdXNlT3Zlck91dDo6 Tm8pOwogICAgIH0KICAgICBtX2ltbWVkaWF0ZUFjdGlvblN0YWdlID0gSW1tZWRpYXRlQWN0aW9u U3RhZ2U6Ok5vbmU7CiAKICAgICBpZiAobV9sYXN0U2Nyb2xsYmFyVW5kZXJNb3VzZSkgewogICAg ICAgICBpbnZhbGlkYXRlQ2xpY2soKTsKICAgICAgICAgbV9sYXN0U2Nyb2xsYmFyVW5kZXJNb3Vz ZS0+bW91c2VVcChwbGF0Zm9ybU1vdXNlRXZlbnQpOwotICAgICAgICBib29sIGNhbmNlbGFibGUg PSB0cnVlOwotICAgICAgICBib29sIHNldFVuZGVyID0gZmFsc2U7Ci0gICAgICAgIHJldHVybiAh ZGlzcGF0Y2hNb3VzZUV2ZW50KGV2ZW50TmFtZXMoKS5tb3VzZXVwRXZlbnQsIG1fbGFzdEVsZW1l bnRVbmRlck1vdXNlLmdldCgpLCBjYW5jZWxhYmxlLCBtX2NsaWNrQ291bnQsIHBsYXRmb3JtTW91 c2VFdmVudCwgc2V0VW5kZXIpOworICAgICAgICByZXR1cm4gIWRpc3BhdGNoTW91c2VFdmVudChl dmVudE5hbWVzKCkubW91c2V1cEV2ZW50LCBtX2xhc3RFbGVtZW50VW5kZXJNb3VzZS5nZXQoKSwg bV9jbGlja0NvdW50LCBwbGF0Zm9ybU1vdXNlRXZlbnQsIEZpcmVNb3VzZU92ZXJPdXQ6Ok5vKTsK ICAgICB9CiAKICAgICBjb25zdGV4cHIgT3B0aW9uU2V0PEhpdFRlc3RSZXF1ZXN0OjpSZXF1ZXN0 VHlwZT4gaGl0VHlwZSB7IEhpdFRlc3RSZXF1ZXN0OjpSZWxlYXNlLCBIaXRUZXN0UmVxdWVzdDo6 RGlzYWxsb3dVc2VyQWdlbnRTaGFkb3dDb250ZW50IH07CkBAIC0yMTY5LDEyICsyMTY4LDEyIEBA IGJvb2wgRXZlbnRIYW5kbGVyOjpoYW5kbGVNb3VzZVJlbGVhc2VFdmVudChjb25zdCBQbGF0Zm9y bU1vdXNlRXZlbnQmIHBsYXRmb3JtTW91CiAgICAgaWYgKHN1YmZyYW1lICYmIHBhc3NNb3VzZVJl bGVhc2VFdmVudFRvU3ViZnJhbWUobW91c2VFdmVudCwgKnN1YmZyYW1lKSkKICAgICAgICAgcmV0 dXJuIHRydWU7CiAKLSAgICBib29sIHN3YWxsb3dNb3VzZVVwRXZlbnQgPSAhZGlzcGF0Y2hNb3Vz ZUV2ZW50KGV2ZW50TmFtZXMoKS5tb3VzZXVwRXZlbnQsIG1vdXNlRXZlbnQudGFyZ2V0Tm9kZSgp LCB0cnVlLCBtX2NsaWNrQ291bnQsIHBsYXRmb3JtTW91c2VFdmVudCwgZmFsc2UpOworICAgIGJv b2wgc3dhbGxvd01vdXNlVXBFdmVudCA9ICFkaXNwYXRjaE1vdXNlRXZlbnQoZXZlbnROYW1lcygp Lm1vdXNldXBFdmVudCwgbW91c2VFdmVudC50YXJnZXROb2RlKCksIG1fY2xpY2tDb3VudCwgcGxh dGZvcm1Nb3VzZUV2ZW50LCBGaXJlTW91c2VPdmVyT3V0OjpObyk7CiAKICAgICBib29sIGNvbnRl eHRNZW51RXZlbnQgPSBwbGF0Zm9ybU1vdXNlRXZlbnQuYnV0dG9uKCkgPT0gUmlnaHRCdXR0b247 CiAKICAgICBhdXRvIG5vZGVUb0NsaWNrID0gdGFyZ2V0Tm9kZUZvckNsaWNrRXZlbnQobV9jbGlj a05vZGUuZ2V0KCksIG1vdXNlRXZlbnQudGFyZ2V0Tm9kZSgpKTsKLSAgICBib29sIHN3YWxsb3dD bGlja0V2ZW50ID0gbV9jbGlja0NvdW50ID4gMCAmJiAhY29udGV4dE1lbnVFdmVudCAmJiBub2Rl VG9DbGljayAmJiAhZGlzcGF0Y2hNb3VzZUV2ZW50KGV2ZW50TmFtZXMoKS5jbGlja0V2ZW50LCBu b2RlVG9DbGljay5nZXQoKSwgdHJ1ZSwgbV9jbGlja0NvdW50LCBwbGF0Zm9ybU1vdXNlRXZlbnQs IHRydWUpOworICAgIGJvb2wgc3dhbGxvd0NsaWNrRXZlbnQgPSBtX2NsaWNrQ291bnQgPiAwICYm ICFjb250ZXh0TWVudUV2ZW50ICYmIG5vZGVUb0NsaWNrICYmICFkaXNwYXRjaE1vdXNlRXZlbnQo ZXZlbnROYW1lcygpLmNsaWNrRXZlbnQsIG5vZGVUb0NsaWNrLmdldCgpLCBtX2NsaWNrQ291bnQs IHBsYXRmb3JtTW91c2VFdmVudCwgRmlyZU1vdXNlT3Zlck91dDo6WWVzKTsKIAogICAgIGlmICht X3Jlc2l6ZUxheWVyKSB7CiAgICAgICAgIG1fcmVzaXplTGF5ZXItPnNldEluUmVzaXplTW9kZShm YWxzZSk7CkBAIC0yMjE2LDExICsyMjE1LDExIEBAIGJvb2wgRXZlbnRIYW5kbGVyOjpoYW5kbGVN b3VzZUZvcmNlRXZlbnQoY29uc3QgUGxhdGZvcm1Nb3VzZUV2ZW50JiBldmVudCkKIAogICAgIGF1 dG8gbW91c2VFdmVudCA9IHByZXBhcmVNb3VzZUV2ZW50KGhpdFR5cGUsIGV2ZW50KTsKIAotICAg IGJvb2wgc3dhbGxvd2VkRXZlbnQgPSAhZGlzcGF0Y2hNb3VzZUV2ZW50KGV2ZW50TmFtZXMoKS53 ZWJraXRtb3VzZWZvcmNlY2hhbmdlZEV2ZW50LCBtb3VzZUV2ZW50LnRhcmdldE5vZGUoKSwgZmFs c2UsIDAsIGV2ZW50LCBmYWxzZSk7CisgICAgYm9vbCBzd2FsbG93ZWRFdmVudCA9ICFkaXNwYXRj aE1vdXNlRXZlbnQoZXZlbnROYW1lcygpLndlYmtpdG1vdXNlZm9yY2VjaGFuZ2VkRXZlbnQsIG1v dXNlRXZlbnQudGFyZ2V0Tm9kZSgpLCAwLCBldmVudCwgRmlyZU1vdXNlT3Zlck91dDo6Tm8pOwog ICAgIGlmIChldmVudC50eXBlKCkgPT0gUGxhdGZvcm1FdmVudDo6TW91c2VGb3JjZURvd24pCi0g ICAgICAgIHN3YWxsb3dlZEV2ZW50IHw9ICFkaXNwYXRjaE1vdXNlRXZlbnQoZXZlbnROYW1lcygp LndlYmtpdG1vdXNlZm9yY2Vkb3duRXZlbnQsIG1vdXNlRXZlbnQudGFyZ2V0Tm9kZSgpLCBmYWxz ZSwgMCwgZXZlbnQsIGZhbHNlKTsKKyAgICAgICAgc3dhbGxvd2VkRXZlbnQgfD0gIWRpc3BhdGNo TW91c2VFdmVudChldmVudE5hbWVzKCkud2Via2l0bW91c2Vmb3JjZWRvd25FdmVudCwgbW91c2VF dmVudC50YXJnZXROb2RlKCksIDAsIGV2ZW50LCBGaXJlTW91c2VPdmVyT3V0OjpObyk7CiAgICAg aWYgKGV2ZW50LnR5cGUoKSA9PSBQbGF0Zm9ybUV2ZW50OjpNb3VzZUZvcmNlVXApCi0gICAgICAg IHN3YWxsb3dlZEV2ZW50IHw9ICFkaXNwYXRjaE1vdXNlRXZlbnQoZXZlbnROYW1lcygpLndlYmtp dG1vdXNlZm9yY2V1cEV2ZW50LCBtb3VzZUV2ZW50LnRhcmdldE5vZGUoKSwgZmFsc2UsIDAsIGV2 ZW50LCBmYWxzZSk7CisgICAgICAgIHN3YWxsb3dlZEV2ZW50IHw9ICFkaXNwYXRjaE1vdXNlRXZl bnQoZXZlbnROYW1lcygpLndlYmtpdG1vdXNlZm9yY2V1cEV2ZW50LCBtb3VzZUV2ZW50LnRhcmdl dE5vZGUoKSwgMCwgZXZlbnQsIEZpcmVNb3VzZU92ZXJPdXQ6Ok5vKTsKIAogICAgIHJldHVybiBz d2FsbG93ZWRFdmVudDsKIH0KQEAgLTI2NTMsMTEgKzI2NTIsMTEgQEAgc3RhdGljIFJlZlB0cjxF bGVtZW50PiBmaW5kRmlyc3RNb3VzZUZvY3VzYWJsZUVsZW1lbnRJbkNvbXBvc2VkVHJlZShFbGVt ZW50JiBob3MKICAgICByZXR1cm4gbnVsbHB0cjsKIH0KIAotYm9vbCBFdmVudEhhbmRsZXI6OmRp c3BhdGNoTW91c2VFdmVudChjb25zdCBBdG9tU3RyaW5nJiBldmVudFR5cGUsIE5vZGUqIHRhcmdl dE5vZGUsIGJvb2wgLypjYW5jZWxhYmxlKi8sIGludCBjbGlja0NvdW50LCBjb25zdCBQbGF0Zm9y bU1vdXNlRXZlbnQmIHBsYXRmb3JtTW91c2VFdmVudCwgYm9vbCBzZXRVbmRlcikKK2Jvb2wgRXZl bnRIYW5kbGVyOjpkaXNwYXRjaE1vdXNlRXZlbnQoY29uc3QgQXRvbVN0cmluZyYgZXZlbnRUeXBl LCBOb2RlKiB0YXJnZXROb2RlLCBpbnQgY2xpY2tDb3VudCwgY29uc3QgUGxhdGZvcm1Nb3VzZUV2 ZW50JiBwbGF0Zm9ybU1vdXNlRXZlbnQsIEZpcmVNb3VzZU92ZXJPdXQgZmlyZU1vdXNlT3Zlck91 dCkKIHsKICAgICBSZWY8RnJhbWU+IHByb3RlY3RlZEZyYW1lKG1fZnJhbWUpOwogCi0gICAgdXBk YXRlTW91c2VFdmVudFRhcmdldE5vZGUodGFyZ2V0Tm9kZSwgcGxhdGZvcm1Nb3VzZUV2ZW50LCBz ZXRVbmRlciA/IEZpcmVNb3VzZU92ZXJPdXQ6OlllcyA6IEZpcmVNb3VzZU92ZXJPdXQ6Ok5vKTsK KyAgICB1cGRhdGVNb3VzZUV2ZW50VGFyZ2V0Tm9kZSh0YXJnZXROb2RlLCBwbGF0Zm9ybU1vdXNl RXZlbnQsIGZpcmVNb3VzZU92ZXJPdXQpOwogCiAgICAgaWYgKG1fZWxlbWVudFVuZGVyTW91c2Ug JiYgIW1fZWxlbWVudFVuZGVyTW91c2UtPmRpc3BhdGNoTW91c2VFdmVudChwbGF0Zm9ybU1vdXNl RXZlbnQsIGV2ZW50VHlwZSwgY2xpY2tDb3VudCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKQEAg LTMwMDEsNyArMzAwMCw3IEBAIGJvb2wgRXZlbnRIYW5kbGVyOjpzZW5kQ29udGV4dE1lbnVFdmVu dChjb25zdCBQbGF0Zm9ybU1vdXNlRXZlbnQmIGV2ZW50KQogICAgICAgICBzZWxlY3RDbG9zZXN0 Q29udGV4dHVhbFdvcmRPckxpbmtGcm9tTW91c2VFdmVudChtb3VzZUV2ZW50KTsKICAgICB9CiAK LSAgICBzd2FsbG93RXZlbnQgPSAhZGlzcGF0Y2hNb3VzZUV2ZW50KGV2ZW50TmFtZXMoKS5jb250 ZXh0bWVudUV2ZW50LCBtb3VzZUV2ZW50LnRhcmdldE5vZGUoKSwgdHJ1ZSwgMCwgZXZlbnQsIGZh bHNlKTsKKyAgICBzd2FsbG93RXZlbnQgPSAhZGlzcGF0Y2hNb3VzZUV2ZW50KGV2ZW50TmFtZXMo KS5jb250ZXh0bWVudUV2ZW50LCBtb3VzZUV2ZW50LnRhcmdldE5vZGUoKSwgMCwgZXZlbnQsIEZp cmVNb3VzZU92ZXJPdXQ6Ok5vKTsKICAgICAKICAgICByZXR1cm4gc3dhbGxvd0V2ZW50OwogfQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIuaCBiL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmgKaW5kZXggNWI0NjQ0MGUyOGExNTM2ZTdlOTZiMmY3 MTljMmRmNGQ5ODlhNzYzOS4uYmRiZTcwYzgwYmU4NzYzODRiNDFiNjUwNzNjYTkwMjFmOGUxZTQz YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIuaAorKysgYi9T b3VyY2UvV2ViQ29yZS9wYWdlL0V2ZW50SGFuZGxlci5oCkBAIC00MDUsNyArNDA1LDggQEAgcHJp dmF0ZToKIAogICAgIE1vdXNlRXZlbnRXaXRoSGl0VGVzdFJlc3VsdHMgcHJlcGFyZU1vdXNlRXZl bnQoY29uc3QgSGl0VGVzdFJlcXVlc3QmLCBjb25zdCBQbGF0Zm9ybU1vdXNlRXZlbnQmKTsKIAot ICAgIGJvb2wgZGlzcGF0Y2hNb3VzZUV2ZW50KGNvbnN0IEF0b21TdHJpbmcmIGV2ZW50VHlwZSwg Tm9kZSogdGFyZ2V0LCBib29sIGNhbmNlbGFibGUsIGludCBjbGlja0NvdW50LCBjb25zdCBQbGF0 Zm9ybU1vdXNlRXZlbnQmLCBib29sIHNldFVuZGVyKTsKKyAgICBlbnVtIGNsYXNzIENhbmNlbGFi bGUgeyBObywgWWVzIH07CisgICAgYm9vbCBkaXNwYXRjaE1vdXNlRXZlbnQoY29uc3QgQXRvbVN0 cmluZyYgZXZlbnRUeXBlLCBOb2RlKiB0YXJnZXQsIGludCBjbGlja0NvdW50LCBjb25zdCBQbGF0 Zm9ybU1vdXNlRXZlbnQmLCBGaXJlTW91c2VPdmVyT3V0KTsKIAogI2lmIEVOQUJMRShEUkFHX1NV UFBPUlQpCiAgICAgYm9vbCBkaXNwYXRjaERyYWdFdmVudChjb25zdCBBdG9tU3RyaW5nJiBldmVu dFR5cGUsIEVsZW1lbnQmIHRhcmdldCwgY29uc3QgUGxhdGZvcm1Nb3VzZUV2ZW50JiwgRGF0YVRy YW5zZmVyJik7Cg==