193460 2019-01-15 13:38:57 -0800 Clean up code related to the updating of Dashboard and touch event regions 2019-01-15 14:59:32 -0800 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 1494793 0 simon.fraser 2019-01-15 13:38:57 -0800 Clean up code related to the updating of Dashboard and touch event regions 1494795 1 359200 simon.fraser 2019-01-15 13:43:23 -0800 Created attachment 359200 Patch 1494833 2 simon.fraser 2019-01-15 14:58:42 -0800 https://trac.webkit.org/r240011 1494834 3 webkit-bug-importer 2019-01-15 14:59:32 -0800 <rdar://problem/47297998> 359200 2019-01-15 13:43:23 -0800 2019-01-15 13:44:27 -0800 Patch bug-193460-20190115134322.patch text/plain 14877 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjM5OTkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWQzNGM2ZGZkZDNhNWQ5 YmMxZjQ2MjZkNTVmOWY0OTg3MWNhNDA1Yi4uNmY2YmQxZTdjNGI0MzdjODYxNDNlMDM4OWJkNGE4 OWQ3YzY0MmE1NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ0IEBACisyMDE5LTAxLTE1ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIENsZWFuIHVwIGNv ZGUgcmVsYXRlZCB0byB0aGUgdXBkYXRpbmcgb2YgRGFzaGJvYXJkIGFuZCB0b3VjaCBldmVudCBy ZWdpb25zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x OTM0NjAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJ biBwcmVwYXJhdGlvbiBmb3IgbGF5b3V0IHRlc3RpbmcgdGhhdCBjYW4gY291bnQgdGhlIG51bWJl ciBvZiBldmVudCByZWdpb24KKyAgICAgICAgdXBkYXRlcywgbW92ZSB0aGUgY29kZSByZWxhdGVk IHRvIHVwZGF0aW5nICJhbm5vdGF0ZWQiIChEYXNoYm9hcmQpIHJlZ2lvbnMsIGFuZAorICAgICAg ICB0b3VjaCBldmVudCByZWdpb25zIGludG8gYm90dGxlbmVjayBmdW5jdGlvbnMgaW4gRG9jdW1l bnQuCisgICAgICAgIAorICAgICAgICBVcGRhdGluZyB0aGVzZSB0d28ga2luZHMgb2YgcmVnaW9u cyBpcyBnZW5lcmFsbHkgc2ltaWxhciwgYnV0IHRoZXJlIGFyZSBzb21lIGNvZGUgcGF0aHMKKyAg ICAgICAgdGhhdCBlYWdlcmx5IHVwZGF0ZSBhbm5vdGF0ZWQgcmVnaW9ucy4KKworICAgICAgICBO byBiZWhhdmlvciBjaGFuZ2UuCisKKyAgICAgICAgKiBkb20vRG9jdW1lbnQuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6RG9jdW1lbnQ6OnVwZGF0ZUFubm90YXRlZFJlZ2lvbnMpOiBNb3ZlZCBmcm9t IEZyYW1lVmlldy4KKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50OjppbnZhbGlkYXRlUmVuZGVy aW5nRGVwZW5kZW50UmVnaW9ucyk6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudDo6aW52YWxp ZGF0ZVNjcm9sbGJhckRlcGVuZGVudFJlZ2lvbnMpOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1l bnQ6OnVwZGF0ZVpPcmRlckRlcGVuZGVudFJlZ2lvbnMpOgorICAgICAgICAqIGRvbS9Eb2N1bWVu dC5oOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6OnNldEFubm90YXRlZFJlZ2lvbnNEaXJ0 eSk6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudDo6YW5ub3RhdGVkUmVnaW9uc0RpcnR5IGNv bnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50OjpoYXNBbm5vdGF0ZWRSZWdpb25zIGNv bnN0KToKKyAgICAgICAgKiBwYWdlL0ZyYW1lVmlldy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpG cmFtZVZpZXc6OmRpZExheW91dCk6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZVZpZXc6OmRpZFBh aW50Q29udGVudHMpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3Ojp1cGRhdGVBbm5vdGF0 ZWRSZWdpb25zKTogRGVsZXRlZC4KKyAgICAgICAgKiBwYWdlL0ZyYW1lVmlldy5oOgorICAgICAg ICAqIHJlbmRlcmluZy9SZW5kZXJFbGVtZW50LmNwcDogRHJpdmUtYnkgaGVhZGVyIGNsZWFudXAu CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJFbGVtZW50OjpzdHlsZVdpbGxDaGFuZ2UpOgorICAg ICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJMYXllcjo6c2Nyb2xsVG8pOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OnNldEhh c0hvcml6b250YWxTY3JvbGxiYXIpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OnNl dEhhc1ZlcnRpY2FsU2Nyb2xsYmFyKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjp1 cGRhdGVTY3JvbGxiYXJzQWZ0ZXJMYXlvdXQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5 ZXI6OmNhbGN1bGF0ZUNsaXBSZWN0cyBjb25zdCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRl ckxpc3RCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGlzdEJveDo6c2V0SGFzVmVy dGljYWxTY3JvbGxiYXIpOgorCiAyMDE5LTAxLTE1ICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFw cGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBBdWRpdDogcHJvdmlkZSBhIHdheSB0 byBkZXRlcm1pbmUgd2hldGhlciBhIGdpdmUgbm9kZSBoYXMgZXZlbnQgbGlzdGVuZXJzCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUv ZG9tL0RvY3VtZW50LmNwcAppbmRleCBjN2IyMWRhMWY1ZDI0NGE1YzBjYTliZmQyNjk2ZDAzYWEw MjczNjlmLi45ZjE5ZGJmYjE4YzAxMTFkNGFhOTA3ZTkyMGE4MGRiNmY0N2FmZmFkIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2RvbS9Eb2N1bWVudC5jcHAKQEAgLTQwOTksNyArNDA5OSw2IEBAIHZvaWQgRG9jdW1lbnQ6OmVs ZW1lbnRJbkFjdGl2ZUNoYWluRGlkRGV0YWNoKEVsZW1lbnQqIGVsZW1lbnQpCiB9CiAKICNpZiBF TkFCTEUoREFTSEJPQVJEX1NVUFBPUlQpCi0KIGNvbnN0IFZlY3RvcjxBbm5vdGF0ZWRSZWdpb25W YWx1ZT4mIERvY3VtZW50Ojphbm5vdGF0ZWRSZWdpb25zKCkgY29uc3QKIHsKICAgICByZXR1cm4g bV9hbm5vdGF0ZWRSZWdpb25zOwpAQCAtNDExMSw4ICs0MTEwLDU1IEBAIHZvaWQgRG9jdW1lbnQ6 OnNldEFubm90YXRlZFJlZ2lvbnMoY29uc3QgVmVjdG9yPEFubm90YXRlZFJlZ2lvblZhbHVlPiYg cmVnaW9ucykKICAgICBzZXRBbm5vdGF0ZWRSZWdpb25zRGlydHkoZmFsc2UpOwogfQogCit2b2lk IERvY3VtZW50Ojp1cGRhdGVBbm5vdGF0ZWRSZWdpb25zKCkKK3sKKyAgICBpZiAoIWhhc0Fubm90 YXRlZFJlZ2lvbnMoKSkKKyAgICAgICAgcmV0dXJuOworCisgICAgVmVjdG9yPEFubm90YXRlZFJl Z2lvblZhbHVlPiBuZXdSZWdpb25zOworICAgIHJlbmRlckJveCgpLT5jb2xsZWN0QW5ub3RhdGVk UmVnaW9ucyhuZXdSZWdpb25zKTsgLy8gRklYTUUuCisgICAgaWYgKG5ld1JlZ2lvbnMgPT0gYW5u b3RhdGVkUmVnaW9ucygpKQorICAgICAgICByZXR1cm47CisKKyAgICBzZXRBbm5vdGF0ZWRSZWdp b25zKG5ld1JlZ2lvbnMpOworICAgIAorICAgIGlmIChQYWdlKiBwYWdlID0gdGhpcy0+cGFnZSgp KQorICAgICAgICBwYWdlLT5jaHJvbWUoKS5jbGllbnQoKS5hbm5vdGF0ZWRSZWdpb25zQ2hhbmdl ZCgpOworfQorI2VuZGlmCisKK3ZvaWQgRG9jdW1lbnQ6OmludmFsaWRhdGVSZW5kZXJpbmdEZXBl bmRlbnRSZWdpb25zKEFubm90YXRpb25zQWN0aW9uIGFubm90YXRpb25zQWN0aW9uKQoreworI2lm IEVOQUJMRShEQVNIQk9BUkRfU1VQUE9SVCkKKyAgICAvLyBGSVhNRTogd2UgZG9uJ3QgaGF2ZSBh IGdvb2QgaW52YWxpZGF0aW9uL3VwZGF0ZSBwb2xpY3kgZm9yIERhc2hib2FyZCByZWdpb25zLiBU aGV5IGdldCBlYWdlcmx5IHVwZGF0ZWQKKyAgICAvLyBvbiBmb3JjZWQgbGF5b3V0cywgYW5kIGRv bid0IG5lZWQgdG8gYmUuCisgICAgaWYgKGFubm90YXRpb25zQWN0aW9uID09IEFubm90YXRpb25z QWN0aW9uOjpVcGRhdGUpCisgICAgICAgIHVwZGF0ZUFubm90YXRlZFJlZ2lvbnMoKTsKKyAgICBl bHNlCisgICAgICAgIHNldEFubm90YXRlZFJlZ2lvbnNEaXJ0eSgpOwogI2VuZGlmCiAKKyNpZiBQ TEFURk9STShJT1NfRkFNSUxZKSAmJiBFTkFCTEUoVE9VQ0hfRVZFTlRTKQorICAgIHNldFRvdWNo RXZlbnRSZWdpb25zTmVlZFVwZGF0ZSgpOworI2VuZGlmCit9CisKK3ZvaWQgRG9jdW1lbnQ6Omlu dmFsaWRhdGVTY3JvbGxiYXJEZXBlbmRlbnRSZWdpb25zKCkKK3sKKyNpZiBFTkFCTEUoREFTSEJP QVJEX1NVUFBPUlQpCisgICAgaWYgKGhhc0Fubm90YXRlZFJlZ2lvbnMoKSkKKyAgICAgICAgc2V0 QW5ub3RhdGVkUmVnaW9uc0RpcnR5KCk7CisjZW5kaWYKK30KKwordm9pZCBEb2N1bWVudDo6dXBk YXRlWk9yZGVyRGVwZW5kZW50UmVnaW9ucygpCit7CisjaWYgRU5BQkxFKERBU0hCT0FSRF9TVVBQ T1JUKQorICAgIGlmIChhbm5vdGF0ZWRSZWdpb25zRGlydHkoKSkKKyAgICAgICAgdXBkYXRlQW5u b3RhdGVkUmVnaW9ucygpOworI2VuZGlmCit9CisKIGJvb2wgRG9jdW1lbnQ6OnNldEZvY3VzZWRF bGVtZW50KEVsZW1lbnQqIGVsZW1lbnQsIEZvY3VzRGlyZWN0aW9uIGRpcmVjdGlvbiwgRm9jdXNS ZW1vdmFsRXZlbnRzTW9kZSBldmVudHNNb2RlKQogewogICAgIFJlZlB0cjxFbGVtZW50PiBuZXdG b2N1c2VkRWxlbWVudCA9IGVsZW1lbnQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20v RG9jdW1lbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5oCmluZGV4IDFkZjc1ZWMz ZTNmOGUzZTdiY2Q4YjhjNzdmNWFjNGI5ZTBmMWRhNDYuLmViNDQ1NTFjY2FmMzRhMDliODkzNzhh YTg3MTM0OTc3MTM5NmUzMTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVu dC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5oCkBAIC0xMTM3LDE0ICsxMTM3 LDE1IEBAIHB1YmxpYzoKICAgICBXRUJDT1JFX0VYUE9SVCBTdHJpbmcgZGlzcGxheVN0cmluZ01v ZGlmaWVkQnlFbmNvZGluZyhjb25zdCBTdHJpbmcmKSBjb25zdDsKIAogI2lmIEVOQUJMRShEQVNI Qk9BUkRfU1VQUE9SVCkKLSAgICB2b2lkIHNldEFubm90YXRlZFJlZ2lvbnNEaXJ0eShib29sIGYp IHsgbV9hbm5vdGF0ZWRSZWdpb25zRGlydHkgPSBmOyB9Ci0gICAgYm9vbCBhbm5vdGF0ZWRSZWdp b25zRGlydHkoKSBjb25zdCB7IHJldHVybiBtX2Fubm90YXRlZFJlZ2lvbnNEaXJ0eTsgfQotICAg IGJvb2wgaGFzQW5ub3RhdGVkUmVnaW9ucyAoKSBjb25zdCB7IHJldHVybiBtX2hhc0Fubm90YXRl ZFJlZ2lvbnM7IH0KICAgICB2b2lkIHNldEhhc0Fubm90YXRlZFJlZ2lvbnMoYm9vbCBmKSB7IG1f aGFzQW5ub3RhdGVkUmVnaW9ucyA9IGY7IH0KICAgICBXRUJDT1JFX0VYUE9SVCBjb25zdCBWZWN0 b3I8QW5ub3RhdGVkUmVnaW9uVmFsdWU+JiBhbm5vdGF0ZWRSZWdpb25zKCkgY29uc3Q7Ci0gICAg dm9pZCBzZXRBbm5vdGF0ZWRSZWdpb25zKGNvbnN0IFZlY3RvcjxBbm5vdGF0ZWRSZWdpb25WYWx1 ZT4mKTsKICNlbmRpZgogCisgICAgZW51bSBjbGFzcyBBbm5vdGF0aW9uc0FjdGlvbiB7IEludmFs aWRhdGUsIFVwZGF0ZSB9OworICAgIHZvaWQgaW52YWxpZGF0ZVJlbmRlcmluZ0RlcGVuZGVudFJl Z2lvbnMoQW5ub3RhdGlvbnNBY3Rpb24gPSBBbm5vdGF0aW9uc0FjdGlvbjo6SW52YWxpZGF0ZSk7 CisgICAgdm9pZCBpbnZhbGlkYXRlU2Nyb2xsYmFyRGVwZW5kZW50UmVnaW9ucygpOworICAgIHZv aWQgdXBkYXRlWk9yZGVyRGVwZW5kZW50UmVnaW9ucygpOworCiAgICAgdm9pZCByZW1vdmVBbGxF dmVudExpc3RlbmVycygpIGZpbmFsOwogCiAgICAgV0VCQ09SRV9FWFBPUlQgY29uc3QgU1ZHRG9j dW1lbnRFeHRlbnNpb25zKiBzdmdFeHRlbnNpb25zKCk7CkBAIC0xNjM0LDYgKzE2MzUsMTQgQEAg cHJpdmF0ZToKIAogICAgIHZvaWQgd2hlZWxFdmVudEhhbmRsZXJzQ2hhbmdlZCgpOwogCisjaWYg RU5BQkxFKERBU0hCT0FSRF9TVVBQT1JUKQorICAgIHZvaWQgc2V0QW5ub3RhdGVkUmVnaW9uc0Rp cnR5KGJvb2wgZiA9IHRydWUpIHsgbV9hbm5vdGF0ZWRSZWdpb25zRGlydHkgPSBmOyB9CisgICAg Ym9vbCBhbm5vdGF0ZWRSZWdpb25zRGlydHkoKSBjb25zdCB7IHJldHVybiBtX2Fubm90YXRlZFJl Z2lvbnNEaXJ0eTsgfQorICAgIGJvb2wgaGFzQW5ub3RhdGVkUmVnaW9ucyAoKSBjb25zdCB7IHJl dHVybiBtX2hhc0Fubm90YXRlZFJlZ2lvbnM7IH0KKyAgICB2b2lkIHNldEFubm90YXRlZFJlZ2lv bnMoY29uc3QgVmVjdG9yPEFubm90YXRlZFJlZ2lvblZhbHVlPiYpOworICAgIHZvaWQgdXBkYXRl QW5ub3RhdGVkUmVnaW9ucygpOworI2VuZGlmCisKICAgICBIdHRwRXF1aXZQb2xpY3kgaHR0cEVx dWl2UG9saWN5KCkgY29uc3Q7CiAgICAgQVhPYmplY3RDYWNoZSogZXhpc3RpbmdBWE9iamVjdENh Y2hlU2xvdygpIGNvbnN0OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1l Vmlldy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKaW5kZXggZDI1YTdl NjFhN2FlMzRjYjI1N2UxNGYwZTUyNWM3Mzk4MjI4MmRlOS4uZjA2N2QwOGE3NDM2NWMzODg0MGRl MDlkZTVlNzk3ZGFkYWEwZmIwYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFt ZVZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcApAQCAtMTMw NCwxMyArMTMwNCw3IEBAIHZvaWQgRnJhbWVWaWV3OjpkaWRMYXlvdXQoV2Vha1B0cjxSZW5kZXJF bGVtZW50PiBsYXlvdXRSb290KQogICAgICAgICBjYWNoZS0+cG9zdE5vdGlmaWNhdGlvbihsYXlv dXRSb290LmdldCgpLCBBWE9iamVjdENhY2hlOjpBWExheW91dENvbXBsZXRlKTsKICNlbmRpZgog Ci0jaWYgRU5BQkxFKERBU0hCT0FSRF9TVVBQT1JUKQotICAgIHVwZGF0ZUFubm90YXRlZFJlZ2lv bnMoKTsKLSNlbmRpZgotCi0jaWYgRU5BQkxFKElPU19UT1VDSF9FVkVOVFMpCi0gICAgZnJhbWUo KS5kb2N1bWVudCgpLT5zZXRUb3VjaEV2ZW50UmVnaW9uc05lZWRVcGRhdGUoKTsKLSNlbmRpZgor ICAgIGZyYW1lKCkuZG9jdW1lbnQoKS0+aW52YWxpZGF0ZVJlbmRlcmluZ0RlcGVuZGVudFJlZ2lv bnMoRG9jdW1lbnQ6OkFubm90YXRpb25zQWN0aW9uOjpVcGRhdGUpOwogCiAgICAgdXBkYXRlQ2Fu QmxpdE9uU2Nyb2xsUmVjdXJzaXZlbHkoKTsKIApAQCAtMzg4MiwyNCArMzg3Niw2IEBAIGJvb2wg RnJhbWVWaWV3OjpzY3JvbGxBbmltYXRvckVuYWJsZWQoKSBjb25zdAogICAgIHJldHVybiBmYWxz ZTsKIH0KIAotI2lmIEVOQUJMRShEQVNIQk9BUkRfU1VQUE9SVCkKLXZvaWQgRnJhbWVWaWV3Ojp1 cGRhdGVBbm5vdGF0ZWRSZWdpb25zKCkKLXsKLSAgICBEb2N1bWVudCogZG9jdW1lbnQgPSBmcmFt ZSgpLmRvY3VtZW50KCk7Ci0gICAgaWYgKCFkb2N1bWVudC0+aGFzQW5ub3RhdGVkUmVnaW9ucygp KQotICAgICAgICByZXR1cm47Ci0gICAgVmVjdG9yPEFubm90YXRlZFJlZ2lvblZhbHVlPiBuZXdS ZWdpb25zOwotICAgIGRvY3VtZW50LT5yZW5kZXJCb3goKS0+Y29sbGVjdEFubm90YXRlZFJlZ2lv bnMobmV3UmVnaW9ucyk7Ci0gICAgaWYgKG5ld1JlZ2lvbnMgPT0gZG9jdW1lbnQtPmFubm90YXRl ZFJlZ2lvbnMoKSkKLSAgICAgICAgcmV0dXJuOwotICAgIGRvY3VtZW50LT5zZXRBbm5vdGF0ZWRS ZWdpb25zKG5ld1JlZ2lvbnMpOwotICAgIFBhZ2UqIHBhZ2UgPSBmcmFtZSgpLnBhZ2UoKTsKLSAg ICBpZiAoIXBhZ2UpCi0gICAgICAgIHJldHVybjsKLSAgICBwYWdlLT5jaHJvbWUoKS5jbGllbnQo KS5hbm5vdGF0ZWRSZWdpb25zQ2hhbmdlZCgpOwotfQotI2VuZGlmCi0KIHZvaWQgRnJhbWVWaWV3 Ojp1cGRhdGVTY3JvbGxDb3JuZXIoKQogewogICAgIFJlbmRlckVsZW1lbnQqIHJlbmRlcmVyID0g bnVsbHB0cjsKQEAgLTQxNzcsMTAgKzQxNTMsNyBAQCB2b2lkIEZyYW1lVmlldzo6ZGlkUGFpbnRD b250ZW50cyhHcmFwaGljc0NvbnRleHQmIGNvbnRleHQsIGNvbnN0IEludFJlY3QmIGRpcnR5Ugog ICAgIG1fbGFzdFBhaW50VGltZSA9IE1vbm90b25pY1RpbWU6Om5vdygpOwogCiAgICAgLy8gUmVn aW9ucyBtYXkgaGF2ZSBjaGFuZ2VkIGFzIGEgcmVzdWx0IG9mIHRoZSB2aXNpYmlsaXR5L3otaW5k ZXggb2YgZWxlbWVudCBjaGFuZ2luZy4KLSNpZiBFTkFCTEUoREFTSEJPQVJEX1NVUFBPUlQpCi0g ICAgaWYgKGZyYW1lKCkuZG9jdW1lbnQoKS0+YW5ub3RhdGVkUmVnaW9uc0RpcnR5KCkpCi0gICAg ICAgIHVwZGF0ZUFubm90YXRlZFJlZ2lvbnMoKTsKLSNlbmRpZgorICAgIGZyYW1lKCkuZG9jdW1l bnQoKS0+dXBkYXRlWk9yZGVyRGVwZW5kZW50UmVnaW9ucygpOwogCiAgICAgaWYgKHBhaW50aW5n U3RhdGUuaXNUb3BMZXZlbFBhaW50ZXIpCiAgICAgICAgIHNDdXJyZW50UGFpbnRUaW1lU3RhbXAg PSBNb25vdG9uaWNUaW1lKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1l Vmlldy5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuaAppbmRleCAyOTc2YjU2N2Ri ZjBhMTk3ODliNzZlNjA5YTExN2U2MmI1MTE4MjViLi41MjlmNmNjMzlhNmVlYzMwMGNmOTI1NzVl YWRjNGM4MDBiOWZiNjVkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmll dy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmgKQEAgLTMzMyw5ICszMzMs NiBAQCBwdWJsaWM6CiAgICAgYm9vbCBzcGVjdWxhdGl2ZVRpbGluZ0VuYWJsZWQoKSBjb25zdCB7 IHJldHVybiBtX3NwZWN1bGF0aXZlVGlsaW5nRW5hYmxlZDsgfQogICAgIHZvaWQgbG9hZFByb2dy ZXNzaW5nU3RhdHVzQ2hhbmdlZCgpOwogCi0jaWYgRU5BQkxFKERBU0hCT0FSRF9TVVBQT1JUKQot ICAgIHZvaWQgdXBkYXRlQW5ub3RhdGVkUmVnaW9ucygpOwotI2VuZGlmCiAgICAgV0VCQ09SRV9F WFBPUlQgdm9pZCB1cGRhdGVDb250cm9sVGludHMoKTsKIAogICAgIFdFQkNPUkVfRVhQT1JUIGJv b2wgd2FzU2Nyb2xsZWRCeVVzZXIoKSBjb25zdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJFbGVtZW50LmNwcAppbmRleCBjOWI5NWQ4MjM4OTkwN2Q2OTEzYmQzYzUzYTVmNmYwYzcw ZWQ1NWRhLi4zOTU0NDUyNTg2YjU0ZWU5MmU4YzUzMDQyMTkwMmE5NzRjOTRhMTVkIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckVsZW1lbnQuY3BwCkBAIC00OCw2ICs0OCw3IEBA CiAjaW5jbHVkZSAiUmVuZGVyRGVzY2VuZGFudEl0ZXJhdG9yLmgiCiAjaW5jbHVkZSAiUmVuZGVy RmxleGlibGVCb3guaCIKICNpbmNsdWRlICJSZW5kZXJGcmFnbWVudGVkRmxvdy5oIgorI2luY2x1 ZGUgIlJlbmRlckdyaWQuaCIKICNpbmNsdWRlICJSZW5kZXJJbWFnZS5oIgogI2luY2x1ZGUgIlJl bmRlckltYWdlUmVzb3VyY2VTdHlsZUltYWdlLmgiCiAjaW5jbHVkZSAiUmVuZGVySW5saW5lLmgi CkBAIC03OSw4ICs4MCw2IEBACiAjaW5jbHVkZSA8d3RmL01hdGhFeHRyYXMuaD4KICNpbmNsdWRl IDx3dGYvU3RhY2tTdGF0cy5oPgogCi0jaW5jbHVkZSAiUmVuZGVyR3JpZC5oIgotCiBuYW1lc3Bh Y2UgV2ViQ29yZSB7CiAKIFdURl9NQUtFX0lTT19BTExPQ0FURURfSU1QTChSZW5kZXJFbGVtZW50 KTsKQEAgLTcwOSwxNCArNzA4LDEwIEBAIHZvaWQgUmVuZGVyRWxlbWVudDo6c3R5bGVXaWxsQ2hh bmdlKFN0eWxlRGlmZmVyZW5jZSBkaWZmLCBjb25zdCBSZW5kZXJTdHlsZSYgbmV3CiAgICAgICAg IGJvb2wgdmlzaWJpbGl0eUNoYW5nZWQgPSBtX3N0eWxlLnZpc2liaWxpdHkoKSAhPSBuZXdTdHls ZS52aXNpYmlsaXR5KCkKICAgICAgICAgICAgIHx8IG1fc3R5bGUuekluZGV4KCkgIT0gbmV3U3R5 bGUuekluZGV4KCkKICAgICAgICAgICAgIHx8IG1fc3R5bGUuaGFzQXV0b1pJbmRleCgpICE9IG5l d1N0eWxlLmhhc0F1dG9aSW5kZXgoKTsKLSNpZiBFTkFCTEUoREFTSEJPQVJEX1NVUFBPUlQpCi0g ICAgICAgIGlmICh2aXNpYmlsaXR5Q2hhbmdlZCkKLSAgICAgICAgICAgIGRvY3VtZW50KCkuc2V0 QW5ub3RhdGVkUmVnaW9uc0RpcnR5KHRydWUpOwotI2VuZGlmCi0jaWYgUExBVEZPUk0oSU9TX0ZB TUlMWSkgJiYgRU5BQkxFKFRPVUNIX0VWRU5UUykKKwogICAgICAgICBpZiAodmlzaWJpbGl0eUNo YW5nZWQpCi0gICAgICAgICAgICBkb2N1bWVudCgpLnNldFRvdWNoRXZlbnRSZWdpb25zTmVlZFVw ZGF0ZSgpOwotI2VuZGlmCisgICAgICAgICAgICBkb2N1bWVudCgpLmludmFsaWRhdGVSZW5kZXJp bmdEZXBlbmRlbnRSZWdpb25zKCk7CisKICAgICAgICAgaWYgKHZpc2liaWxpdHlDaGFuZ2VkKSB7 CiAgICAgICAgICAgICBpZiAoQVhPYmplY3RDYWNoZSogY2FjaGUgPSBkb2N1bWVudCgpLmV4aXN0 aW5nQVhPYmplY3RDYWNoZSgpKQogICAgICAgICAgICAgICAgIGNhY2hlLT5jaGlsZHJlbkNoYW5n ZWQocGFyZW50KCksIHRoaXMpOwpAQCAtNzM3LDYgKzczMiw3IEBAIHZvaWQgUmVuZGVyRWxlbWVu dDo6c3R5bGVXaWxsQ2hhbmdlKFN0eWxlRGlmZmVyZW5jZSBkaWZmLCBjb25zdCBSZW5kZXJTdHls ZSYgbmV3CiAKICAgICAgICAgaWYgKG1fcGFyZW50ICYmIChuZXdTdHlsZS5vdXRsaW5lU2l6ZSgp IDwgbV9zdHlsZS5vdXRsaW5lU2l6ZSgpIHx8IHNob3VsZFJlcGFpbnRGb3JTdHlsZURpZmZlcmVu Y2UoZGlmZikpKQogICAgICAgICAgICAgcmVwYWludCgpOworCiAgICAgICAgIGlmIChpc0Zsb2F0 aW5nKCkgJiYgbV9zdHlsZS5mbG9hdGluZygpICE9IG5ld1N0eWxlLmZsb2F0aW5nKCkpIHsKICAg ICAgICAgICAgIC8vIEZvciBjaGFuZ2VzIGluIGZsb2F0IHN0eWxlcywgd2UgbmVlZCB0byBjb25j ZWl2YWJseSByZW1vdmUgb3Vyc2VsdmVzCiAgICAgICAgICAgICAvLyBmcm9tIHRoZSBmbG9hdGlu ZyBvYmplY3RzIGxpc3QuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyTGF5ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcApp bmRleCBjYTlkMTE4MTUxNjhmMWEwZDY5Y2NlNjFhOTdiY2FjMGM1NzJlMzE3Li42YzJhNDIzYjY3 NzZmYzk5MGYwYTdlMGYzNDA2NjFiY2NkMGYyMzdkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJMYXllci5jcHAKQEAgLTIzOTIsMTAgKzIzOTIsNyBAQCB2b2lkIFJlbmRlckxheWVy OjpzY3JvbGxUbyhjb25zdCBTY3JvbGxQb3NpdGlvbiYgcG9zaXRpb24pCiAgICAgaWYgKCF2aWV3 LmZyYW1lVmlldygpLmxheW91dENvbnRleHQoKS5pc0luUmVuZGVyVHJlZUxheW91dCgpKSB7CiAg ICAgICAgIC8vIElmIHdlJ3JlIGluIHRoZSBtaWRkbGUgb2YgbGF5b3V0LCB3ZSdsbCBqdXN0IHVw ZGF0ZSBsYXllcnMgb25jZSBsYXlvdXQgaGFzIGZpbmlzaGVkLgogICAgICAgICB1cGRhdGVMYXll clBvc2l0aW9uc0FmdGVyT3ZlcmZsb3dTY3JvbGwoKTsKLSAgICAgICAgLy8gVXBkYXRlIHJlZ2lv bnMsIHNjcm9sbGluZyBtYXkgY2hhbmdlIHRoZSBjbGlwIG9mIGEgcGFydGljdWxhciByZWdpb24u Ci0jaWYgRU5BQkxFKERBU0hCT0FSRF9TVVBQT1JUKQotICAgICAgICB2aWV3LmZyYW1lVmlldygp LnVwZGF0ZUFubm90YXRlZFJlZ2lvbnMoKTsKLSNlbmRpZgorCiAgICAgICAgIHZpZXcuZnJhbWVW aWV3KCkuc2NoZWR1bGVVcGRhdGVXaWRnZXRQb3NpdGlvbnMoKTsKIAogICAgICAgICBpZiAoIW1f dXBkYXRpbmdNYXJxdWVlUG9zaXRpb24pIHsKQEAgLTI0MTEsOSArMjQwOCw4IEBAIHZvaWQgUmVu ZGVyTGF5ZXI6OnNjcm9sbFRvKGNvbnN0IFNjcm9sbFBvc2l0aW9uJiBwb3NpdGlvbikKICAgICAg ICAgICAgIHVwZGF0ZUNvbXBvc2l0aW5nTGF5ZXJzQWZ0ZXJTY3JvbGwoKTsKICAgICAgICAgfQog Ci0jaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkgJiYgRU5BQkxFKFRPVUNIX0VWRU5UUykKLSAgICAg ICAgcmVuZGVyZXIoKS5kb2N1bWVudCgpLnNldFRvdWNoRXZlbnRSZWdpb25zTmVlZFVwZGF0ZSgp OwotI2VuZGlmCisgICAgICAgIC8vIFVwZGF0ZSByZWdpb25zLCBzY3JvbGxpbmcgbWF5IGNoYW5n ZSB0aGUgY2xpcCBvZiBhIHBhcnRpY3VsYXIgcmVnaW9uLgorICAgICAgICByZW5kZXJlcigpLmRv Y3VtZW50KCkuaW52YWxpZGF0ZVJlbmRlcmluZ0RlcGVuZGVudFJlZ2lvbnMoRG9jdW1lbnQ6OkFu bm90YXRpb25zQWN0aW9uOjpVcGRhdGUpOwogICAgICAgICBEZWJ1Z1BhZ2VPdmVybGF5czo6ZGlk TGF5b3V0KHJlbmRlcmVyKCkuZnJhbWUoKSk7CiAgICAgfQogCkBAIC0zMTkzLDExICszMTg5LDcg QEAgdm9pZCBSZW5kZXJMYXllcjo6c2V0SGFzSG9yaXpvbnRhbFNjcm9sbGJhcihib29sIGhhc1Nj cm9sbGJhcikKICAgICBpZiAobV92QmFyKQogICAgICAgICBtX3ZCYXItPnN0eWxlQ2hhbmdlZCgp OwogCi0gICAgLy8gRm9yY2UgYW4gdXBkYXRlIHNpbmNlIHdlIGtub3cgdGhlIHNjcm9sbGJhcnMg aGF2ZSBjaGFuZ2VkIHRoaW5ncy4KLSNpZiBFTkFCTEUoREFTSEJPQVJEX1NVUFBPUlQpCi0gICAg aWYgKHJlbmRlcmVyKCkuZG9jdW1lbnQoKS5oYXNBbm5vdGF0ZWRSZWdpb25zKCkpCi0gICAgICAg IHJlbmRlcmVyKCkuZG9jdW1lbnQoKS5zZXRBbm5vdGF0ZWRSZWdpb25zRGlydHkodHJ1ZSk7Ci0j ZW5kaWYKKyAgICByZW5kZXJlcigpLmRvY3VtZW50KCkuaW52YWxpZGF0ZVNjcm9sbGJhckRlcGVu ZGVudFJlZ2lvbnMoKTsKIH0KIAogdm9pZCBSZW5kZXJMYXllcjo6c2V0SGFzVmVydGljYWxTY3Jv bGxiYXIoYm9vbCBoYXNTY3JvbGxiYXIpCkBAIC0zMjI0LDExICszMjE2LDcgQEAgdm9pZCBSZW5k ZXJMYXllcjo6c2V0SGFzVmVydGljYWxTY3JvbGxiYXIoYm9vbCBoYXNTY3JvbGxiYXIpCiAgICAg aWYgKG1fdkJhcikKICAgICAgICAgbV92QmFyLT5zdHlsZUNoYW5nZWQoKTsKIAotICAgIC8vIEZv cmNlIGFuIHVwZGF0ZSBzaW5jZSB3ZSBrbm93IHRoZSBzY3JvbGxiYXJzIGhhdmUgY2hhbmdlZCB0 aGluZ3MuCi0jaWYgRU5BQkxFKERBU0hCT0FSRF9TVVBQT1JUKQotICAgIGlmIChyZW5kZXJlcigp LmRvY3VtZW50KCkuaGFzQW5ub3RhdGVkUmVnaW9ucygpKQotICAgICAgICByZW5kZXJlcigpLmRv Y3VtZW50KCkuc2V0QW5ub3RhdGVkUmVnaW9uc0RpcnR5KHRydWUpOwotI2VuZGlmCisgICAgcmVu ZGVyZXIoKS5kb2N1bWVudCgpLmludmFsaWRhdGVTY3JvbGxiYXJEZXBlbmRlbnRSZWdpb25zKCk7 CiB9CiAKIFNjcm9sbGFibGVBcmVhKiBSZW5kZXJMYXllcjo6ZW5jbG9zaW5nU2Nyb2xsYWJsZUFy ZWEoKSBjb25zdApAQCAtMzQ5NCwxMiArMzQ4Miw3IEBAIHZvaWQgUmVuZGVyTGF5ZXI6OnVwZGF0 ZVNjcm9sbGJhcnNBZnRlckxheW91dCgpCiAKICAgICAgICAgdXBkYXRlU2VsZlBhaW50aW5nTGF5 ZXIoKTsKIAotICAgICAgICAvLyBGb3JjZSBhbiB1cGRhdGUgc2luY2Ugd2Uga25vdyB0aGUgc2Ny b2xsYmFycyBoYXZlIGNoYW5nZWQgdGhpbmdzLgotI2lmIEVOQUJMRShEQVNIQk9BUkRfU1VQUE9S VCkKLSAgICAgICAgaWYgKHJlbmRlcmVyKCkuZG9jdW1lbnQoKS5oYXNBbm5vdGF0ZWRSZWdpb25z KCkpCi0gICAgICAgICAgICByZW5kZXJlcigpLmRvY3VtZW50KCkuc2V0QW5ub3RhdGVkUmVnaW9u c0RpcnR5KHRydWUpOwotI2VuZGlmCi0KKyAgICAgICAgcmVuZGVyZXIoKS5kb2N1bWVudCgpLmlu dmFsaWRhdGVTY3JvbGxiYXJEZXBlbmRlbnRSZWdpb25zKCk7CiAgICAgICAgIHJlbmRlcmVyKCku cmVwYWludCgpOwogCiAgICAgICAgIGlmIChyZW5kZXJlcigpLnN0eWxlKCkub3ZlcmZsb3dYKCkg PT0gT3ZlcmZsb3c6OkF1dG8gfHwgcmVuZGVyZXIoKS5zdHlsZSgpLm92ZXJmbG93WSgpID09IE92 ZXJmbG93OjpBdXRvKSB7CkBAIC02Mzc5LDcgKzYzNjIsNyBAQCB2b2lkIFJlbmRlckxheWVyOjpz dHlsZUNoYW5nZWQoU3R5bGVEaWZmZXJlbmNlIGRpZmYsIGNvbnN0IFJlbmRlclN0eWxlKiBvbGRT dHlsZQogCiAjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkgJiYgRU5BQkxFKFRPVUNIX0VWRU5UUykK ICAgICBpZiAoZGlmZiA9PSBTdHlsZURpZmZlcmVuY2U6OlJlY29tcG9zaXRlTGF5ZXIgfHwgZGlm ZiA+PSBTdHlsZURpZmZlcmVuY2U6OkxheW91dFBvc2l0aW9uZWRNb3ZlbWVudE9ubHkpCi0gICAg ICAgIHJlbmRlcmVyKCkuZG9jdW1lbnQoKS5zZXRUb3VjaEV2ZW50UmVnaW9uc05lZWRVcGRhdGUo KTsKKyAgICAgICAgcmVuZGVyZXIoKS5kb2N1bWVudCgpLmludmFsaWRhdGVSZW5kZXJpbmdEZXBl bmRlbnRSZWdpb25zKCk7CiAjZWxzZQogICAgIFVOVVNFRF9QQVJBTShkaWZmKTsKICNlbmRpZgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxpc3RCb3guY3BwIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxpc3RCb3guY3BwCmluZGV4IDYzYWRlN2Uy M2U0MzY3ZmNlYWJlMDFmNDY2ODNkYjMyZmU4MWFkNjEuLmMxZGY4MGZhZmM3MmIzMzgxOTc0YzY4 NzZlYTcwYmNiNDhlNjY1MzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJMaXN0Qm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGlz dEJveC5jcHAKQEAgLTk1NCwxMSArOTU0LDcgQEAgdm9pZCBSZW5kZXJMaXN0Qm94OjpzZXRIYXNW ZXJ0aWNhbFNjcm9sbGJhcihib29sIGhhc1Njcm9sbGJhcikKICAgICBpZiAobV92QmFyKQogICAg ICAgICBtX3ZCYXItPnN0eWxlQ2hhbmdlZCgpOwogCi0gICAgLy8gRm9yY2UgYW4gdXBkYXRlIHNp bmNlIHdlIGtub3cgdGhlIHNjcm9sbGJhcnMgaGF2ZSBjaGFuZ2VkIHRoaW5ncy4KLSNpZiBFTkFC TEUoREFTSEJPQVJEX1NVUFBPUlQpCi0gICAgaWYgKGRvY3VtZW50KCkuaGFzQW5ub3RhdGVkUmVn aW9ucygpKQotICAgICAgICBkb2N1bWVudCgpLnNldEFubm90YXRlZFJlZ2lvbnNEaXJ0eSh0cnVl KTsKLSNlbmRpZgorICAgIGRvY3VtZW50KCkuaW52YWxpZGF0ZVNjcm9sbGJhckRlcGVuZGVudFJl Z2lvbnMoKTsKIH0KIAogYm9vbCBSZW5kZXJMaXN0Qm94OjpzY3JvbGxlZFRvVG9wKCkgY29uc3QK