219211 2020-11-20 10:41:45 -0800 Rename some wheel-event handling functions for clarity 2020-11-20 11:53:24 -0800 1 1 1 Unclassified WebKit Scrolling WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 219213 1 simon.fraser simon.fraser cmarcelo ews-watchlist fred.wang jamesr luiz simon.fraser thorton tonikitoo webkit-bug-importer oldest_to_newest 1709545 0 simon.fraser 2020-11-20 10:41:45 -0800 Rename some wheel-event handling functions for clarity 1709547 1 414698 simon.fraser 2020-11-20 10:44:38 -0800 Created attachment 414698 Patch 1709567 2 ews-feeder 2020-11-20 11:38:02 -0800 Committed r270125: <https://trac.webkit.org/changeset/270125> All reviewed patches have been landed. Closing bug and clearing flags on attachment 414698. 1709568 3 webkit-bug-importer 2020-11-20 11:39:19 -0800 <rdar://problem/71636337> 414698 2020-11-20 10:44:38 -0800 2020-11-20 11:38:02 -0800 Patch bug-219211-20201120104437.patch text/plain 19179 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjY5OTc0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmI0NTQ3NzVmZjFmODcw N2Q4MDk5MTMwYjhmYWJhNDNkYTBjMGVmMy4uZDk0ZTE4NDM5MGYzNjNmZGNjNTY5MDhkMWNhMDJh ZWJmNWQyNmI4MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ5IEBACisyMDIwLTExLTIwICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFJlbmFtZSBzb21l IHdoZWVsLWV2ZW50IGhhbmRsaW5nIGZ1bmN0aW9ucyBmb3IgY2xhcml0eQorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE5MjExCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlcmUgYXJlIHRvbyBtYW55IGZ1 bmN0aW9ucyBjYWxsZWQgd2hlZWxFdmVudCgpIG9yIGhhbmRsZVdoZWVsRXZlbnQoKSwgbWFraW5n IGl0IGhhcmQKKyAgICAgICAgdG8ga25vdyB3aGljaCBwaGFzZSBvZiBoYW5kbGluZyB0aGV5IGFw cGx5IHRvLiBTbyByZW5hbWUgc29tZSB0byBoYW5kbGVXaGVlbEV2ZW50Rm9yU2Nyb2xsaW5nKCks CisgICAgICAgIHdoaWNoIGFwcGxpZXMgdG8gdGhlICJkZWZhdWx0IGhhbmRsaW5nIiBwaGFzZSBh ZnRlciBET00gZXZlbnQgZGlzcGF0Y2guCisgICAgICAgIAorICAgICAgICBJbiBhZGRpdGlvbiwg bWFrZSBTY3JvbGxhYmxlQXJlYSdzIGhhbmRsZVdoZWVsRXZlbnRGb3JTY3JvbGxpbmcoKSB2aXJ0 dWFsIGFuZCBoYXZlIEZyYW1lVmlldworICAgICAgICBvdmVycmlkZSBpdCAoYSBmdXR1cmUgcGF0 Y2ggd2lsbCBhbHNvIGFkZCBhbiBvdmVycmlkZSBpbiBSZW5kZXJMYXllcikuCisgICAgICAgIAor ICAgICAgICBSZW5hbWUgU2Nyb2xsaW5nQ29vcmRpbmF0b3I6OnBlcmZvcm1EZWZhdWx0V2hlZWxF dmVudEhhbmRsaW5nKCkgdG8gdXNlIGhhbmRsZVdoZWVsRXZlbnRGb3JTY3JvbGxpbmcoKQorICAg ICAgICBmb3IgY2xhcml0eS4KKworICAgICAgICAqIHBhZ2UvRXZlbnRIYW5kbGVyLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OmhhbmRsZVdoZWVsRXZlbnRJbkFwcHJvcHJpYXRlRW5jbG9zaW5nQm94 KToKKyAgICAgICAgKFdlYkNvcmU6OkV2ZW50SGFuZGxlcjo6cHJvY2Vzc1doZWVsRXZlbnRGb3JT Y3JvbGxpbmcpOgorICAgICAgICAoV2ViQ29yZTo6RXZlbnRIYW5kbGVyOjpkZWZhdWx0V2hlZWxF dmVudEhhbmRsZXIpOgorICAgICAgICAqIHBhZ2UvRnJhbWVWaWV3LmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkZyYW1lVmlldzo6aGFuZGxlV2hlZWxFdmVudEZvclNjcm9sbGluZyk6CisgICAgICAg IChXZWJDb3JlOjpGcmFtZVZpZXc6OndoZWVsRXZlbnQpOiBEZWxldGVkLgorICAgICAgICAqIHBh Z2UvRnJhbWVWaWV3Lmg6CisgICAgICAgICogcGFnZS9tYWMvRXZlbnRIYW5kbGVyTWFjLm1tOgor ICAgICAgICAoV2ViQ29yZTo6RXZlbnRIYW5kbGVyOjpkZXRlcm1pbmVXaGVlbEV2ZW50VGFyZ2V0 KToKKyAgICAgICAgKFdlYkNvcmU6OkV2ZW50SGFuZGxlcjo6cHJvY2Vzc1doZWVsRXZlbnRGb3JT Y3JvbGxpbmcpOgorICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ0Nvb3JkaW5hdG9y Lmg6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxpbmdDb29yZGluYXRvcjo6aGFuZGxlV2hlZWxF dmVudEZvclNjcm9sbGluZyk6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxpbmdDb29yZGluYXRv cjo6cGVyZm9ybURlZmF1bHRXaGVlbEV2ZW50SGFuZGxpbmcpOiBEZWxldGVkLgorICAgICAgICAq IHBhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OlNjcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlOjpzY3JvbGxUbyk6CisgICAgICAg ICogcGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9sbGluZ0Nvb3JkaW5hdG9yTWFjLmg6CisgICAgICAg ICogcGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9sbGluZ0Nvb3JkaW5hdG9yTWFjLm1tOgorICAgICAg ICAoV2ViQ29yZTo6U2Nyb2xsaW5nQ29vcmRpbmF0b3JNYWM6OmhhbmRsZVdoZWVsRXZlbnRGb3JT Y3JvbGxpbmcpOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsaW5nQ29vcmRpbmF0b3JNYWM6OnBl cmZvcm1EZWZhdWx0V2hlZWxFdmVudEhhbmRsaW5nKTogRGVsZXRlZC4KKyAgICAgICAgKiBwYWdl L3Njcm9sbGluZy9uaWNvc2lhL1Njcm9sbGluZ0Nvb3JkaW5hdG9yTmljb3NpYS5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpTY3JvbGxpbmdDb29yZGluYXRvck5pY29zaWE6OmhhbmRsZVdoZWVsRXZl bnRGb3JTY3JvbGxpbmcpOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsaW5nQ29vcmRpbmF0b3JO aWNvc2lhOjpwZXJmb3JtRGVmYXVsdFdoZWVsRXZlbnRIYW5kbGluZyk6IERlbGV0ZWQuCisgICAg ICAgICogcGFnZS9zY3JvbGxpbmcvbmljb3NpYS9TY3JvbGxpbmdDb29yZGluYXRvck5pY29zaWEu aDoKKyAgICAgICAgKiBwbGF0Zm9ybS9TY3JvbGxhYmxlQXJlYS5jcHA6CisgICAgICAgIChXZWJD b3JlOjpTY3JvbGxhYmxlQXJlYTo6aGFuZGxlV2hlZWxFdmVudEZvclNjcm9sbGluZyk6CisgICAg ICAgIChXZWJDb3JlOjpTY3JvbGxhYmxlQXJlYTo6aGFuZGxlV2hlZWxFdmVudCk6IERlbGV0ZWQu CisgICAgICAgICogcGxhdGZvcm0vU2Nyb2xsYWJsZUFyZWEuaDoKKwogMjAyMC0xMS0xOCAgWXVz dWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJl bGFuZGluZyByMjY5OTQwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZyBiL1Nv dXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDNhODU2MGZjOWZiN2E4ZWM4NTc1ODU1MmMxNmEw ZmNiZDdkN2M0ZGUuLjkzN2NkMTY3NGE1M2UxZWE2Njg4MTJmNzU4YmViMjRlNDQyZjc2NjUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMjAtMTEtMjAgIFNpbW9uIEZyYXNlciAgPHNpbW9u LmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAgUmVuYW1lIHNvbWUgd2hlZWwtZXZlbnQgaGFu ZGxpbmcgZnVuY3Rpb25zIGZvciBjbGFyaXR5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yMTkyMTEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKyAgICAgICAgCisgICAgICAgIFRoZXJlIGFyZSB0b28gbWFueSBmdW5jdGlvbnMg Y2FsbGVkIHdoZWVsRXZlbnQoKSBvciBoYW5kbGVXaGVlbEV2ZW50KCksIG1ha2luZyBpdCBoYXJk CisgICAgICAgIHRvIGtub3cgd2hpY2ggcGhhc2Ugb2YgaGFuZGxpbmcgdGhleSBhcHBseSB0by4g U28gcmVuYW1lIHNvbWUgdG8gaGFuZGxlV2hlZWxFdmVudEZvclNjcm9sbGluZygpLAorICAgICAg ICB3aGljaCBhcHBsaWVzIHRvIHRoZSAiZGVmYXVsdCBoYW5kbGluZyIgcGhhc2UgYWZ0ZXIgRE9N IGV2ZW50IGRpc3BhdGNoLgorICAgICAgICAKKyAgICAgICAgSW4gYWRkaXRpb24sIG1ha2UgU2Ny b2xsYWJsZUFyZWEncyBoYW5kbGVXaGVlbEV2ZW50Rm9yU2Nyb2xsaW5nKCkgdmlydHVhbCBhbmQg aGF2ZSBGcmFtZVZpZXcKKyAgICAgICAgb3ZlcnJpZGUgaXQgKGEgZnV0dXJlIHBhdGNoIHdpbGwg YWxzbyBhZGQgYW4gb3ZlcnJpZGUgaW4gUmVuZGVyTGF5ZXIpLgorICAgICAgICAKKyAgICAgICAg UmVuYW1lIFNjcm9sbGluZ0Nvb3JkaW5hdG9yOjpwZXJmb3JtRGVmYXVsdFdoZWVsRXZlbnRIYW5k bGluZygpIHRvIHVzZSBoYW5kbGVXaGVlbEV2ZW50Rm9yU2Nyb2xsaW5nKCkKKyAgICAgICAgZm9y IGNsYXJpdHkuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1BsdWdpbnMvUERGL1BERlBsdWdpbi5t bToKKyAgICAgICAgKFdlYktpdDo6UERGUGx1Z2luOjpoYW5kbGVXaGVlbEV2ZW50KToKKwogMjAy MC0xMS0xOCAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAg ICBQcm9wYWdhdGUgd2hlZWwgZXZlbnQgaGFuZGxpbmcgYmFjayB0byB0aGUgc2Nyb2xsaW5nIHRo cmVhZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIuY3BwIGIv U291cmNlL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIuY3BwCmluZGV4IDA3ZjJiMDJhNWEwNTEy N2EyNWUwNDIwMjJhNTQwODRkMzhlYTFjMmMuLjIwODRmZTRjZjAwODI4ZWFhYWZkNDRlYTY4M2Mz MWZmYWY1NmI2M2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVy LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0V2ZW50SGFuZGxlci5jcHAKQEAgLTM0Niw3 ICszNDYsNyBAQCBzdGF0aWMgYm9vbCBoYW5kbGVXaGVlbEV2ZW50SW5BcHByb3ByaWF0ZUVuY2xv c2luZ0JveChOb2RlKiBzdGFydE5vZGUsIGNvbnN0IFdoZQogICAgICAgICAgICAgYm9vbCBzY3Jv bGxpbmdXYXNIYW5kbGVkOwogICAgICAgICAgICAgaWYgKHBsYXRmb3JtRXZlbnQpIHsKICAgICAg ICAgICAgICAgICBhdXRvIGNvcGllZEV2ZW50ID0gcGxhdGZvcm1FdmVudC0+Y29weVdpdGhEZWx0 YXNBbmRWZWxvY2l0eShmaWx0ZXJlZFBsYXRmb3JtRGVsdGEud2lkdGgoKSwgZmlsdGVyZWRQbGF0 Zm9ybURlbHRhLmhlaWdodCgpLCBmaWx0ZXJlZFZlbG9jaXR5KTsKLSAgICAgICAgICAgICAgICBz Y3JvbGxpbmdXYXNIYW5kbGVkID0gYm94TGF5ZXItPmhhbmRsZVdoZWVsRXZlbnQoY29waWVkRXZl bnQpOworICAgICAgICAgICAgICAgIHNjcm9sbGluZ1dhc0hhbmRsZWQgPSBib3hMYXllci0+aGFu ZGxlV2hlZWxFdmVudEZvclNjcm9sbGluZyhjb3BpZWRFdmVudCk7CiAgICAgICAgICAgICB9IGVs c2UKICAgICAgICAgICAgICAgICBzY3JvbGxpbmdXYXNIYW5kbGVkID0gZGlkU2Nyb2xsSW5TY3Jv bGxhYmxlQXJlYSgqYm94TGF5ZXIsIHdoZWVsRXZlbnQpOwogCkBAIC0yNzg3LDcgKzI3ODcsNyBA QCBib29sIEV2ZW50SGFuZGxlcjo6cHJvY2Vzc1doZWVsRXZlbnRGb3JTY3JvbGxpbmcoY29uc3Qg UGxhdGZvcm1XaGVlbEV2ZW50JiBldmVudAogICAgIC8vIFdlIGRvIGFub3RoZXIgY2hlY2sgb24g dGhlIGZyYW1lIHZpZXcgYmVjYXVzZSB0aGUgZXZlbnQgaGFuZGxlciBjYW4gcnVuIEpTIHdoaWNo IHJlc3VsdHMgaW4gdGhlIGZyYW1lIGdldHRpbmcgZGVzdHJveWVkLgogICAgIEZyYW1lVmlldyog dmlldyA9IG1fZnJhbWUudmlldygpOwogICAgIAotICAgIGJvb2wgZGlkSGFuZGxlRXZlbnQgPSB2 aWV3ID8gdmlldy0+d2hlZWxFdmVudChldmVudCkgOiBmYWxzZTsKKyAgICBib29sIGRpZEhhbmRs ZUV2ZW50ID0gdmlldyA/IHZpZXctPmhhbmRsZVdoZWVsRXZlbnRGb3JTY3JvbGxpbmcoZXZlbnQp IDogZmFsc2U7CiAgICAgbV9pc0hhbmRsaW5nV2hlZWxFdmVudCA9IGZhbHNlOwogICAgIHJldHVy biBkaWRIYW5kbGVFdmVudDsKIH0KQEAgLTMwMjUsNyArMzAyNSw3IEBAIHZvaWQgRXZlbnRIYW5k bGVyOjpkZWZhdWx0V2hlZWxFdmVudEhhbmRsZXIoTm9kZSogc3RhcnROb2RlLCBXaGVlbEV2ZW50 JiB3aGVlbEV2CiAgICAgICAgIGF1dG8gcGxhdGZvcm1FdmVudCA9IHdoZWVsRXZlbnQudW5kZXJs eWluZ1BsYXRmb3JtRXZlbnQoKTsKICAgICAgICAgaWYgKHBsYXRmb3JtRXZlbnQpIHsKICAgICAg ICAgICAgIGF1dG8gY29waWVkRXZlbnQgPSBwbGF0Zm9ybUV2ZW50LT5jb3B5V2l0aERlbHRhc0Fu ZFZlbG9jaXR5KGZpbHRlcmVkUGxhdGZvcm1EZWx0YS53aWR0aCgpLCBmaWx0ZXJlZFBsYXRmb3Jt RGVsdGEuaGVpZ2h0KCksIGZpbHRlcmVkVmVsb2NpdHkpOwotICAgICAgICAgICAgaWYgKGxhdGNo ZWRTY3JvbGxlci0+aGFuZGxlV2hlZWxFdmVudChjb3BpZWRFdmVudCkpCisgICAgICAgICAgICBp ZiAobGF0Y2hlZFNjcm9sbGVyLT5oYW5kbGVXaGVlbEV2ZW50Rm9yU2Nyb2xsaW5nKGNvcGllZEV2 ZW50KSkKICAgICAgICAgICAgICAgICB3aGVlbEV2ZW50LnNldERlZmF1bHRIYW5kbGVkKCk7CiAg ICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BhZ2UvRnJhbWVWaWV3LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcApp bmRleCBkNjdiNDQwMDBhNGU5Y2M5MjFjZmRkOTBlOTA2NDU2YjM4MzJiMTVhLi4zMDU4ZDkxZGU2 NWE5Y2MzOGQ1OTA2NzkwYWQzMmE3YzY3ODE4MmZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wYWdlL0ZyYW1lVmlldy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcu Y3BwCkBAIC01MDk4LDcgKzUwOTgsNyBAQCB2b2lkIEZyYW1lVmlldzo6cmVtb3ZlQ2hpbGQoV2lk Z2V0JiB3aWRnZXQpCiAgICAgU2Nyb2xsVmlldzo6cmVtb3ZlQ2hpbGQod2lkZ2V0KTsKIH0KIAot Ym9vbCBGcmFtZVZpZXc6OndoZWVsRXZlbnQoY29uc3QgUGxhdGZvcm1XaGVlbEV2ZW50JiB3aGVl bEV2ZW50KQorYm9vbCBGcmFtZVZpZXc6OmhhbmRsZVdoZWVsRXZlbnRGb3JTY3JvbGxpbmcoY29u c3QgUGxhdGZvcm1XaGVlbEV2ZW50JiB3aGVlbEV2ZW50KQogewogICAgIC8vIE5vdGUgdGhhdCB0 byBhbGxvdyBmb3IgcnViYmVyLWJhbmQgb3Zlci1zY3JvbGwgYmVoYXZpb3IsIGV2ZW4gbm9uLXNj cm9sbGFibGUgdmlld3MKICAgICAvLyBzaG91bGQgaGFuZGxlIHdoZWVsIGV2ZW50cy4KQEAgLTUx MjgsMTEgKzUxMjgsMTEgQEAgYm9vbCBGcmFtZVZpZXc6OndoZWVsRXZlbnQoY29uc3QgUGxhdGZv cm1XaGVlbEV2ZW50JiB3aGVlbEV2ZW50KQogI2lmIEVOQUJMRShBU1lOQ19TQ1JPTExJTkcpCiAg ICAgaWYgKGF1dG8gc2Nyb2xsaW5nQ29vcmRpbmF0b3IgPSB0aGlzLT5zY3JvbGxpbmdDb29yZGlu YXRvcigpKSB7CiAgICAgICAgIGlmIChzY3JvbGxpbmdDb29yZGluYXRvci0+Y29vcmRpbmF0ZXNT Y3JvbGxpbmdGb3JGcmFtZVZpZXcoKnRoaXMpKQotICAgICAgICAgICAgcmV0dXJuIHNjcm9sbGlu Z0Nvb3JkaW5hdG9yLT5wZXJmb3JtRGVmYXVsdFdoZWVsRXZlbnRIYW5kbGluZyh3aGVlbEV2ZW50 LCBzY3JvbGxpbmdOb2RlSUQoKSk7CisgICAgICAgICAgICByZXR1cm4gc2Nyb2xsaW5nQ29vcmRp bmF0b3ItPmhhbmRsZVdoZWVsRXZlbnRGb3JTY3JvbGxpbmcod2hlZWxFdmVudCwgc2Nyb2xsaW5n Tm9kZUlEKCkpOwogICAgIH0KICNlbmRpZgogCi0gICAgcmV0dXJuIFNjcm9sbGFibGVBcmVhOjpo YW5kbGVXaGVlbEV2ZW50KHdoZWVsRXZlbnQpOworICAgIHJldHVybiBTY3JvbGxhYmxlQXJlYTo6 aGFuZGxlV2hlZWxFdmVudEZvclNjcm9sbGluZyh3aGVlbEV2ZW50KTsKIH0KIAogYm9vbCBGcmFt ZVZpZXc6OmlzVmVydGljYWxEb2N1bWVudCgpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wYWdlL0ZyYW1lVmlldy5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuaApp bmRleCBiMzcxOGYxYTg5NDY1OWMyYTQwYzc3Nzk5NGVlMjUyMGQ4M2FlMjhkLi5iMjJmYTZjYjgy ZmJiZTIwMGExYzc0MmFkMDJmNTNmZGRjNWNkYzAwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wYWdlL0ZyYW1lVmlldy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmgK QEAgLTU2NSw3ICs1NjUsNyBAQCBwdWJsaWM6CiAgICAgLy8gVGhpcyBmdW5jdGlvbiBleGlzdHMg Zm9yIHBvcnRzIHRoYXQgbmVlZCB0byBoYW5kbGUgd2hlZWwgZXZlbnRzIG1hbnVhbGx5LgogICAg IC8vIE9uIE1hYyBXZWJLaXQxIHRoZSB1bmRlcmx5aW5nIE5TU2Nyb2xsVmlldyBqdXN0IGRvZXMg dGhlIHNjcm9sbGluZywgYnV0IG9uIG1vc3Qgb3RoZXIgcGxhdGZvcm1zCiAgICAgLy8gd2UgbmVl ZCB0aGlzIGZ1bmN0aW9uIGluIG9yZGVyIHRvIGRvIHRoZSBzY3JvbGwgb3Vyc2VsdmVzLgotICAg IGJvb2wgd2hlZWxFdmVudChjb25zdCBQbGF0Zm9ybVdoZWVsRXZlbnQmKTsKKyAgICBib29sIGhh bmRsZVdoZWVsRXZlbnRGb3JTY3JvbGxpbmcoY29uc3QgUGxhdGZvcm1XaGVlbEV2ZW50JikgZmlu YWw7CiAKICAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIHNldFNjcm9sbGluZ1BlcmZvcm1hbmNlTG9n Z2luZ0VuYWJsZWQoYm9vbCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvbWFj L0V2ZW50SGFuZGxlck1hYy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvbWFjL0V2ZW50SGFuZGxl ck1hYy5tbQppbmRleCAxNGE5ZmFjOTg0MDQwZDY1MmUyMDVkMTBkZGMwMTgwMzA2ZDRmMWRhLi5h ZmQ3NmQyNTZlZDBjZjQ3ZTNlYWIzNDk4ZTQxNzZkYjY5NzI1MGU0IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL21hYy9FdmVudEhhbmRsZXJNYWMubW0KKysrIGIvU291cmNlL1dlYkNv cmUvcGFnZS9tYWMvRXZlbnRIYW5kbGVyTWFjLm1tCkBAIC04NzEsNyArODcxLDcgQEAgdm9pZCBF dmVudEhhbmRsZXI6OmRldGVybWluZVdoZWVsRXZlbnRUYXJnZXQoY29uc3QgUGxhdGZvcm1XaGVl bEV2ZW50JiB3aGVlbEV2ZW4KICAgICAgICAgICAgIHNjcm9sbGFibGVBcmVhID0gbWFrZVdlYWtQ dHIoc3RhdGljX2Nhc3Q8U2Nyb2xsYWJsZUFyZWEmPigqdmlldykpOwogICAgIH0KIAotICAgIExP R19XSVRIX1NUUkVBTShTY3JvbGxMYXRjaGluZywgc3RyZWFtIDw8ICJFdmVudEhhbmRsZXI6OmRl dGVybWluZVdoZWVsRXZlbnRUYXJnZXQoKSAtIGV2ZW50IiA8PCB3aGVlbEV2ZW50IDw8ICIgZm91 bmQgc2Nyb2xsYWJsZUFyZWEgIiA8PCBWYWx1ZU9yTnVsbChzY3JvbGxhYmxlQXJlYS5nZXQoKSkg PDwgIiwgbGF0Y2hpbmcgc3RhdGUgaXMgIiA8PCBwYWdlLT5zY3JvbGxMYXRjaGluZ0NvbnRyb2xs ZXIoKSk7CisgICAgTE9HX1dJVEhfU1RSRUFNKFNjcm9sbExhdGNoaW5nLCBzdHJlYW0gPDwgIkV2 ZW50SGFuZGxlcjo6ZGV0ZXJtaW5lV2hlZWxFdmVudFRhcmdldCgpIC0gZXZlbnQgIiA8PCB3aGVl bEV2ZW50IDw8ICIgZm91bmQgc2Nyb2xsYWJsZUFyZWEgIiA8PCBWYWx1ZU9yTnVsbChzY3JvbGxh YmxlQXJlYS5nZXQoKSkgPDwgIiwgbGF0Y2hpbmcgc3RhdGUgaXMgIiA8PCBwYWdlLT5zY3JvbGxM YXRjaGluZ0NvbnRyb2xsZXIoKSk7CiAKICAgICBpZiAoc2Nyb2xsYWJsZUFyZWEgJiYgcGFnZS0+ aXNNb25pdG9yaW5nV2hlZWxFdmVudHMoKSkKICAgICAgICAgc2Nyb2xsYWJsZUFyZWEtPnNjcm9s bEFuaW1hdG9yKCkuc2V0V2hlZWxFdmVudFRlc3RNb25pdG9yKHBhZ2UtPndoZWVsRXZlbnRUZXN0 TW9uaXRvcigpKTsKQEAgLTkzOSw3ICs5MzksNyBAQCBib29sIEV2ZW50SGFuZGxlcjo6cHJvY2Vz c1doZWVsRXZlbnRGb3JTY3JvbGxpbmcoY29uc3QgUGxhdGZvcm1XaGVlbEV2ZW50JiB3aGVlbAog CiAgICAgICAgIExPR19XSVRIX1NUUkVBTShTY3JvbGxMYXRjaGluZywgc3RyZWFtIDw8ICIgc2Vu ZGluZyB0byB2aWV3ICIgPDwgKnZpZXcpOwogCi0gICAgICAgIGJvb2wgZGlkSGFuZGxlV2hlZWxF dmVudCA9IHZpZXctPndoZWVsRXZlbnQod2hlZWxFdmVudCk7CisgICAgICAgIGJvb2wgZGlkSGFu ZGxlV2hlZWxFdmVudCA9IHZpZXctPmhhbmRsZVdoZWVsRXZlbnRGb3JTY3JvbGxpbmcod2hlZWxF dmVudCk7CiAgICAgICAgIC8vIElmIHRoZSBwbGF0Zm9ybSB3aWRnZXQgaXMgaGFuZGxpbmcgdGhl IGV2ZW50LCB3ZSBhbHdheXMgd2FudCB0byByZXR1cm4gZmFsc2UuCiAgICAgICAgIGlmICh2aWV3 LT5wbGF0Zm9ybVdpZGdldCgpKQogICAgICAgICAgICAgZGlkSGFuZGxlV2hlZWxFdmVudCA9IGZh bHNlOwpAQCAtOTQ4LDcgKzk0OCw3IEBAIGJvb2wgRXZlbnRIYW5kbGVyOjpwcm9jZXNzV2hlZWxF dmVudEZvclNjcm9sbGluZyhjb25zdCBQbGF0Zm9ybVdoZWVsRXZlbnQmIHdoZWVsCiAgICAgICAg IHJldHVybiBkaWRIYW5kbGVXaGVlbEV2ZW50OwogICAgIH0KICAgICAKLSAgICBib29sIGRpZEhh bmRsZUV2ZW50ID0gdmlldy0+d2hlZWxFdmVudCh3aGVlbEV2ZW50KTsKKyAgICBib29sIGRpZEhh bmRsZUV2ZW50ID0gdmlldy0+aGFuZGxlV2hlZWxFdmVudEZvclNjcm9sbGluZyh3aGVlbEV2ZW50 KTsKICAgICBtX2lzSGFuZGxpbmdXaGVlbEV2ZW50ID0gZmFsc2U7CiAgICAgcmV0dXJuIGRpZEhh bmRsZUV2ZW50OwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcv U2Nyb2xsaW5nQ29vcmRpbmF0b3IuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Nj cm9sbGluZ0Nvb3JkaW5hdG9yLmgKaW5kZXggN2I3NGY4YTkwNTFlMzU5OWM0ZGJmNDJiYWZjMDg5 ZTFiZTQ4ZjRkMS4uYTUwMGU4MmE5YmYzYTZlNDJmMTc2MzY5M2UwNDJiYjA5MjEwNjQxZiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nQ29vcmRpbmF0 b3IuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdDb29yZGlu YXRvci5oCkBAIC0xMjcsNyArMTI3LDcgQEAgcHVibGljOgogICAgIC8vIFRoZXNlIHZpcnR1YWwg ZnVuY3Rpb25zIGFyZSBjdXJyZW50bHkgdW5pcXVlIHRvIHRoZSB0aHJlYWRlZCBzY3JvbGxpbmcg YXJjaGl0ZWN0dXJlLiAKICAgICB2aXJ0dWFsIHZvaWQgY29tbWl0VHJlZVN0YXRlSWZOZWVkZWQo KSB7IH0KICAgICB2aXJ0dWFsIGJvb2wgcmVxdWVzdFNjcm9sbFBvc2l0aW9uVXBkYXRlKFNjcm9s bGFibGVBcmVhJiwgY29uc3QgSW50UG9pbnQmLCBTY3JvbGxUeXBlID0gU2Nyb2xsVHlwZTo6UHJv Z3JhbW1hdGljLCBTY3JvbGxDbGFtcGluZyA9IFNjcm9sbENsYW1waW5nOjpDbGFtcGVkKSB7IHJl dHVybiBmYWxzZTsgfQotICAgIHZpcnR1YWwgYm9vbCBwZXJmb3JtRGVmYXVsdFdoZWVsRXZlbnRI YW5kbGluZyhjb25zdCBQbGF0Zm9ybVdoZWVsRXZlbnQmLCBTY3JvbGxpbmdOb2RlSUQpIHsgcmV0 dXJuIGZhbHNlOyB9CisgICAgdmlydHVhbCBib29sIGhhbmRsZVdoZWVsRXZlbnRGb3JTY3JvbGxp bmcoY29uc3QgUGxhdGZvcm1XaGVlbEV2ZW50JiwgU2Nyb2xsaW5nTm9kZUlEKSB7IHJldHVybiBm YWxzZTsgfQogICAgIHZpcnR1YWwgdm9pZCB3aGVlbEV2ZW50V2FzUHJvY2Vzc2VkQnlNYWluVGhy ZWFkKGNvbnN0IFBsYXRmb3JtV2hlZWxFdmVudCYsIE9wdGlvblNldDxFdmVudEhhbmRsaW5nPikg eyB9CiAKICAgICAvLyBDcmVhdGUgYW4gdW5wYXJlbnRlZCBub2RlLgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGUuY3Bw IGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05v ZGUuY3BwCmluZGV4IGViMTY1OTA5NDBkNmZiOGI2N2RiM2Y1NjM3MWMxM2E1ZGZmODhhMGYuLjFl NTkwYjIwMjhiZWY0ZjcxMjZkY2FkOTUyNDhlMjVmYmY0NjZiM2EgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlU2Nyb2xsaW5n Tm9kZS5jcHAKQEAgLTI1Myw3ICsyNTMsNyBAQCB2b2lkIFNjcm9sbGluZ1RyZWVTY3JvbGxpbmdO b2RlOjpzY3JvbGxUbyhjb25zdCBGbG9hdFBvaW50JiBwb3NpdGlvbiwgU2Nyb2xsVHlwZQogICAg IG1fY3VycmVudFNjcm9sbFBvc2l0aW9uID0gYWRqdXN0ZWRTY3JvbGxQb3NpdGlvbihwb3NpdGlv biwgY2xhbXApOwogICAgIAogICAgIExPR19XSVRIX1NUUkVBTShTY3JvbGxpbmcsIHN0cmVhbSA8 PCAiU2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGUgIiA8PCBzY3JvbGxpbmdOb2RlSUQoKSA8PCAi IHNjcm9sbFRvICIgPDwgcG9zaXRpb24gPDwgIiBhZGp1c3RlZCB0byAiCi0gICAgICAgIDw8IG1f Y3VycmVudFNjcm9sbFBvc2l0aW9uIDw8ICIgKCIgPDwgc2Nyb2xsVHlwZSA8PCAiKSAoZGVsdGEg ZnJvbSBsYXN0IGNvbW1pdHRlZCBwb3NpdGlvbiAiIDw8IChtX2xhc3RDb21taXR0ZWRTY3JvbGxQ b3NpdGlvbiAtIG1fY3VycmVudFNjcm9sbFBvc2l0aW9uKSA8PCAiKSIKKyAgICAgICAgPDwgbV9j dXJyZW50U2Nyb2xsUG9zaXRpb24gPDwgIiAoIiA8PCBzY3JvbGxUeXBlIDw8ICIsICIgPDwgY2xh bXAgPDwgIikgKGRlbHRhIGZyb20gbGFzdCBjb21taXR0ZWQgcG9zaXRpb24gIiA8PCAobV9sYXN0 Q29tbWl0dGVkU2Nyb2xsUG9zaXRpb24gLSBtX2N1cnJlbnRTY3JvbGxQb3NpdGlvbikgPDwgIiki CiAgICAgICAgIDw8ICIgcnViYmVyYmFuZGluZyAiIDw8IHNjcm9sbGluZ1RyZWUoKS5pc1J1YmJl ckJhbmRJblByb2dyZXNzRm9yTm9kZShzY3JvbGxpbmdOb2RlSUQoKSkpOwogCiAgICAgdXBkYXRl Vmlld3BvcnRGb3JDdXJyZW50U2Nyb2xsUG9zaXRpb24oKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL21hYy9TY3JvbGxpbmdDb29yZGluYXRvck1hYy5oIGIvU291 cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9sbGluZ0Nvb3JkaW5hdG9yTWFjLmgK aW5kZXggZWU1NzU2NzdkMWIxMWRjMmM4ZmU0MDRhM2QyNDQ4ODE5MThhOWYwMy4uYWU2ZjRlNGU0 ZDRlM2MzMzA1MmJlOWI5Mjk0OGJkNzFmYmZmNTNmMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9sbGluZ0Nvb3JkaW5hdG9yTWFjLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9sbGluZ0Nvb3JkaW5hdG9yTWFjLmgK QEAgLTQxLDcgKzQxLDcgQEAgcHVibGljOgogICAgIHZvaWQgY29tbWl0VHJlZVN0YXRlSWZOZWVk ZWQoKSBmaW5hbDsKIAogICAgIC8vIEhhbmRsZSB0aGUgd2hlZWwgZXZlbnQgb24gdGhlIHNjcm9s bGluZyB0aHJlYWQuIFJldHVybnMgd2hldGhlciB0aGUgZXZlbnQgd2FzIGhhbmRsZWQgb3Igbm90 LgotICAgIGJvb2wgcGVyZm9ybURlZmF1bHRXaGVlbEV2ZW50SGFuZGxpbmcoY29uc3QgUGxhdGZv cm1XaGVlbEV2ZW50JiwgU2Nyb2xsaW5nTm9kZUlEKSBmaW5hbDsKKyAgICBib29sIGhhbmRsZVdo ZWVsRXZlbnRGb3JTY3JvbGxpbmcoY29uc3QgUGxhdGZvcm1XaGVlbEV2ZW50JiwgU2Nyb2xsaW5n Tm9kZUlEKSBmaW5hbDsKICAgICB2b2lkIHdoZWVsRXZlbnRXYXNQcm9jZXNzZWRCeU1haW5UaHJl YWQoY29uc3QgUGxhdGZvcm1XaGVlbEV2ZW50JiwgT3B0aW9uU2V0PEV2ZW50SGFuZGxpbmc+KSBm aW5hbDsKIAogcHJpdmF0ZToKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xs aW5nL21hYy9TY3JvbGxpbmdDb29yZGluYXRvck1hYy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv c2Nyb2xsaW5nL21hYy9TY3JvbGxpbmdDb29yZGluYXRvck1hYy5tbQppbmRleCAxNTZiNjAxNDQ4 NjAzYjgxYjFkM2QwNDk1YjZkMmM0NTM4ZTA2ZWQ3Li40NzZmNGU2YmFhOGJjZDY3MDE2ZjFlNzJi YjhjZDRmOGE0NWUwYTEyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGlu Zy9tYWMvU2Nyb2xsaW5nQ29vcmRpbmF0b3JNYWMubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGFn ZS9zY3JvbGxpbmcvbWFjL1Njcm9sbGluZ0Nvb3JkaW5hdG9yTWFjLm1tCkBAIC03Myw3ICs3Myw3 IEBAIHZvaWQgU2Nyb2xsaW5nQ29vcmRpbmF0b3JNYWM6OnBhZ2VEZXN0cm95ZWQoKQogICAgIH0p OwogfQogCi1ib29sIFNjcm9sbGluZ0Nvb3JkaW5hdG9yTWFjOjpwZXJmb3JtRGVmYXVsdFdoZWVs RXZlbnRIYW5kbGluZyhjb25zdCBQbGF0Zm9ybVdoZWVsRXZlbnQmIHdoZWVsRXZlbnQsIFNjcm9s bGluZ05vZGVJRCB0YXJnZXROb2RlKQorYm9vbCBTY3JvbGxpbmdDb29yZGluYXRvck1hYzo6aGFu ZGxlV2hlZWxFdmVudEZvclNjcm9sbGluZyhjb25zdCBQbGF0Zm9ybVdoZWVsRXZlbnQmIHdoZWVs RXZlbnQsIFNjcm9sbGluZ05vZGVJRCB0YXJnZXROb2RlSUQpCiB7CiAgICAgQVNTRVJUKGlzTWFp blRocmVhZCgpKTsKICAgICBBU1NFUlQobV9wYWdlKTsKQEAgLTgxLDExICs4MSwxMSBAQCBib29s IFNjcm9sbGluZ0Nvb3JkaW5hdG9yTWFjOjpwZXJmb3JtRGVmYXVsdFdoZWVsRXZlbnRIYW5kbGlu Zyhjb25zdCBQbGF0Zm9ybVdoZQogICAgIGlmIChzY3JvbGxpbmdUcmVlKCktPndpbGxXaGVlbEV2 ZW50U3RhcnRTd2lwZUdlc3R1cmUod2hlZWxFdmVudCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsK IAotICAgIExPR19XSVRIX1NUUkVBTShTY3JvbGxpbmcsIHN0cmVhbSA8PCAiU2Nyb2xsaW5nQ29v cmRpbmF0b3JNYWM6OmhhbmRsZVdoZWVsRXZlbnQgLSBzZW5kaW5nIGV2ZW50IHRvIHNjcm9sbGlu ZyB0aHJlYWQiKTsKKyAgICBMT0dfV0lUSF9TVFJFQU0oU2Nyb2xsaW5nLCBzdHJlYW0gPDwgIlNj cm9sbGluZ0Nvb3JkaW5hdG9yTWFjOjpoYW5kbGVXaGVlbEV2ZW50Rm9yU2Nyb2xsaW5nIC0gc2Vu ZGluZyBldmVudCB0byBzY3JvbGxpbmcgdGhyZWFkLCBub2RlICIgPDwgdGFyZ2V0Tm9kZUlEKTsK ICAgICAKICAgICBSZWZQdHI8VGhyZWFkZWRTY3JvbGxpbmdUcmVlPiB0aHJlYWRlZFNjcm9sbGlu Z1RyZWUgPSBkb3duY2FzdDxUaHJlYWRlZFNjcm9sbGluZ1RyZWU+KHNjcm9sbGluZ1RyZWUoKSk7 Ci0gICAgU2Nyb2xsaW5nVGhyZWFkOjpkaXNwYXRjaChbdGhyZWFkZWRTY3JvbGxpbmdUcmVlLCB3 aGVlbEV2ZW50LCB0YXJnZXROb2RlXSB7Ci0gICAgICAgIHRocmVhZGVkU2Nyb2xsaW5nVHJlZS0+ aGFuZGxlV2hlZWxFdmVudEFmdGVyTWFpblRocmVhZCh3aGVlbEV2ZW50LCB0YXJnZXROb2RlKTsK KyAgICBTY3JvbGxpbmdUaHJlYWQ6OmRpc3BhdGNoKFt0aHJlYWRlZFNjcm9sbGluZ1RyZWUsIHdo ZWVsRXZlbnQsIHRhcmdldE5vZGVJRF0geworICAgICAgICB0aHJlYWRlZFNjcm9sbGluZ1RyZWUt PmhhbmRsZVdoZWVsRXZlbnRBZnRlck1haW5UaHJlYWQod2hlZWxFdmVudCwgdGFyZ2V0Tm9kZUlE KTsKICAgICB9KTsKICAgICByZXR1cm4gdHJ1ZTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BhZ2Uvc2Nyb2xsaW5nL25pY29zaWEvU2Nyb2xsaW5nQ29vcmRpbmF0b3JOaWNvc2lhLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL25pY29zaWEvU2Nyb2xsaW5nQ29vcmRp bmF0b3JOaWNvc2lhLmNwcAppbmRleCAzMTQxNzQ4YmZkZDIzMjE0MmRmMmFjMzJkMzg2YjAzNTMw YWE2YTZmLi5iODExNWU4M2NjNzhlNGY3ZDkzYmIyOWM5MDQyNmNkOWY3ZTMxZTgzIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9uaWNvc2lhL1Njcm9sbGluZ0Nvb3Jk aW5hdG9yTmljb3NpYS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvbmlj b3NpYS9TY3JvbGxpbmdDb29yZGluYXRvck5pY29zaWEuY3BwCkBAIC02OSw3ICs2OSw3IEBAIHZv aWQgU2Nyb2xsaW5nQ29vcmRpbmF0b3JOaWNvc2lhOjpjb21taXRUcmVlU3RhdGVJZk5lZWRlZCgp CiAgICAgbV9zY3JvbGxpbmdTdGF0ZVRyZWVDb21taXR0ZXJUaW1lci5zdG9wKCk7CiB9CiAKLWJv b2wgU2Nyb2xsaW5nQ29vcmRpbmF0b3JOaWNvc2lhOjpwZXJmb3JtRGVmYXVsdFdoZWVsRXZlbnRI YW5kbGluZyhjb25zdCBQbGF0Zm9ybVdoZWVsRXZlbnQmIHdoZWVsRXZlbnQsIFNjcm9sbGluZ05v ZGVJRCB0YXJnZXROb2RlKQorYm9vbCBTY3JvbGxpbmdDb29yZGluYXRvck5pY29zaWE6OmhhbmRs ZVdoZWVsRXZlbnRGb3JTY3JvbGxpbmcoY29uc3QgUGxhdGZvcm1XaGVlbEV2ZW50JiB3aGVlbEV2 ZW50LCBTY3JvbGxpbmdOb2RlSUQgdGFyZ2V0Tm9kZSkKIHsKICAgICBBU1NFUlQoaXNNYWluVGhy ZWFkKCkpOwogICAgIEFTU0VSVChtX3BhZ2UpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGFnZS9zY3JvbGxpbmcvbmljb3NpYS9TY3JvbGxpbmdDb29yZGluYXRvck5pY29zaWEuaCBiL1Nv dXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL25pY29zaWEvU2Nyb2xsaW5nQ29vcmRpbmF0b3JO aWNvc2lhLmgKaW5kZXggYmVmNzEwNjBkYWI0ZWU1Y2FmM2FhZGRhMjJlMWRlMTk0MmQ5MGFiMi4u NGZhMTc0ZTU1ZWEyMzZkZGFkOGE3YzNiNDBhMDZmZDZhMTM3NWVmNiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvbmljb3NpYS9TY3JvbGxpbmdDb29yZGluYXRvck5p Y29zaWEuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9uaWNvc2lhL1Njcm9s bGluZ0Nvb3JkaW5hdG9yTmljb3NpYS5oCkBAIC00NCw3ICs0NCw3IEBAIHB1YmxpYzoKIAogICAg IHZvaWQgY29tbWl0VHJlZVN0YXRlSWZOZWVkZWQoKSBvdmVycmlkZTsKIAotICAgIGJvb2wgcGVy Zm9ybURlZmF1bHRXaGVlbEV2ZW50SGFuZGxpbmcoY29uc3QgUGxhdGZvcm1XaGVlbEV2ZW50Jiwg U2Nyb2xsaW5nTm9kZUlEKSBvdmVycmlkZTsKKyAgICBib29sIGhhbmRsZVdoZWVsRXZlbnRGb3JT Y3JvbGxpbmcoY29uc3QgUGxhdGZvcm1XaGVlbEV2ZW50JiwgU2Nyb2xsaW5nTm9kZUlEKSBvdmVy cmlkZTsKICAgICB2b2lkIHdoZWVsRXZlbnRXYXNQcm9jZXNzZWRCeU1haW5UaHJlYWQoY29uc3Qg UGxhdGZvcm1XaGVlbEV2ZW50JiwgT3B0aW9uU2V0PEV2ZW50SGFuZGxpbmc+KSBvdmVycmlkZTsK IAogcHJpdmF0ZToKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbGFi bGVBcmVhLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbGFibGVBcmVhLmNwcApp bmRleCBhODhkNzQ2MzA0Y2M4ZTZjMWFhYzNkMzk0OTUwYThjMmEwOGFlYWZiLi5hZDQ3MzI5YWUw ZTU0Y2I0Y2QxMzA4MzlhMmZkODJmMzJiZDY4NWY2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9TY3JvbGxhYmxlQXJlYS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vU2Nyb2xsYWJsZUFyZWEuY3BwCkBAIC0yMDMsNyArMjAzLDcgQEAgdm9pZCBTY3JvbGxhYmxl QXJlYTo6c2Nyb2xsUG9zaXRpb25DaGFuZ2VkKGNvbnN0IFNjcm9sbFBvc2l0aW9uJiBwb3NpdGlv bikKICAgICAgICAgc2Nyb2xsQW5pbWF0b3IoKS5ub3RpZnlDb250ZW50QXJlYVNjcm9sbGVkKHNj cm9sbFBvc2l0aW9uKCkgLSBvbGRQb3NpdGlvbik7CiB9CiAKLWJvb2wgU2Nyb2xsYWJsZUFyZWE6 OmhhbmRsZVdoZWVsRXZlbnQoY29uc3QgUGxhdGZvcm1XaGVlbEV2ZW50JiB3aGVlbEV2ZW50KQor Ym9vbCBTY3JvbGxhYmxlQXJlYTo6aGFuZGxlV2hlZWxFdmVudEZvclNjcm9sbGluZyhjb25zdCBQ bGF0Zm9ybVdoZWVsRXZlbnQmIHdoZWVsRXZlbnQpCiB7CiAgICAgaWYgKCFpc1Njcm9sbGFibGVP clJ1YmJlcmJhbmRhYmxlKCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbGFibGVBcmVhLmggYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9TY3JvbGxhYmxlQXJlYS5oCmluZGV4IDg1MWEwMmZjYmIzZTk3NjkxYmYwMWQ5YjIx MDk3MWQ5YWU2ZDc5NDkuLjQzODNiNzZjYWY3MDc0ODYwMWRhODUwYTcxNDc4ZDQzNTAxMDExZDMg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbGFibGVBcmVhLmgKKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsYWJsZUFyZWEuaApAQCAtODIsNyArODIs NyBAQCBwdWJsaWM6CiAgICAgLy8gZXhwZWN0IGl0IHRvIGhhcHBlbiBzb21ldGltZSBpbiB0aGUg ZnV0dXJlLgogICAgIHZpcnR1YWwgYm9vbCByZXF1ZXN0U2Nyb2xsUG9zaXRpb25VcGRhdGUoY29u c3QgU2Nyb2xsUG9zaXRpb24mLCBTY3JvbGxUeXBlID0gU2Nyb2xsVHlwZTo6VXNlciwgU2Nyb2xs Q2xhbXBpbmcgPSBTY3JvbGxDbGFtcGluZzo6Q2xhbXBlZCkgeyByZXR1cm4gZmFsc2U7IH0KIAot ICAgIFdFQkNPUkVfRVhQT1JUIGJvb2wgaGFuZGxlV2hlZWxFdmVudChjb25zdCBQbGF0Zm9ybVdo ZWVsRXZlbnQmKTsKKyAgICBXRUJDT1JFX0VYUE9SVCB2aXJ0dWFsIGJvb2wgaGFuZGxlV2hlZWxF dmVudEZvclNjcm9sbGluZyhjb25zdCBQbGF0Zm9ybVdoZWVsRXZlbnQmKTsKIAogICAgIGJvb2wg dXNlc1Njcm9sbFNuYXAoKSBjb25zdDsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQ cm9jZXNzL1BsdWdpbnMvUERGL1BERlBsdWdpbi5tbSBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vz cy9QbHVnaW5zL1BERi9QREZQbHVnaW4ubW0KaW5kZXggOWNiM2FhZWQ3NzVmOWI2ZmQ5M2FjMjY5 NWViODhmZTNjZGRmNjdjYS4uOTU0ZGU3YzI1MjUwMWY5MGUzMjhlOGVmMDcxZTIzNTU0ZmMwNDMy YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1BsdWdpbnMvUERGL1BERlBs dWdpbi5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvUGx1Z2lucy9QREYvUERGUGx1 Z2luLm1tCkBAIC0yOTM4LDcgKzI5MzgsNyBAQCBib29sIFBERlBsdWdpbjo6aGFuZGxlV2hlZWxF dmVudChjb25zdCBXZWJXaGVlbEV2ZW50JiBldmVudCkKICAgICBQREZEaXNwbGF5TW9kZSBkaXNw bGF5TW9kZSA9IFttX3BkZkxheWVyQ29udHJvbGxlciBkaXNwbGF5TW9kZV07CiAKICAgICBpZiAo ZGlzcGxheU1vZGUgPT0ga1BERkRpc3BsYXlTaW5nbGVQYWdlQ29udGludW91cyB8fCBkaXNwbGF5 TW9kZSA9PSBrUERGRGlzcGxheVR3b1VwQ29udGludW91cykKLSAgICAgICAgcmV0dXJuIFNjcm9s bGFibGVBcmVhOjpoYW5kbGVXaGVlbEV2ZW50KHBsYXRmb3JtKGV2ZW50KSk7CisgICAgICAgIHJl dHVybiBTY3JvbGxhYmxlQXJlYTo6aGFuZGxlV2hlZWxFdmVudEZvclNjcm9sbGluZyhwbGF0Zm9y bShldmVudCkpOwogCiAgICAgTlNVSW50ZWdlciBjdXJyZW50UGFnZUluZGV4ID0gW21fcGRmTGF5 ZXJDb250cm9sbGVyIGN1cnJlbnRQYWdlSW5kZXhdOwogICAgIGJvb2wgaW5GaXJzdFBhZ2UgPSAh Y3VycmVudFBhZ2VJbmRleDsKQEAgLTI5NzEsNyArMjk3MSw3IEBAIGJvb2wgUERGUGx1Z2luOjpo YW5kbGVXaGVlbEV2ZW50KGNvbnN0IFdlYldoZWVsRXZlbnQmIGV2ZW50KQogICAgICAgICByZXR1 cm4gdHJ1ZTsKICAgICB9CiAKLSAgICByZXR1cm4gU2Nyb2xsYWJsZUFyZWE6OmhhbmRsZVdoZWVs RXZlbnQocGxhdGZvcm0oZXZlbnQpKTsKKyAgICByZXR1cm4gU2Nyb2xsYWJsZUFyZWE6OmhhbmRs ZVdoZWVsRXZlbnRGb3JTY3JvbGxpbmcocGxhdGZvcm0oZXZlbnQpKTsKIH0KIAogTlNEYXRhICpQ REZQbHVnaW46OmxpdmVEYXRhKCkgY29uc3QK