209918 2020-04-02 12:12:20 -0700 Rename some wheel-event related functions 2020-04-02 14:45:14 -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 wenson_hsieh zalan oldest_to_newest 1636999 0 simon.fraser 2020-04-02 12:12:20 -0700 Rename some wheel-event related functions 1637001 1 395287 simon.fraser 2020-04-02 12:14:32 -0700 Created attachment 395287 Patch 1637005 2 395287 wenson_hsieh 2020-04-02 12:18:43 -0700 Comment on attachment 395287 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=395287&action=review > Source/WebCore/ChangeLog:8 > + Rename some funcitons to describe what they do, rather than being generic "platform" things, to make Nit - “funcitons" > Source/WebCore/page/EventHandler.cpp:2714 > +void EventHandler::clearLatchedStateTimeFired() Nit - clearLatchedStateTimerFired instead? 1637069 3 simon.fraser 2020-04-02 14:45:01 -0700 https://trac.webkit.org/changeset/259416/webkit 1637071 4 webkit-bug-importer 2020-04-02 14:45:14 -0700 <rdar://problem/61227489> 395287 2020-04-02 12:14:32 -0700 2020-04-02 12:16:21 -0700 Patch bug-209918-20200402121431.patch text/plain 16773 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5Mzk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTVjNTg0YWFmMWQyNTI2 NWYyMDMxNTMwYjViMGI2MDQwYjQ1Yzg3My4uZWNjY2FmNTgxZmY2OTk0Y2MwZTdhYTM4NTNkMzJl OGE1NzgzMmYzYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQwIEBACisyMDIwLTA0LTAyICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFJlbmFtZSBzb21l IHdoZWVsLWV2ZW50IHJlbGF0ZWQgZnVuY3Rpb25zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDk5MTgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBSZW5hbWUgc29tZSBmdW5jaXRvbnMgdG8gZGVzY3JpYmUg d2hhdCB0aGV5IGRvLCByYXRoZXIgdGhhbiBiZWluZyBnZW5lcmljICJwbGF0Zm9ybSIgdGhpbmdz LCB0byBtYWtlCisgICAgICAgIHRoZSBjb2RlIGVhc2llciB0byByZWFkLgorCisgICAgICAgIFNp bWlsYXJseSwgcmVuYW1lIG1fY2xlYXJMYXRjaGluZ1N0YXRlVGltZXIgZm9yIHdoYXQgaXQgZG9l cy4KKworICAgICAgICAqIHBhZ2UvRXZlbnRIYW5kbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkV2ZW50SGFuZGxlcjo6RXZlbnRIYW5kbGVyKToKKyAgICAgICAgKFdlYkNvcmU6OkV2ZW50SGFu ZGxlcjo6Y2xlYXJMYXRjaGVkU3RhdGVUaW1lRmlyZWQpOgorICAgICAgICAoV2ViQ29yZTo6RXZl bnRIYW5kbGVyOjpkZXRlcm1pbmVXaGVlbEV2ZW50VGFyZ2V0KToKKyAgICAgICAgKFdlYkNvcmU6 OkV2ZW50SGFuZGxlcjo6cmVjb3JkV2hlZWxFdmVudEZvckRlbHRhRmlsdGVyKToKKyAgICAgICAg KFdlYkNvcmU6OkV2ZW50SGFuZGxlcjo6cHJvY2Vzc1doZWVsRXZlbnRGb3JTY3JvbGxpbmcpOgor ICAgICAgICAoV2ViQ29yZTo6RXZlbnRIYW5kbGVyOjpwcm9jZXNzV2hlZWxFdmVudEZvclNjcm9s bFNuYXApOgorICAgICAgICAoV2ViQ29yZTo6RXZlbnRIYW5kbGVyOjpjb21wbGV0ZVdpZGdldFdo ZWVsRXZlbnQpOgorICAgICAgICAoV2ViQ29yZTo6RXZlbnRIYW5kbGVyOjpoYW5kbGVXaGVlbEV2 ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkV2ZW50SGFuZGxlcjo6cGxhdGZvcm1QcmVwYXJlRm9y V2hlZWxFdmVudHMpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6RXZlbnRIYW5kbGVyOjpw bGF0Zm9ybVJlY29yZFdoZWVsRXZlbnQpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6RXZl bnRIYW5kbGVyOjpwbGF0Zm9ybUNvbXBsZXRlV2hlZWxFdmVudCk6IERlbGV0ZWQuCisgICAgICAg IChXZWJDb3JlOjpFdmVudEhhbmRsZXI6OnBsYXRmb3JtTm90aWZ5SWZFbmRHZXN0dXJlKTogRGVs ZXRlZC4KKyAgICAgICAgKiBwYWdlL0V2ZW50SGFuZGxlci5oOgorICAgICAgICAqIHBhZ2UvbWFj L0V2ZW50SGFuZGxlck1hYy5tbToKKyAgICAgICAgKFdlYkNvcmU6OkV2ZW50SGFuZGxlcjo6Y2xl YXJPclNjaGVkdWxlQ2xlYXJpbmdMYXRjaGVkU3RhdGVJZk5lZWRlZCk6CisgICAgICAgIChXZWJD b3JlOjpFdmVudEhhbmRsZXI6OmRldGVybWluZVdoZWVsRXZlbnRUYXJnZXQpOgorICAgICAgICAo V2ViQ29yZTo6RXZlbnRIYW5kbGVyOjpyZWNvcmRXaGVlbEV2ZW50Rm9yRGVsdGFGaWx0ZXIpOgor ICAgICAgICAoV2ViQ29yZTo6RXZlbnRIYW5kbGVyOjpwcm9jZXNzV2hlZWxFdmVudEZvclNjcm9s bGluZyk6CisgICAgICAgIChXZWJDb3JlOjpFdmVudEhhbmRsZXI6OnByb2Nlc3NXaGVlbEV2ZW50 Rm9yU2Nyb2xsU25hcCk6CisgICAgICAgIChXZWJDb3JlOjpFdmVudEhhbmRsZXI6OnBsYXRmb3Jt UHJlcGFyZUZvcldoZWVsRXZlbnRzKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkV2ZW50 SGFuZGxlcjo6cGxhdGZvcm1SZWNvcmRXaGVlbEV2ZW50KTogRGVsZXRlZC4KKyAgICAgICAgKFdl YkNvcmU6OkV2ZW50SGFuZGxlcjo6cGxhdGZvcm1Db21wbGV0ZVdoZWVsRXZlbnQpOiBEZWxldGVk LgorICAgICAgICAoV2ViQ29yZTo6RXZlbnRIYW5kbGVyOjpwbGF0Zm9ybU5vdGlmeUlmRW5kR2Vz dHVyZSk6IERlbGV0ZWQuCisKIDIwMjAtMDQtMDIgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtp dC5vcmc+CiAKICAgICAgICAgUmVtb3ZlIGEgc3VwZXJmbG91cyBibGFuayBsaW5lIGFkZGVkIGlu IHRoZSBwcmV2aW91cyBjb21taXQgYXMgcG9pbnRlZCBvdXQgZHVyaW5nIHRoZSBjb2RlIHJldmll dy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmNwcAppbmRleCA2MDQ4ZjgyZjU0ZmQ0MGI1 ZjlkZjQ3NmU3N2YyNTFhMGZlYmQ3MWE3Li45YjAxMjhiNmU2MmMzYjAyYWI1NDhhZGEwNGFkYzEz MjM0MmQ4NGVlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0V2ZW50SGFuZGxlci5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIuY3BwCkBAIC0zNzcsNyAr Mzc3LDcgQEAgRXZlbnRIYW5kbGVyOjpFdmVudEhhbmRsZXIoRnJhbWUmIGZyYW1lKQogICAgICwg bV9ob3ZlclRpbWVyKCp0aGlzLCAmRXZlbnRIYW5kbGVyOjpob3ZlclRpbWVyRmlyZWQpCiAgICAg LCBtX2N1cnNvclVwZGF0ZVRpbWVyKCp0aGlzLCAmRXZlbnRIYW5kbGVyOjpjdXJzb3JVcGRhdGVU aW1lckZpcmVkKQogI2lmIFBMQVRGT1JNKE1BQykKLSAgICAsIG1fcGVuZGluZ01vbWVudHVtV2hl ZWxFdmVudHNUaW1lcigqdGhpcywgJkV2ZW50SGFuZGxlcjo6Y2xlYXJMYXRjaGVkU3RhdGUpCisg ICAgLCBtX2NsZWFyTGF0Y2hpbmdTdGF0ZVRpbWVyKCp0aGlzLCAmRXZlbnRIYW5kbGVyOjpjbGVh ckxhdGNoZWRTdGF0ZVRpbWVGaXJlZCkKICNlbmRpZgogICAgICwgbV9hdXRvc2Nyb2xsQ29udHJv bGxlcihtYWtlVW5pcXVlPEF1dG9zY3JvbGxDb250cm9sbGVyPigpKQogI2lmICFFTkFCTEUoSU9T X1RPVUNIX0VWRU5UUykKQEAgLTI3MTEsMTkgKzI3MTEsMjUgQEAgYm9vbCBFdmVudEhhbmRsZXI6 OnNob3VsZFN3YXBTY3JvbGxEaXJlY3Rpb24oY29uc3QgSGl0VGVzdFJlc3VsdCYsIGNvbnN0IFBs YXRmb3IKIAogI2VuZGlmCiAKK3ZvaWQgRXZlbnRIYW5kbGVyOjpjbGVhckxhdGNoZWRTdGF0ZVRp bWVGaXJlZCgpCit7CisgICAgTE9HKFNjcm9sbExhdGNoaW5nLCAiRXZlbnRIYW5kbGVyICVwIGNs ZWFyTGF0Y2hlZFN0YXRlVGltZUZpcmVkKCkiLCB0aGlzKTsKKyAgICBjbGVhckxhdGNoZWRTdGF0 ZSgpOworfQorCiAjaWYgIVBMQVRGT1JNKE1BQykKIAotdm9pZCBFdmVudEhhbmRsZXI6OnBsYXRm b3JtUHJlcGFyZUZvcldoZWVsRXZlbnRzKGNvbnN0IFBsYXRmb3JtV2hlZWxFdmVudCYsIGNvbnN0 IEhpdFRlc3RSZXN1bHQmLCBSZWZQdHI8RWxlbWVudD4mLCBSZWZQdHI8Q29udGFpbmVyTm9kZT4m LCBXZWFrUHRyPFNjcm9sbGFibGVBcmVhPiYsIGJvb2wmKQordm9pZCBFdmVudEhhbmRsZXI6OmRl dGVybWluZVdoZWVsRXZlbnRUYXJnZXQoY29uc3QgUGxhdGZvcm1XaGVlbEV2ZW50JiwgY29uc3Qg SGl0VGVzdFJlc3VsdCYsIFJlZlB0cjxFbGVtZW50PiYsIFJlZlB0cjxDb250YWluZXJOb2RlPiYs IFdlYWtQdHI8U2Nyb2xsYWJsZUFyZWE+JiwgYm9vbCYpCiB7CiB9CiAKLXZvaWQgRXZlbnRIYW5k bGVyOjpwbGF0Zm9ybVJlY29yZFdoZWVsRXZlbnQoY29uc3QgUGxhdGZvcm1XaGVlbEV2ZW50JiBl dmVudCkKK3ZvaWQgRXZlbnRIYW5kbGVyOjpyZWNvcmRXaGVlbEV2ZW50Rm9yRGVsdGFGaWx0ZXIo Y29uc3QgUGxhdGZvcm1XaGVlbEV2ZW50JiBldmVudCkKIHsKICAgICBpZiAoYXV0byogcGFnZSA9 IG1fZnJhbWUucGFnZSgpKQogICAgICAgICBwYWdlLT53aGVlbEV2ZW50RGVsdGFGaWx0ZXIoKS0+ dXBkYXRlRnJvbURlbHRhKEZsb2F0U2l6ZShldmVudC5kZWx0YVgoKSwgZXZlbnQuZGVsdGFZKCkp KTsKIH0KIAotYm9vbCBFdmVudEhhbmRsZXI6OnBsYXRmb3JtQ29tcGxldGVXaGVlbEV2ZW50KGNv bnN0IFBsYXRmb3JtV2hlZWxFdmVudCYgZXZlbnQsIENvbnRhaW5lck5vZGUqLCBjb25zdCBXZWFr UHRyPFNjcm9sbGFibGVBcmVhPiYpCitib29sIEV2ZW50SGFuZGxlcjo6cHJvY2Vzc1doZWVsRXZl bnRGb3JTY3JvbGxpbmcoY29uc3QgUGxhdGZvcm1XaGVlbEV2ZW50JiBldmVudCwgQ29udGFpbmVy Tm9kZSosIGNvbnN0IFdlYWtQdHI8U2Nyb2xsYWJsZUFyZWE+JikKIHsKICAgICBSZWY8RnJhbWU+ IHByb3RlY3RlZEZyYW1lKG1fZnJhbWUpOwogCkBAIC0yNzQwLDcgKzI3NDYsNyBAQCBib29sIEV2 ZW50SGFuZGxlcjo6cGxhdGZvcm1Db21wbGV0ZVBsYXRmb3JtV2lkZ2V0V2hlZWxFdmVudChjb25z dCBQbGF0Zm9ybVdoZWVsRQogICAgIHJldHVybiB0cnVlOwogfQogCi12b2lkIEV2ZW50SGFuZGxl cjo6cGxhdGZvcm1Ob3RpZnlJZkVuZEdlc3R1cmUoY29uc3QgUGxhdGZvcm1XaGVlbEV2ZW50Jiwg Y29uc3QgV2Vha1B0cjxTY3JvbGxhYmxlQXJlYT4mKQordm9pZCBFdmVudEhhbmRsZXI6OnByb2Nl c3NXaGVlbEV2ZW50Rm9yU2Nyb2xsU25hcChjb25zdCBQbGF0Zm9ybVdoZWVsRXZlbnQmLCBjb25z dCBXZWFrUHRyPFNjcm9sbGFibGVBcmVhPiYpCiB7CiB9CiAKQEAgLTI4MDEsNyArMjgwNyw3IEBA IGJvb2wgRXZlbnRIYW5kbGVyOjpjb21wbGV0ZVdpZGdldFdoZWVsRXZlbnQoY29uc3QgUGxhdGZv cm1XaGVlbEV2ZW50JiBldmVudCwgY29uCiAgICAgaWYgKHNjcm9sbGFibGVBcmVhKQogICAgICAg ICBzY3JvbGxhYmxlQXJlYS0+c2V0U2Nyb2xsU2hvdWxkQ2xlYXJMYXRjaGVkU3RhdGUoZmFsc2Up OwogCi0gICAgcGxhdGZvcm1Ob3RpZnlJZkVuZEdlc3R1cmUoZXZlbnQsIHNjcm9sbGFibGVBcmVh KTsKKyAgICBwcm9jZXNzV2hlZWxFdmVudEZvclNjcm9sbFNuYXAoZXZlbnQsIHNjcm9sbGFibGVB cmVhKTsKIAogICAgIGlmICghd2lkZ2V0LT5wbGF0Zm9ybVdpZGdldCgpKQogICAgICAgICByZXR1 cm4gdHJ1ZTsKQEAgLTI4NDgsNyArMjg1NCw3IEBAIGJvb2wgRXZlbnRIYW5kbGVyOjpoYW5kbGVX aGVlbEV2ZW50KGNvbnN0IFBsYXRmb3JtV2hlZWxFdmVudCYgZXZlbnQpCiAgICAgUmVmUHRyPENv bnRhaW5lck5vZGU+IHNjcm9sbGFibGVDb250YWluZXI7CiAgICAgV2Vha1B0cjxTY3JvbGxhYmxl QXJlYT4gc2Nyb2xsYWJsZUFyZWE7CiAgICAgYm9vbCBpc092ZXJXaWRnZXQgPSByZXN1bHQuaXNP dmVyV2lkZ2V0KCk7Ci0gICAgcGxhdGZvcm1QcmVwYXJlRm9yV2hlZWxFdmVudHMoZXZlbnQsIHJl c3VsdCwgZWxlbWVudCwgc2Nyb2xsYWJsZUNvbnRhaW5lciwgc2Nyb2xsYWJsZUFyZWEsIGlzT3Zl cldpZGdldCk7CisgICAgZGV0ZXJtaW5lV2hlZWxFdmVudFRhcmdldChldmVudCwgcmVzdWx0LCBl bGVtZW50LCBzY3JvbGxhYmxlQ29udGFpbmVyLCBzY3JvbGxhYmxlQXJlYSwgaXNPdmVyV2lkZ2V0 KTsKIAogI2lmIEVOQUJMRShXSEVFTF9FVkVOVF9MQVRDSElORykKICAgICBpZiAoZXZlbnQucGhh c2UoKSA9PSBQbGF0Zm9ybVdoZWVsRXZlbnRQaGFzZU5vbmUgJiYgZXZlbnQubW9tZW50dW1QaGFz ZSgpID09IFBsYXRmb3JtV2hlZWxFdmVudFBoYXNlTm9uZSAmJiBtX2ZyYW1lLnBhZ2UoKSkKQEAg LTI4NTgsNyArMjg2NCw3IEBAIGJvb2wgRXZlbnRIYW5kbGVyOjpoYW5kbGVXaGVlbEV2ZW50KGNv bnN0IFBsYXRmb3JtV2hlZWxFdmVudCYgZXZlbnQpCiAgICAgLy8gRklYTUU6IEl0IHNob3VsZCBu b3QgYmUgbmVjZXNzYXJ5IHRvIGRvIHRoaXMgbXV0YXRpb24gaGVyZS4KICAgICAvLyBJbnN0ZWFk LCB0aGUgaGFuZGxlcnMgc2hvdWxkIGtub3cgY29udmVydCB2ZXJ0aWNhbCBzY3JvbGxzIGFwcHJv cHJpYXRlbHkuCiAgICAgUGxhdGZvcm1XaGVlbEV2ZW50IGFkanVzdGVkRXZlbnQgPSBzaG91bGRT d2FwU2Nyb2xsRGlyZWN0aW9uKHJlc3VsdCwgZXZlbnQpID8gZXZlbnQuY29weVN3YXBwaW5nRGly ZWN0aW9uKCkgOiBldmVudDsKLSAgICBwbGF0Zm9ybVJlY29yZFdoZWVsRXZlbnQoYWRqdXN0ZWRF dmVudCk7CisgICAgcmVjb3JkV2hlZWxFdmVudEZvckRlbHRhRmlsdGVyKGFkanVzdGVkRXZlbnQp OwogCiAgICAgaWYgKGVsZW1lbnQpIHsKICAgICAgICAgaWYgKGlzT3ZlcldpZGdldCkgewpAQCAt Mjg3Niw3ICsyODgyLDcgQEAgYm9vbCBFdmVudEhhbmRsZXI6OmhhbmRsZVdoZWVsRXZlbnQoY29u c3QgUGxhdGZvcm1XaGVlbEV2ZW50JiBldmVudCkKICAgICAgICAgICAgICAgICBzY3JvbGxhYmxl QXJlYS0+c2V0U2Nyb2xsU2hvdWxkQ2xlYXJMYXRjaGVkU3RhdGUoZmFsc2UpOwogICAgICAgICAg ICAgfQogCi0gICAgICAgICAgICBwbGF0Zm9ybU5vdGlmeUlmRW5kR2VzdHVyZShhZGp1c3RlZEV2 ZW50LCBzY3JvbGxhYmxlQXJlYSk7CisgICAgICAgICAgICBwcm9jZXNzV2hlZWxFdmVudEZvclNj cm9sbFNuYXAoYWRqdXN0ZWRFdmVudCwgc2Nyb2xsYWJsZUFyZWEpOwogICAgICAgICAgICAgcmV0 dXJuIHRydWU7CiAgICAgICAgIH0KICAgICB9CkBAIC0yODg0LDggKzI4OTAsOCBAQCBib29sIEV2 ZW50SGFuZGxlcjo6aGFuZGxlV2hlZWxFdmVudChjb25zdCBQbGF0Zm9ybVdoZWVsRXZlbnQmIGV2 ZW50KQogICAgIGlmIChzY3JvbGxhYmxlQXJlYSkKICAgICAgICAgc2Nyb2xsYWJsZUFyZWEtPnNl dFNjcm9sbFNob3VsZENsZWFyTGF0Y2hlZFN0YXRlKGZhbHNlKTsKIAotICAgIGJvb2wgaGFuZGxl ZEV2ZW50ID0gcGxhdGZvcm1Db21wbGV0ZVdoZWVsRXZlbnQoYWRqdXN0ZWRFdmVudCwgc2Nyb2xs YWJsZUNvbnRhaW5lci5nZXQoKSwgc2Nyb2xsYWJsZUFyZWEpOwotICAgIHBsYXRmb3JtTm90aWZ5 SWZFbmRHZXN0dXJlKGFkanVzdGVkRXZlbnQsIHNjcm9sbGFibGVBcmVhKTsKKyAgICBib29sIGhh bmRsZWRFdmVudCA9IHByb2Nlc3NXaGVlbEV2ZW50Rm9yU2Nyb2xsaW5nKGFkanVzdGVkRXZlbnQs IHNjcm9sbGFibGVDb250YWluZXIuZ2V0KCksIHNjcm9sbGFibGVBcmVhKTsKKyAgICBwcm9jZXNz V2hlZWxFdmVudEZvclNjcm9sbFNuYXAoYWRqdXN0ZWRFdmVudCwgc2Nyb2xsYWJsZUFyZWEpOwog ICAgIHJldHVybiBoYW5kbGVkRXZlbnQ7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BhZ2UvRXZlbnRIYW5kbGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0V2ZW50SGFuZGxlci5o CmluZGV4IDhjYmFlYWQ0YzcyZGM5ZmI1MDlkMDRiYzRiM2M4NDRlZmJmZjhhNzUuLjQxZTM4ODU2 MGMxYzBiZDBkMGFiZjVlMDNlMzQ1OTJjZGQwODIzMDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9FdmVudEhh bmRsZXIuaApAQCAtMjA5LDExICsyMDksMTIgQEAgcHVibGljOgogICAgIHZvaWQgZGVmYXVsdFdo ZWVsRXZlbnRIYW5kbGVyKE5vZGUqLCBXaGVlbEV2ZW50Jik7CiAgICAgYm9vbCBoYW5kbGVQYXN0 ZUdsb2JhbFNlbGVjdGlvbihjb25zdCBQbGF0Zm9ybU1vdXNlRXZlbnQmKTsKIAotICAgIHZvaWQg cGxhdGZvcm1QcmVwYXJlRm9yV2hlZWxFdmVudHMoY29uc3QgUGxhdGZvcm1XaGVlbEV2ZW50Jiwg Y29uc3QgSGl0VGVzdFJlc3VsdCYsIFJlZlB0cjxFbGVtZW50PiYgZXZlbnRUYXJnZXQsIFJlZlB0 cjxDb250YWluZXJOb2RlPiYgc2Nyb2xsYWJsZUNvbnRhaW5lciwgV2Vha1B0cjxTY3JvbGxhYmxl QXJlYT4mLCBib29sJiBpc092ZXJXaWRnZXQpOwotICAgIHZvaWQgcGxhdGZvcm1SZWNvcmRXaGVl bEV2ZW50KGNvbnN0IFBsYXRmb3JtV2hlZWxFdmVudCYpOwotICAgIGJvb2wgcGxhdGZvcm1Db21w bGV0ZVdoZWVsRXZlbnQoY29uc3QgUGxhdGZvcm1XaGVlbEV2ZW50JiwgQ29udGFpbmVyTm9kZSog c2Nyb2xsYWJsZUNvbnRhaW5lciwgY29uc3QgV2Vha1B0cjxTY3JvbGxhYmxlQXJlYT4mKTsKKyAg ICB2b2lkIGRldGVybWluZVdoZWVsRXZlbnRUYXJnZXQoY29uc3QgUGxhdGZvcm1XaGVlbEV2ZW50 JiwgY29uc3QgSGl0VGVzdFJlc3VsdCYsIFJlZlB0cjxFbGVtZW50PiYgZXZlbnRUYXJnZXQsIFJl ZlB0cjxDb250YWluZXJOb2RlPiYgc2Nyb2xsYWJsZUNvbnRhaW5lciwgV2Vha1B0cjxTY3JvbGxh YmxlQXJlYT4mLCBib29sJiBpc092ZXJXaWRnZXQpOworICAgIHZvaWQgcmVjb3JkV2hlZWxFdmVu dEZvckRlbHRhRmlsdGVyKGNvbnN0IFBsYXRmb3JtV2hlZWxFdmVudCYpOworICAgIGJvb2wgcHJv Y2Vzc1doZWVsRXZlbnRGb3JTY3JvbGxpbmcoY29uc3QgUGxhdGZvcm1XaGVlbEV2ZW50JiwgQ29u dGFpbmVyTm9kZSogc2Nyb2xsYWJsZUNvbnRhaW5lciwgY29uc3QgV2Vha1B0cjxTY3JvbGxhYmxl QXJlYT4mKTsKKyAgICB2b2lkIHByb2Nlc3NXaGVlbEV2ZW50Rm9yU2Nyb2xsU25hcChjb25zdCBQ bGF0Zm9ybVdoZWVsRXZlbnQmLCBjb25zdCBXZWFrUHRyPFNjcm9sbGFibGVBcmVhPiYpOworCiAg ICAgYm9vbCBwbGF0Zm9ybUNvbXBsZXRlUGxhdGZvcm1XaWRnZXRXaGVlbEV2ZW50KGNvbnN0IFBs YXRmb3JtV2hlZWxFdmVudCYsIGNvbnN0IFdpZGdldCYsIENvbnRhaW5lck5vZGUqIHNjcm9sbGFi bGVDb250YWluZXIpOwotICAgIHZvaWQgcGxhdGZvcm1Ob3RpZnlJZkVuZEdlc3R1cmUoY29uc3Qg UGxhdGZvcm1XaGVlbEV2ZW50JiwgY29uc3QgV2Vha1B0cjxTY3JvbGxhYmxlQXJlYT4mKTsKIAog I2lmIEVOQUJMRShJT1NfVE9VQ0hfRVZFTlRTKSB8fCBFTkFCTEUoSU9TX0dFU1RVUkVfRVZFTlRT KQogICAgIHVzaW5nIFRvdWNoQXJyYXkgPSBWZWN0b3I8UmVmUHRyPFRvdWNoPj47CkBAIC00OTUs NiArNDk2LDcgQEAgcHJpdmF0ZToKICNlbmRpZgogCiAgICAgdm9pZCBjbGVhck9yU2NoZWR1bGVD bGVhcmluZ0xhdGNoZWRTdGF0ZUlmTmVlZGVkKGNvbnN0IFBsYXRmb3JtV2hlZWxFdmVudCYpOwor ICAgIHZvaWQgY2xlYXJMYXRjaGVkU3RhdGVUaW1lRmlyZWQoKTsKICAgICB2b2lkIGNsZWFyTGF0 Y2hlZFN0YXRlKCk7CiAKICAgICBib29sIHNob3VsZFNlbmRNb3VzZUV2ZW50c1RvSW5hY3RpdmVX aW5kb3dzKCkgY29uc3Q7CkBAIC01MjYsNyArNTI4LDcgQEAgcHJpdmF0ZToKICAgICBUaW1lciBt X2N1cnNvclVwZGF0ZVRpbWVyOwogCiAjaWYgUExBVEZPUk0oTUFDKQotICAgIFRpbWVyIG1fcGVu ZGluZ01vbWVudHVtV2hlZWxFdmVudHNUaW1lcjsKKyAgICBUaW1lciBtX2NsZWFyTGF0Y2hpbmdT dGF0ZVRpbWVyOwogI2VuZGlmCiAKICAgICBzdGQ6OnVuaXF1ZV9wdHI8QXV0b3Njcm9sbENvbnRy b2xsZXI+IG1fYXV0b3Njcm9sbENvbnRyb2xsZXI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wYWdlL21hYy9FdmVudEhhbmRsZXJNYWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL21hYy9F dmVudEhhbmRsZXJNYWMubW0KaW5kZXggNjQ0MjcwMTc2YTE4NTY3OTM5NjZhZDZmZDkwNzY5ZTM1 ODk4NDY2OS4uNGZmMzc1YmE3Mzg2NWFiMGQ5MTBmYmY5ZmEzYjBhYTk4MzhiYmVmZSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9tYWMvRXZlbnRIYW5kbGVyTWFjLm1tCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BhZ2UvbWFjL0V2ZW50SGFuZGxlck1hYy5tbQpAQCAtOTI3LDEwICs5Mjcs MTAgQEAgdm9pZCBFdmVudEhhbmRsZXI6OmNsZWFyT3JTY2hlZHVsZUNsZWFyaW5nTGF0Y2hlZFN0 YXRlSWZOZWVkZWQoY29uc3QgUGxhdGZvcm1XaGUKICAgICAvLyB3aGVuIGhhbmRsaW5nIHdoZWVs IGV2ZW50cy4KICAgICAvLyBMb2dpYyBiZWxvdyBpbnN0YWxscyBhIHRpbWVyIHdoZW4gbm9uLW1v bWVudHVtIHNjcm9sbGluZyBlbmRzLiBJZiBtb21lbnR1bSBzY3JvbGwgZG9lcyBub3Qgc3RhcnQg d2l0aGluIHRoYXQgaW50ZXJ2YWwsCiAgICAgLy8gcmVzZXQgdGhlIGxhdGNoZWQgc3RhdGUuIElm IGl0IGRvZXMsIHN0b3AgdGhlIHRpbWVyLCBsZWF2aW5nIHRoZSBsYXRjaGVkIHN0YXRlIHVudG91 Y2hlZC4KLSAgICBpZiAoIW1fcGVuZGluZ01vbWVudHVtV2hlZWxFdmVudHNUaW1lci5pc0FjdGl2 ZSgpKSB7CisgICAgaWYgKCFtX2NsZWFyTGF0Y2hpbmdTdGF0ZVRpbWVyLmlzQWN0aXZlKCkpIHsK ICAgICAgICAgaWYgKGV2ZW50LmlzRW5kT2ZOb25Nb21lbnR1bVNjcm9sbCgpKSB7CiAgICAgICAg ICAgICBMT0dfV0lUSF9TVFJFQU0oU2Nyb2xsTGF0Y2hpbmcsIHN0cmVhbSA8PCAiRXZlbnRIYW5k bGVyOjpjbGVhck9yU2NoZWR1bGVDbGVhcmluZ0xhdGNoZWRTdGF0ZUlmTmVlZGVkKCkgLSBldmVu dCIgPDwgZXZlbnQgPDwgIiwgc2NoZWR1bGluZyBjbGVhciB0aW1lciIpOwotICAgICAgICAgICAg bV9wZW5kaW5nTW9tZW50dW1XaGVlbEV2ZW50c1RpbWVyLnN0YXJ0T25lU2hvdChyZXNldExhdGNo ZWRTdGF0ZVRpbWVvdXQpOworICAgICAgICAgICAgbV9jbGVhckxhdGNoaW5nU3RhdGVUaW1lci5z dGFydE9uZVNob3QocmVzZXRMYXRjaGVkU3RhdGVUaW1lb3V0KTsKICAgICAgICAgfQogICAgIH0g ZWxzZSB7CiAgICAgICAgIC8vIElmIGFub3RoZXIgd2hlZWwgZXZlbnQgc2Nyb2xsaW5nIHN0YXJ0 cywgc3RvcCB0aGUgdGltZXIgbWFudWFsbHksIGFuZCByZXNldCB0aGUgbGF0Y2hlZCBzdGF0ZSBp bW1lZGlhdGVseS4KQEAgLTkzOCwxNSArOTM4LDE1IEBAIHZvaWQgRXZlbnRIYW5kbGVyOjpjbGVh ck9yU2NoZWR1bGVDbGVhcmluZ0xhdGNoZWRTdGF0ZUlmTmVlZGVkKGNvbnN0IFBsYXRmb3JtV2hl CiAgICAgICAgICAgICBMT0dfV0lUSF9TVFJFQU0oU2Nyb2xsTGF0Y2hpbmcsIHN0cmVhbSA8PCAi RXZlbnRIYW5kbGVyOjpjbGVhck9yU2NoZWR1bGVDbGVhcmluZ0xhdGNoZWRTdGF0ZUlmTmVlZGVk KCkgLSBldmVudCIgPDwgZXZlbnQgPDwgIiwgdGltZXIgcGVuZGluZywgYW5vdGhlciBzY3JvbGwg c3RhcnRpbmciKTsKICAgICAgICAgICAgIGlmIChhdXRvKiBwYWdlID0gbV9mcmFtZS5wYWdlKCkp CiAgICAgICAgICAgICAgICAgcGFnZS0+cmVzZXRMYXRjaGluZ1N0YXRlKCk7Ci0gICAgICAgICAg ICBtX3BlbmRpbmdNb21lbnR1bVdoZWVsRXZlbnRzVGltZXIuc3RvcCgpOworICAgICAgICAgICAg bV9jbGVhckxhdGNoaW5nU3RhdGVUaW1lci5zdG9wKCk7CiAgICAgICAgIH0gZWxzZSBpZiAoZXZl bnQuaXNUcmFuc2l0aW9uaW5nVG9Nb21lbnR1bVNjcm9sbCgpKSB7CiAgICAgICAgICAgICAvLyBX aGVlbCBldmVudHMgbWFjaGluYXJ5IGlzIHRyYW5zaXRpb25pbmcgdG8gbW9tZW50dW0gc2Nyb2xs aW5nLCBzbyBubyBuZWVkIHRvIHJlc2V0IGxhdGNoZWQgc3RhdGUuIFN0b3AgdGhlIHRpbWVyLgot ICAgICAgICAgICAgbV9wZW5kaW5nTW9tZW50dW1XaGVlbEV2ZW50c1RpbWVyLnN0b3AoKTsKKyAg ICAgICAgICAgIG1fY2xlYXJMYXRjaGluZ1N0YXRlVGltZXIuc3RvcCgpOwogICAgICAgICB9CiAg ICAgfQogfQogCi12b2lkIEV2ZW50SGFuZGxlcjo6cGxhdGZvcm1QcmVwYXJlRm9yV2hlZWxFdmVu dHMoY29uc3QgUGxhdGZvcm1XaGVlbEV2ZW50JiB3aGVlbEV2ZW50LCBjb25zdCBIaXRUZXN0UmVz dWx0JiByZXN1bHQsIFJlZlB0cjxFbGVtZW50PiYgd2hlZWxFdmVudFRhcmdldCwgUmVmUHRyPENv bnRhaW5lck5vZGU+JiBzY3JvbGxhYmxlQ29udGFpbmVyLCBXZWFrUHRyPFNjcm9sbGFibGVBcmVh PiYgc2Nyb2xsYWJsZUFyZWEsIGJvb2wmIGlzT3ZlcldpZGdldCkKK3ZvaWQgRXZlbnRIYW5kbGVy OjpkZXRlcm1pbmVXaGVlbEV2ZW50VGFyZ2V0KGNvbnN0IFBsYXRmb3JtV2hlZWxFdmVudCYgd2hl ZWxFdmVudCwgY29uc3QgSGl0VGVzdFJlc3VsdCYgcmVzdWx0LCBSZWZQdHI8RWxlbWVudD4mIHdo ZWVsRXZlbnRUYXJnZXQsIFJlZlB0cjxDb250YWluZXJOb2RlPiYgc2Nyb2xsYWJsZUNvbnRhaW5l ciwgV2Vha1B0cjxTY3JvbGxhYmxlQXJlYT4mIHNjcm9sbGFibGVBcmVhLCBib29sJiBpc092ZXJX aWRnZXQpCiB7CiAgICAgY2xlYXJPclNjaGVkdWxlQ2xlYXJpbmdMYXRjaGVkU3RhdGVJZk5lZWRl ZCh3aGVlbEV2ZW50KTsKIApAQCAtOTcxLDcgKzk3MSw3IEBAIHZvaWQgRXZlbnRIYW5kbGVyOjpw bGF0Zm9ybVByZXBhcmVGb3JXaGVlbEV2ZW50cyhjb25zdCBQbGF0Zm9ybVdoZWVsRXZlbnQmIHdo ZWVsCiAgICAgICAgICAgICAgICAgc2Nyb2xsYWJsZUFyZWEgPSBtYWtlV2Vha1B0cihzdGF0aWNf Y2FzdDxTY3JvbGxhYmxlQXJlYSY+KCp2aWV3KSk7CiAgICAgICAgICAgICB9CiAKLSAgICAgICAg ICAgIExPR19XSVRIX1NUUkVBTShTY3JvbGxMYXRjaGluZywgc3RyZWFtIDw8ICJFdmVudEhhbmRs ZXI6OnBsYXRmb3JtUHJlcGFyZUZvcldoZWVsRXZlbnRzKCkgLSBldmVudCIgPDwgd2hlZWxFdmVu dCA8PCAiIGZvdW5kIHNjcm9sbGFibGVDb250YWluZXIiIDw8IFZhbHVlT3JOdWxsKHNjcm9sbGFi bGVDb250YWluZXIuZ2V0KCkpIDw8ICIgc2Nyb2xsYWJsZUFyZWEgIiA8PCAoc2Nyb2xsYWJsZUFy ZWEgPyBzY3JvbGxhYmxlQXJlYS5nZXQoKSA6IG51bGxwdHIpKTsKKyAgICAgICAgICAgIExPR19X SVRIX1NUUkVBTShTY3JvbGxMYXRjaGluZywgc3RyZWFtIDw8ICJFdmVudEhhbmRsZXI6OmRldGVy bWluZVdoZWVsRXZlbnRUYXJnZXQoKSAtIGV2ZW50IiA8PCB3aGVlbEV2ZW50IDw8ICIgZm91bmQg c2Nyb2xsYWJsZUNvbnRhaW5lciIgPDwgVmFsdWVPck51bGwoc2Nyb2xsYWJsZUNvbnRhaW5lci5n ZXQoKSkgPDwgIiBzY3JvbGxhYmxlQXJlYSAiIDw8IChzY3JvbGxhYmxlQXJlYSA/IHNjcm9sbGFi bGVBcmVhLmdldCgpIDogbnVsbHB0cikpOwogICAgICAgICB9CiAgICAgfQogCkBAIC05OTUsMTEg Kzk5NSwxMSBAQCB2b2lkIEV2ZW50SGFuZGxlcjo6cGxhdGZvcm1QcmVwYXJlRm9yV2hlZWxFdmVu dHMoY29uc3QgUGxhdGZvcm1XaGVlbEV2ZW50JiB3aGVlbAogICAgICAgICAgICAgICAgIGlzT3Zl cldpZGdldCA9IHJlc3VsdC5pc092ZXJXaWRnZXQoKTsKICAgICAgICAgICAgIH0KIAotICAgICAg ICAgICAgTE9HX1dJVEhfU1RSRUFNKFNjcm9sbExhdGNoaW5nLCBzdHJlYW0gPDwgIkV2ZW50SGFu ZGxlcjo6cGxhdGZvcm1QcmVwYXJlRm9yV2hlZWxFdmVudHMoKSAtIGNvbnNpZGVyaW5nIGxhdGNo aW5nIGZvciAiIDw8IHdoZWVsRXZlbnQgPDwgIiwgYXQgc2Nyb2xsIGxpbWl0ICIgPDwgc3RhcnRp bmdBdFNjcm9sbExpbWl0IDw8ICIsIGxhdGNoaW5nIHN0YXRlICIgPDwgcGFnZS0+bGF0Y2hpbmdT dGF0ZVN0YWNrKCkpOworICAgICAgICAgICAgTE9HX1dJVEhfU1RSRUFNKFNjcm9sbExhdGNoaW5n LCBzdHJlYW0gPDwgIkV2ZW50SGFuZGxlcjo6ZGV0ZXJtaW5lV2hlZWxFdmVudFRhcmdldCgpIC0g Y29uc2lkZXJpbmcgbGF0Y2hpbmcgZm9yICIgPDwgd2hlZWxFdmVudCA8PCAiLCBhdCBzY3JvbGwg bGltaXQgIiA8PCBzdGFydGluZ0F0U2Nyb2xsTGltaXQgPDwgIiwgbGF0Y2hpbmcgc3RhdGUgIiA8 PCBwYWdlLT5sYXRjaGluZ1N0YXRlU3RhY2soKSk7CiAgICAgICAgIH0KICAgICB9IGVsc2UgaWYg KHdoZWVsRXZlbnQuc2hvdWxkUmVzZXRMYXRjaGluZygpKSB7CiAgICAgICAgIGNsZWFyTGF0Y2hl ZFN0YXRlKCk7Ci0gICAgICAgIExPR19XSVRIX1NUUkVBTShTY3JvbGxMYXRjaGluZywgc3RyZWFt IDw8ICJFdmVudEhhbmRsZXI6OnBsYXRmb3JtUHJlcGFyZUZvcldoZWVsRXZlbnRzKCkgLSByZXNl dCBsYXRjaGluZyBmb3IgZXZlbnQgIiA8PCB3aGVlbEV2ZW50IDw8ICIgbGF0Y2hpbmcgc3RhdGUg IiA8PCBwYWdlLT5sYXRjaGluZ1N0YXRlU3RhY2soKSk7CisgICAgICAgIExPR19XSVRIX1NUUkVB TShTY3JvbGxMYXRjaGluZywgc3RyZWFtIDw8ICJFdmVudEhhbmRsZXI6OmRldGVybWluZVdoZWVs RXZlbnRUYXJnZXQoKSAtIHJlc2V0IGxhdGNoaW5nIGZvciBldmVudCAiIDw8IHdoZWVsRXZlbnQg PDwgIiBsYXRjaGluZyBzdGF0ZSAiIDw8IHBhZ2UtPmxhdGNoaW5nU3RhdGVTdGFjaygpKTsKICAg ICB9CiAKICAgICBpZiAoIXdoZWVsRXZlbnQuc2hvdWxkUmVzZXRMYXRjaGluZygpICYmIGxhdGNo aW5nU3RhdGUgJiYgbGF0Y2hpbmdTdGF0ZS0+d2hlZWxFdmVudEVsZW1lbnQoKSkgewpAQCAtMTAy MCw3ICsxMDIwLDcgQEAgdm9pZCBFdmVudEhhbmRsZXI6OnBsYXRmb3JtUHJlcGFyZUZvcldoZWVs RXZlbnRzKGNvbnN0IFBsYXRmb3JtV2hlZWxFdmVudCYgd2hlZWwKICAgICB9CiB9CiAKLXZvaWQg RXZlbnRIYW5kbGVyOjpwbGF0Zm9ybVJlY29yZFdoZWVsRXZlbnQoY29uc3QgUGxhdGZvcm1XaGVl bEV2ZW50JiB3aGVlbEV2ZW50KQordm9pZCBFdmVudEhhbmRsZXI6OnJlY29yZFdoZWVsRXZlbnRG b3JEZWx0YUZpbHRlcihjb25zdCBQbGF0Zm9ybVdoZWVsRXZlbnQmIHdoZWVsRXZlbnQpCiB7CiAg ICAgYXV0byogcGFnZSA9IG1fZnJhbWUucGFnZSgpOwogICAgIGlmICghcGFnZSkKQEAgLTEwNDcs OSArMTA0Nyw5IEBAIHN0YXRpYyBGcmFtZVZpZXcqIGZyYW1lVmlld0ZvckxhdGNoaW5nU3RhdGUo RnJhbWUmIGZyYW1lLCBjb25zdCBTY3JvbGxMYXRjaGluZ1N0CiAgICAgcmV0dXJuIGxhdGNoaW5n U3RhdGUuZnJhbWUoKSA/IGxhdGNoaW5nU3RhdGUuZnJhbWUoKS0+dmlldygpIDogZnJhbWUudmll dygpOwogfQogCi1ib29sIEV2ZW50SGFuZGxlcjo6cGxhdGZvcm1Db21wbGV0ZVdoZWVsRXZlbnQo Y29uc3QgUGxhdGZvcm1XaGVlbEV2ZW50JiB3aGVlbEV2ZW50LCBDb250YWluZXJOb2RlKiBzY3Jv bGxhYmxlQ29udGFpbmVyLCBjb25zdCBXZWFrUHRyPFNjcm9sbGFibGVBcmVhPiYgc2Nyb2xsYWJs ZUFyZWEpCitib29sIEV2ZW50SGFuZGxlcjo6cHJvY2Vzc1doZWVsRXZlbnRGb3JTY3JvbGxpbmco Y29uc3QgUGxhdGZvcm1XaGVlbEV2ZW50JiB3aGVlbEV2ZW50LCBDb250YWluZXJOb2RlKiBzY3Jv bGxhYmxlQ29udGFpbmVyLCBjb25zdCBXZWFrUHRyPFNjcm9sbGFibGVBcmVhPiYgc2Nyb2xsYWJs ZUFyZWEpCiB7Ci0gICAgTE9HX1dJVEhfU1RSRUFNKFNjcm9sbExhdGNoaW5nLCBzdHJlYW0gPDwg IkV2ZW50SGFuZGxlcjo6cGxhdGZvcm1Db21wbGV0ZVdoZWVsRXZlbnQgIiA8PCB3aGVlbEV2ZW50 IDw8ICIgLSBzY3JvbGxhYmxlQ29udGFpbmVyICIgPDwgc2Nyb2xsYWJsZUNvbnRhaW5lciA8PCAi IHNjcm9sbGFibGVBcmVhICIgPDwgc2Nyb2xsYWJsZUFyZWEuZ2V0KCkgPDwgIiB1c2UgbGF0Y2hl ZCBlbGVtZW50ICIgPDwgd2hlZWxFdmVudC51c2VMYXRjaGVkRXZlbnRFbGVtZW50KCkpOworICAg IExPR19XSVRIX1NUUkVBTShTY3JvbGxMYXRjaGluZywgc3RyZWFtIDw8ICJFdmVudEhhbmRsZXI6 OnByb2Nlc3NXaGVlbEV2ZW50Rm9yU2Nyb2xsaW5nICIgPDwgd2hlZWxFdmVudCA8PCAiIC0gc2Ny b2xsYWJsZUNvbnRhaW5lciAiIDw8IHNjcm9sbGFibGVDb250YWluZXIgPDwgIiBzY3JvbGxhYmxl QXJlYSAiIDw8IHNjcm9sbGFibGVBcmVhLmdldCgpIDw8ICIgdXNlIGxhdGNoZWQgZWxlbWVudCAi IDw8IHdoZWVsRXZlbnQudXNlTGF0Y2hlZEV2ZW50RWxlbWVudCgpKTsKIAogICAgIFJlZjxGcmFt ZT4gcHJvdGVjdGVkRnJhbWUobV9mcmFtZSk7CiAKQEAgLTEwNjgsNyArMTA2OCw3IEBAIGJvb2wg RXZlbnRIYW5kbGVyOjpwbGF0Zm9ybUNvbXBsZXRlV2hlZWxFdmVudChjb25zdCBQbGF0Zm9ybVdo ZWVsRXZlbnQmIHdoZWVsRXZlCiAgICAgICAgIC8vIFdlYktpdDIgY29kZSBwYXRoCiAgICAgICAg IGlmICghZnJhbWVIYXNQbGF0Zm9ybVdpZGdldChtX2ZyYW1lKSAmJiAhbGF0Y2hpbmdTdGF0ZS0+ c3RhcnRlZEdlc3R1cmVBdFNjcm9sbExpbWl0KCkgJiYgc2Nyb2xsYWJsZUNvbnRhaW5lciA9PSBs YXRjaGluZ1N0YXRlLT5zY3JvbGxhYmxlQ29udGFpbmVyKCkgJiYgc2Nyb2xsYWJsZUFyZWEgJiYg dmlldyAhPSBzY3JvbGxhYmxlQXJlYSkgewogICAgICAgICAgICAgLy8gSWYgd2UgZGlkIG5vdCBz dGFydCBhdCB0aGUgc2Nyb2xsIGxpbWl0LCBkbyBub3QgcGFzcyB0aGUgZXZlbnQgb24gdG8gYmUg aGFuZGxlZCBieSBlbmNsb3Npbmcgc2Nyb2xsYWJsZSByZWdpb25zLgotICAgICAgICAgICAgTE9H X1dJVEhfU1RSRUFNKFNjcm9sbGluZywgc3RyZWFtIDw8ICJFdmVudEhhbmRsZXIgIiA8PCB0aGlz IDw8ICIgcGxhdGZvcm1Db21wbGV0ZVdoZWVsRXZlbnQgLSBsYXRjaGVkIHRvICIgPDwgc2Nyb2xs YWJsZUFyZWEuZ2V0KCkgPDwgIiBhbmQgbm90IHByb3BhZ2F0aW5nIik7CisgICAgICAgICAgICBM T0dfV0lUSF9TVFJFQU0oU2Nyb2xsaW5nLCBzdHJlYW0gPDwgIkV2ZW50SGFuZGxlciAiIDw8IHRo aXMgPDwgIiBwcm9jZXNzV2hlZWxFdmVudEZvclNjcm9sbGluZyAtIGxhdGNoZWQgdG8gIiA8PCBz Y3JvbGxhYmxlQXJlYS5nZXQoKSA8PCAiIGFuZCBub3QgcHJvcGFnYXRpbmciKTsKICAgICAgICAg ICAgIHJldHVybiB0cnVlOwogICAgICAgICB9CiAKQEAgLTExMTIsNyArMTExMiw3IEBAIGJvb2wg RXZlbnRIYW5kbGVyOjpwbGF0Zm9ybUNvbXBsZXRlUGxhdGZvcm1XaWRnZXRXaGVlbEV2ZW50KGNv bnN0IFBsYXRmb3JtV2hlZWxFCiAgICAgcmV0dXJuIGZhbHNlOwogfQogCi12b2lkIEV2ZW50SGFu ZGxlcjo6cGxhdGZvcm1Ob3RpZnlJZkVuZEdlc3R1cmUoY29uc3QgUGxhdGZvcm1XaGVlbEV2ZW50 JiB3aGVlbEV2ZW50LCBjb25zdCBXZWFrUHRyPFNjcm9sbGFibGVBcmVhPiYgc2Nyb2xsYWJsZUFy ZWEpCit2b2lkIEV2ZW50SGFuZGxlcjo6cHJvY2Vzc1doZWVsRXZlbnRGb3JTY3JvbGxTbmFwKGNv bnN0IFBsYXRmb3JtV2hlZWxFdmVudCYgd2hlZWxFdmVudCwgY29uc3QgV2Vha1B0cjxTY3JvbGxh YmxlQXJlYT4mIHNjcm9sbGFibGVBcmVhKQogewogICAgIGlmICghc2Nyb2xsYWJsZUFyZWEpCiAg ICAgICAgIHJldHVybjsK