42997 2010-07-26 13:55:51 -0700 Handle mouseenter/mouseleave + focus events 2010-07-26 16:52:28 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 256215 0 andersca 2010-07-26 13:55:51 -0700 Handle mouseenter/mouseleave + focus events 256226 1 62604 andersca 2010-07-26 14:02:59 -0700 Created attachment 62604 Patch 256335 2 andersca 2010-07-26 16:52:28 -0700 Committed r64073: <http://trac.webkit.org/changeset/64073> 62604 2010-07-26 14:02:59 -0700 2010-07-26 14:07:07 -0700 Patch bug-42997-20100726140257.patch text/plain 13515 andersca ZGlmZiAtLWdpdCBhL1dlYktpdDIvQ2hhbmdlTG9nIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXgg NTdkZDhmMjljMzRiZjVkNTU4ZDZjMjRiOTUyN2I5MDhjZTJkZTlmOC4uNzVhN2ZmMzVmMzQ5MjU0 YWE3N2RkMjVjM2U0NzdhMjk4YmUwNzM4YyAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsNSArMSw0OSBAQAogMjAxMC0wNy0yNiAgQW5k ZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEhhbmRsZSBtb3VzZWVudGVyL21vdXNlbGVhdmUg KyBmb2N1cyBldmVudHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTQyOTk3CisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0 c2NhcGVQbHVnaW4uY3BwOgorICAgICAgICAoV2ViS2l0OjpOZXRzY2FwZVBsdWdpbjo6aGFuZGxl TW91c2VFbnRlckV2ZW50KToKKyAgICAgICAgQ2FsbCBwbGF0Zm9ybUhhbmRsZU1vdXNlRW50ZXJF dmVudC4KKyAgICAgICAgCisgICAgICAgIChXZWJLaXQ6Ok5ldHNjYXBlUGx1Z2luOjpoYW5kbGVN b3VzZUxlYXZlRXZlbnQpOgorICAgICAgICBDYWxsIHBsYXRmb3JtSGFuZGxlTW91c2VFeGl0RXZl bnQuCisKKyAgICAgICAgKFdlYktpdDo6TmV0c2NhcGVQbHVnaW46OnNldEZvY3VzKToKKyAgICAg ICAgQ2FsbCBwbGF0Zm9ybVNldEZvY3VzLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9QbHVnaW5z L05ldHNjYXBlL21hYy9OZXRzY2FwZVBsdWdpbk1hYy5tbToKKyAgICAgICAgKFdlYktpdDo6Zmls bEluQ29jb2FFdmVudEZyb21Nb3VzZUV2ZW50KToKKyAgICAgICAgRmFjdG9yIG91dCBjb2RlIHRo YXQgZmlsbHMgaW4gYW4gTlBDb2NvYUV2ZW50IGZyb20gYSBXZWJNb3VzZUV2ZW50LgorCisgICAg ICAgIChXZWJLaXQ6OmluaXRpYWxpemVNb3VzZUV2ZW50KToKKyAgICAgICAgQ2FsbCBmaWxsSW5D b2NvYUV2ZW50RnJvbU1vdXNlRXZlbnQuCisgICAgICAgIAorICAgICAgICAoV2ViS2l0OjpOZXRz Y2FwZVBsdWdpbjo6cGxhdGZvcm1IYW5kbGVNb3VzZUVudGVyRXZlbnQpOgorICAgICAgICBTZW5k IGFuIE5QQ29jb2FFdmVudE1vdXNlRW50ZXJlZCBldmVudC4KKyAgICAKKyAgICAgICAgKFdlYktp dDo6TmV0c2NhcGVQbHVnaW46OnBsYXRmb3JtSGFuZGxlTW91c2VMZWF2ZUV2ZW50KToKKyAgICAg ICAgU2VuZCBhbiBOUENvY29hRXZlbnRNb3VzZUV4aXRlZCBldmVudC4KKworICAgICAgICAoV2Vi S2l0OjpOZXRzY2FwZVBsdWdpbjo6cGxhdGZvcm1TZXRGb2N1cyk6CisgICAgICAgIFNlbmQgYW4g TlBDb2NvYUV2ZW50Rm9jdXNDaGFuZ2VkLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9QbHVnaW5z L1BsdWdpbi5oOgorICAgICAgICAqIFdlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5WaWV3LmNwcDoK KyAgICAgICAgKFdlYktpdDo6UGx1Z2luVmlldzo6aGFuZGxlRXZlbnQpOgorICAgICAgICBEaXNw YXRjaCBtb3VzZSBlbnRlciBhbmQgbW91c2UgbGVhdmUgZXZlbnRzLiBDYWxsIGZvY3VzUGx1Z2lu RWxlbWVudCBvbiBtb3VzZWRvd24uCisKKyAgICAgICAgKFdlYktpdDo6UGx1Z2luVmlldzo6Zm9j dXNQbHVnaW5FbGVtZW50KToKKyAgICAgICAgRm9jdXMgdGhlIHBsdWctaW4ncyBjb250YWluaW5n IGZyYW1lIGFuZCBpdHMgZWxlbWVudC4KKworICAgICAgICAoV2ViS2l0OjpQbHVnaW5WaWV3Ojpz ZXRGb2N1cyk6CisgICAgICAgIENhbGwgUGx1Z2luOjpzZXRGb2N1cy4KKworMjAxMC0wNy0yNiAg QW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgorCiAgICAgICAgIFJldmlld2Vk IGJ5IEFkYW0gUm9iZW4uCiAKICAgICAgICAgR2V0IHJpZCBvZiB0aGUgZHVtbXkgcGx1Zy1pbi4K ZGlmZiAtLWdpdCBhL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL05ldHNjYXBl UGx1Z2luLmNwcCBiL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL05ldHNjYXBl UGx1Z2luLmNwcAppbmRleCA4YjI0YjlkOTc1NDBmNzI3OGRmMmQzY2Y1N2FlNDRjMmM0ZDg0OTZh Li5iMDI2ZWVlMmUzY2M4YTZmNTQzYTYyMmY4NjExOGU0ZTFmYzA3MzM1IDEwMDY0NAotLS0gYS9X ZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9OZXRzY2FwZVBsdWdpbi5jcHAKKysr IGIvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVQbHVnaW4uY3Bw CkBAIC00MjMsNiArNDIzLDIxIEBAIGJvb2wgTmV0c2NhcGVQbHVnaW46OmhhbmRsZVdoZWVsRXZl bnQoY29uc3QgV2ViV2hlZWxFdmVudCYgd2hlZWxFdmVudCkKICAgICByZXR1cm4gcGxhdGZvcm1I YW5kbGVXaGVlbEV2ZW50KHdoZWVsRXZlbnQpOwogfQogCitib29sIE5ldHNjYXBlUGx1Z2luOjpo YW5kbGVNb3VzZUVudGVyRXZlbnQoY29uc3QgV2ViTW91c2VFdmVudCYgbW91c2VFdmVudCkKK3sK KyAgICByZXR1cm4gcGxhdGZvcm1IYW5kbGVNb3VzZUVudGVyRXZlbnQobW91c2VFdmVudCk7Cit9 CisKK2Jvb2wgTmV0c2NhcGVQbHVnaW46OmhhbmRsZU1vdXNlTGVhdmVFdmVudChjb25zdCBXZWJN b3VzZUV2ZW50JiBtb3VzZUV2ZW50KQoreworICAgIHJldHVybiBwbGF0Zm9ybUhhbmRsZU1vdXNl TGVhdmVFdmVudChtb3VzZUV2ZW50KTsKK30KKwordm9pZCBOZXRzY2FwZVBsdWdpbjo6c2V0Rm9j dXMoYm9vbCBoYXNGb2N1cykKK3sKKyAgICBwbGF0Zm9ybVNldEZvY3VzKGhhc0ZvY3VzKTsKK30K KwogUGx1Z2luQ29udHJvbGxlciogTmV0c2NhcGVQbHVnaW46OmNvbnRyb2xsZXIoKQogewogICAg IHJldHVybiBtX3BsdWdpbkNvbnRyb2xsZXI7CmRpZmYgLS1naXQgYS9XZWJLaXQyL1dlYlByb2Nl c3MvUGx1Z2lucy9OZXRzY2FwZS9OZXRzY2FwZVBsdWdpbi5oIGIvV2ViS2l0Mi9XZWJQcm9jZXNz L1BsdWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVQbHVnaW4uaAppbmRleCA3ZGQ1MmY1ZjVlNTU0YWJk YzE3MzA0OGViZGMxMmFjOWI4MTEyM2VmLi5hM2JlOTA2NTQ5NWQyZDMzMjc2MzQyMDI5YjFlOTJk MjE4ZWViNzllIDEwMDY0NAotLS0gYS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2Fw ZS9OZXRzY2FwZVBsdWdpbi5oCisrKyBiL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNj YXBlL05ldHNjYXBlUGx1Z2luLmgKQEAgLTk0LDYgKzk0LDkgQEAgcHJpdmF0ZToKIAogICAgIGJv b2wgcGxhdGZvcm1IYW5kbGVNb3VzZUV2ZW50KGNvbnN0IFdlYk1vdXNlRXZlbnQmKTsKICAgICBi b29sIHBsYXRmb3JtSGFuZGxlV2hlZWxFdmVudChjb25zdCBXZWJXaGVlbEV2ZW50Jik7CisgICAg Ym9vbCBwbGF0Zm9ybUhhbmRsZU1vdXNlRW50ZXJFdmVudChjb25zdCBXZWJNb3VzZUV2ZW50Jik7 CisgICAgYm9vbCBwbGF0Zm9ybUhhbmRsZU1vdXNlTGVhdmVFdmVudChjb25zdCBXZWJNb3VzZUV2 ZW50Jik7CisgICAgdm9pZCBwbGF0Zm9ybVNldEZvY3VzKGJvb2wpOwogCiAgICAgLy8gUGx1Z2lu CiAgICAgdmlydHVhbCBib29sIGluaXRpYWxpemUoUGx1Z2luQ29udHJvbGxlciosIGNvbnN0IFBh cmFtZXRlcnMmKTsKQEAgLTExMCw2ICsxMTMsOSBAQCBwcml2YXRlOgogICAgIHZpcnR1YWwgdm9p ZCBzdHJlYW1EaWRGYWlsKHVpbnQ2NF90IHN0cmVhbUlELCBib29sIHdhc0NhbmNlbGxlZCk7CiAg ICAgdmlydHVhbCBib29sIGhhbmRsZU1vdXNlRXZlbnQoY29uc3QgV2ViTW91c2VFdmVudCYpOwog ICAgIHZpcnR1YWwgYm9vbCBoYW5kbGVXaGVlbEV2ZW50KGNvbnN0IFdlYldoZWVsRXZlbnQmKTsK KyAgICB2aXJ0dWFsIGJvb2wgaGFuZGxlTW91c2VFbnRlckV2ZW50KGNvbnN0IFdlYk1vdXNlRXZl bnQmKTsKKyAgICB2aXJ0dWFsIGJvb2wgaGFuZGxlTW91c2VMZWF2ZUV2ZW50KGNvbnN0IFdlYk1v dXNlRXZlbnQmKTsKKyAgICB2aXJ0dWFsIHZvaWQgc2V0Rm9jdXMoYm9vbCk7CiAKICAgICB2aXJ0 dWFsIFBsdWdpbkNvbnRyb2xsZXIqIGNvbnRyb2xsZXIoKTsKIApAQCAtMTUxLDE2ICsxNTcsMjAg QEAgaW5saW5lIHZvaWQgTmV0c2NhcGVQbHVnaW46OnBsYXRmb3JtUGFpbnQoV2ViQ29yZTo6R3Jh cGhpY3NDb250ZXh0KiwgY29uc3QgV2ViQ28KIHsKIH0KIAotYm9vbCBOZXRzY2FwZVBsdWdpbjo6 cGxhdGZvcm1IYW5kbGVNb3VzZUV2ZW50KGNvbnN0IFdlYk1vdXNlRXZlbnQmKQoraW5saW5lIGJv b2wgTmV0c2NhcGVQbHVnaW46OnBsYXRmb3JtSGFuZGxlTW91c2VFdmVudChjb25zdCBXZWJNb3Vz ZUV2ZW50JikKIHsKICAgICByZXR1cm4gZmFsc2U7CiB9CiAKLWJvb2wgTmV0c2NhcGVQbHVnaW46 OnBsYXRmb3JtSGFuZGxlV2hlZWxFdmVudChjb25zdCBXZWJXaGVlbEV2ZW50JikKK2lubGluZSBi b29sIE5ldHNjYXBlUGx1Z2luOjpwbGF0Zm9ybUhhbmRsZVdoZWVsRXZlbnQoY29uc3QgV2ViV2hl ZWxFdmVudCYpCiB7CiAgICAgcmV0dXJuIGZhbHNlOwogfQogCitpbmxpbmUgdm9pZCBOZXRzY2Fw ZVBsdWdpbjo6cGxhdGZvcm1TZXRGb2N1cyhib29sKQoreworfQorICAgIAogI2VuZGlmCiAKIH0g Ly8gbmFtZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdp bnMvTmV0c2NhcGUvbWFjL05ldHNjYXBlUGx1Z2luTWFjLm1tIGIvV2ViS2l0Mi9XZWJQcm9jZXNz L1BsdWdpbnMvTmV0c2NhcGUvbWFjL05ldHNjYXBlUGx1Z2luTWFjLm1tCmluZGV4IGM0OWM5M2Ni NDRmY2E0OWM4ZDRhNGM2ODg1NGU4ZjNmNWM2OTkxZTEuLjBhZGE4YWNjNDZhMDc4ODIzN2FiZjVl NGJjNGQyMDQwODk3NDU5MTUgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5z L05ldHNjYXBlL21hYy9OZXRzY2FwZVBsdWdpbk1hYy5tbQorKysgYi9XZWJLaXQyL1dlYlByb2Nl c3MvUGx1Z2lucy9OZXRzY2FwZS9tYWMvTmV0c2NhcGVQbHVnaW5NYWMubW0KQEAgLTE3OSw2ICsx NzksMTggQEAgc3RhdGljIGludDMyX3QgYnV0dG9uTnVtYmVyKFdlYk1vdXNlRXZlbnQ6OkJ1dHRv biBidXR0b24pCiAgICAgcmV0dXJuIC0xOwogfQogCitzdGF0aWMgdm9pZCBmaWxsSW5Db2NvYUV2 ZW50RnJvbU1vdXNlRXZlbnQoTlBDb2NvYUV2ZW50JiBldmVudCwgY29uc3QgV2ViTW91c2VFdmVu dCYgbW91c2VFdmVudCwgY29uc3QgV2ViQ29yZTo6SW50UG9pbnQmIHBsdWdpbkxvY2F0aW9uKQor eworICAgIGV2ZW50LmRhdGEubW91c2UubW9kaWZpZXJGbGFncyA9IG1vZGlmaWVyRmxhZ3MobW91 c2VFdmVudCk7CisgICAgZXZlbnQuZGF0YS5tb3VzZS5wbHVnaW5YID0gbW91c2VFdmVudC5wb3Np dGlvblgoKSAtIHBsdWdpbkxvY2F0aW9uLngoKTsKKyAgICBldmVudC5kYXRhLm1vdXNlLnBsdWdp blkgPSBtb3VzZUV2ZW50LnBvc2l0aW9uWSgpIC0gcGx1Z2luTG9jYXRpb24ueSgpOworICAgIGV2 ZW50LmRhdGEubW91c2UuYnV0dG9uTnVtYmVyID0gYnV0dG9uTnVtYmVyKG1vdXNlRXZlbnQuYnV0 dG9uKCkpOworICAgIGV2ZW50LmRhdGEubW91c2UuY2xpY2tDb3VudCA9IG1vdXNlRXZlbnQuY2xp Y2tDb3VudCgpOworICAgIGV2ZW50LmRhdGEubW91c2UuZGVsdGFYID0gbW91c2VFdmVudC5kZWx0 YVgoKTsKKyAgICBldmVudC5kYXRhLm1vdXNlLmRlbHRhWSA9IG1vdXNlRXZlbnQuZGVsdGFZKCk7 CisgICAgZXZlbnQuZGF0YS5tb3VzZS5kZWx0YVogPSBtb3VzZUV2ZW50LmRlbHRhWigpOworfQor ICAgIAogc3RhdGljIE5QQ29jb2FFdmVudCBpbml0aWFsaXplTW91c2VFdmVudChjb25zdCBXZWJN b3VzZUV2ZW50JiBtb3VzZUV2ZW50LCBjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYgcGx1Z2luTG9j YXRpb24pCiB7CiAgICAgTlBDb2NvYUV2ZW50VHlwZSBldmVudFR5cGU7CkBAIC0yMDIsMTUgKzIx NCw3IEBAIHN0YXRpYyBOUENvY29hRXZlbnQgaW5pdGlhbGl6ZU1vdXNlRXZlbnQoY29uc3QgV2Vi TW91c2VFdmVudCYgbW91c2VFdmVudCwgY29uc3QgCiAgICAgfQogCiAgICAgTlBDb2NvYUV2ZW50 IGV2ZW50ID0gaW5pdGlhbGl6ZUV2ZW50KGV2ZW50VHlwZSk7Ci0gICAgCi0gICAgZXZlbnQuZGF0 YS5tb3VzZS5tb2RpZmllckZsYWdzID0gbW9kaWZpZXJGbGFncyhtb3VzZUV2ZW50KTsKLSAgICBl dmVudC5kYXRhLm1vdXNlLnBsdWdpblggPSBtb3VzZUV2ZW50LnBvc2l0aW9uWCgpIC0gcGx1Z2lu TG9jYXRpb24ueCgpOwotICAgIGV2ZW50LmRhdGEubW91c2UucGx1Z2luWSA9IG1vdXNlRXZlbnQu cG9zaXRpb25ZKCkgLSBwbHVnaW5Mb2NhdGlvbi55KCk7Ci0gICAgZXZlbnQuZGF0YS5tb3VzZS5i dXR0b25OdW1iZXIgPSBidXR0b25OdW1iZXIobW91c2VFdmVudC5idXR0b24oKSk7Ci0gICAgZXZl bnQuZGF0YS5tb3VzZS5jbGlja0NvdW50ID0gbW91c2VFdmVudC5jbGlja0NvdW50KCk7Ci0gICAg ZXZlbnQuZGF0YS5tb3VzZS5kZWx0YVggPSBtb3VzZUV2ZW50LmRlbHRhWCgpOwotICAgIGV2ZW50 LmRhdGEubW91c2UuZGVsdGFZID0gbW91c2VFdmVudC5kZWx0YVkoKTsKLSAgICBldmVudC5kYXRh Lm1vdXNlLmRlbHRhWiA9IG1vdXNlRXZlbnQuZGVsdGFaKCk7CisgICAgZmlsbEluQ29jb2FFdmVu dEZyb21Nb3VzZUV2ZW50KGV2ZW50LCBtb3VzZUV2ZW50LCBwbHVnaW5Mb2NhdGlvbik7CiAKICAg ICByZXR1cm4gZXZlbnQ7CiB9CkBAIC0yMjYsNyArMjMwLDcgQEAgYm9vbCBOZXRzY2FwZVBsdWdp bjo6cGxhdGZvcm1IYW5kbGVNb3VzZUV2ZW50KGNvbnN0IFdlYk1vdXNlRXZlbnQmIG1vdXNlRXZl bnQpCiAgICAgICAgIGRlZmF1bHQ6CiAgICAgICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsK ICAgICB9Ci0gICAgCisKICAgICByZXR1cm4gZmFsc2U7CiB9CiAKQEAgLTI0NCw3ICsyNDgsMjMg QEAgYm9vbCBOZXRzY2FwZVBsdWdpbjo6cGxhdGZvcm1IYW5kbGVXaGVlbEV2ZW50KGNvbnN0IFdl YldoZWVsRXZlbnQmIHdoZWVsRXZlbnQpCiAgICAgICAgICAgICBldmVudC5kYXRhLm1vdXNlLmRl bHRhWCA9IHdoZWVsRXZlbnQuZGVsdGFYKCk7CiAgICAgICAgICAgICBldmVudC5kYXRhLm1vdXNl LmRlbHRhWSA9IHdoZWVsRXZlbnQuZGVsdGFZKCk7CiAgICAgICAgICAgICBldmVudC5kYXRhLm1v dXNlLmRlbHRhWiA9IDA7CisgICAgICAgICAgICByZXR1cm4gTlBQX0hhbmRsZUV2ZW50KCZldmVu dCk7CisgICAgICAgIH0KKworICAgICAgICBkZWZhdWx0OgorICAgICAgICAgICAgQVNTRVJUX05P VF9SRUFDSEVEKCk7CisgICAgfQorCisgICAgcmV0dXJuIGZhbHNlOworfQorCitib29sIE5ldHNj YXBlUGx1Z2luOjpwbGF0Zm9ybUhhbmRsZU1vdXNlRW50ZXJFdmVudChjb25zdCBXZWJNb3VzZUV2 ZW50JiBtb3VzZUV2ZW50KQoreworICAgIHN3aXRjaCAobV9ldmVudE1vZGVsKSB7CisgICAgICAg IGNhc2UgTlBFdmVudE1vZGVsQ29jb2E6IHsKKyAgICAgICAgICAgIE5QQ29jb2FFdmVudCBldmVu dCA9IGluaXRpYWxpemVFdmVudChOUENvY29hRXZlbnRNb3VzZUVudGVyZWQpOwogICAgICAgICAg ICAgCisgICAgICAgICAgICBmaWxsSW5Db2NvYUV2ZW50RnJvbU1vdXNlRXZlbnQoZXZlbnQsIG1v dXNlRXZlbnQsIG1fZnJhbWVSZWN0LmxvY2F0aW9uKCkpOwogICAgICAgICAgICAgcmV0dXJuIE5Q UF9IYW5kbGVFdmVudCgmZXZlbnQpOwogICAgICAgICB9CiAKQEAgLTI1NCw1ICsyNzQsMzggQEAg Ym9vbCBOZXRzY2FwZVBsdWdpbjo6cGxhdGZvcm1IYW5kbGVXaGVlbEV2ZW50KGNvbnN0IFdlYldo ZWVsRXZlbnQmIHdoZWVsRXZlbnQpCiAKICAgICByZXR1cm4gZmFsc2U7CiB9Ci0gICAgCisgICAg ICAgIAorYm9vbCBOZXRzY2FwZVBsdWdpbjo6cGxhdGZvcm1IYW5kbGVNb3VzZUxlYXZlRXZlbnQo Y29uc3QgV2ViTW91c2VFdmVudCYgbW91c2VFdmVudCkKK3sKKyAgICBzd2l0Y2ggKG1fZXZlbnRN b2RlbCkgeworICAgICAgICBjYXNlIE5QRXZlbnRNb2RlbENvY29hOiB7CisgICAgICAgICAgICBO UENvY29hRXZlbnQgZXZlbnQgPSBpbml0aWFsaXplRXZlbnQoTlBDb2NvYUV2ZW50TW91c2VFeGl0 ZWQpOworICAgICAgICAgICAgCisgICAgICAgICAgICBmaWxsSW5Db2NvYUV2ZW50RnJvbU1vdXNl RXZlbnQoZXZlbnQsIG1vdXNlRXZlbnQsIG1fZnJhbWVSZWN0LmxvY2F0aW9uKCkpOworICAgICAg ICAgICAgcmV0dXJuIE5QUF9IYW5kbGVFdmVudCgmZXZlbnQpOworICAgICAgICB9CisKKyAgICAg ICAgZGVmYXVsdDoKKyAgICAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgIH0KKwor ICAgIHJldHVybiBmYWxzZTsKK30KKwordm9pZCBOZXRzY2FwZVBsdWdpbjo6cGxhdGZvcm1TZXRG b2N1cyhib29sIGhhc0ZvY3VzKQoreworICAgIHN3aXRjaCAobV9ldmVudE1vZGVsKSB7CisgICAg ICAgIGNhc2UgTlBFdmVudE1vZGVsQ29jb2E6IHsKKyAgICAgICAgICAgIE5QQ29jb2FFdmVudCBl dmVudCA9IGluaXRpYWxpemVFdmVudChOUENvY29hRXZlbnRGb2N1c0NoYW5nZWQpOworICAgICAg ICAgICAgCisgICAgICAgICAgICBldmVudC5kYXRhLmZvY3VzLmhhc0ZvY3VzID0gaGFzRm9jdXM7 CisgICAgICAgICAgICBOUFBfSGFuZGxlRXZlbnQoJmV2ZW50KTsKKyAgICAgICAgICAgIGJyZWFr OworICAgICAgICB9CisKKyAgICAgICAgZGVmYXVsdDoKKyAgICAgICAgICAgIEFTU0VSVF9OT1Rf UkVBQ0hFRCgpOworICAgIH0KK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CmRpZmYgLS1naXQg YS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW4uaCBiL1dlYktpdDIvV2ViUHJvY2Vz cy9QbHVnaW5zL1BsdWdpbi5oCmluZGV4IGIzYzgzNmUzYTg4OGU1ZDkzNDEzMmM1Y2I2MTA2NTM3 MWFkMzU4ZGMuLjI5MmE1MTY1NDM5N2Y3OTNhYjliMDFiMWQ0N2I1YTc5Y2M4NTkyZTYgMTAwNjQ0 Ci0tLSBhL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpbi5oCisrKyBiL1dlYktpdDIv V2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpbi5oCkBAIC05NSw2ICs5NSwxNSBAQCBwdWJsaWM6CiAg ICAgLy8gVGVsbHMgdGhlIHBsdWctaW4gdG8gaGFuZGxlIHRoZSBwYXNzZWQgaW4gd2hlZWwgZXZl bnQuIFRoZSBwbHVnLWluIHNob3VsZCByZXR1cm4gdHJ1ZSBpZiBpdCBwcm9jZXNzZWQgdGhlIGV2 ZW50LgogICAgIHZpcnR1YWwgYm9vbCBoYW5kbGVXaGVlbEV2ZW50KGNvbnN0IFdlYldoZWVsRXZl bnQmKSA9IDA7CiAKKyAgICAvLyBUZWxscyB0aGUgcGx1Zy1pbiB0byBoYW5kbGUgdGhlIHBhc3Nl ZCBpbiBtb3VzZSBvdmVyIGV2ZW50LiBUaGUgcGx1Zy1pbiBzaG91bGQgcmV0dXJuIHRydWUgaWYg aXQgcHJvY2Vzc2VkIHRoZSBldmVudC4KKyAgICB2aXJ0dWFsIGJvb2wgaGFuZGxlTW91c2VFbnRl ckV2ZW50KGNvbnN0IFdlYk1vdXNlRXZlbnQmKSA9IDA7CisgICAgCisgICAgLy8gVGVsbHMgdGhl IHBsdWctaW4gdG8gaGFuZGxlIHRoZSBwYXNzZWQgaW4gbW91c2UgbGVhdmUgZXZlbnQuIFRoZSBw bHVnLWluIHNob3VsZCByZXR1cm4gdHJ1ZSBpZiBpdCBwcm9jZXNzZWQgdGhlIGV2ZW50LgorICAg IHZpcnR1YWwgYm9vbCBoYW5kbGVNb3VzZUxlYXZlRXZlbnQoY29uc3QgV2ViTW91c2VFdmVudCYp ID0gMDsKKworICAgIC8vIFRlbGxzIHRoZSBmb2N1cyBhYm91dCBmb2N1cyBjaGFuZ2VzLgorICAg IHZpcnR1YWwgdm9pZCBzZXRGb2N1cyhib29sKSA9IDA7CisKICAgICAvLyBSZXR1cm5zIHRoZSBw bHVnLWluIGNvbnRyb2xsZXIgZm9yIHRoaXMgcGx1Zy1pbi4KICAgICAvLyBGSVhNRTogV2UgY291 bGQganVzdCBoYXZlIHRoZSBjb250cm9sbGVyIGJlIGEgbWVtYmVyIHZhcmlhYmxlIG9mIFBsdWdp bi4KICAgICB2aXJ0dWFsIFBsdWdpbkNvbnRyb2xsZXIqIGNvbnRyb2xsZXIoKSA9IDA7CmRpZmYg LS1naXQgYS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5WaWV3LmNwcCBiL1dlYktp dDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblZpZXcuY3BwCmluZGV4IGNlNWE3YTA5OGI1MDQ5 NzExOGY3NmY0YzI2NGMxOWFmNDg0OWViOTcuLjE0NDc2MzI0MzA1NjJlMTVmZjM0NjExMjVhMWZj ZTA3NWNjNGU3NDYgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdp blZpZXcuY3BwCisrKyBiL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblZpZXcuY3Bw CkBAIC0zMCw2ICszMCw3IEBACiAjaW5jbHVkZSAiV2ViUGFnZS5oIgogI2luY2x1ZGUgPFdlYkNv cmUvRG9jdW1lbnRMb2FkZXIuaD4KICNpbmNsdWRlIDxXZWJDb3JlL0V2ZW50Lmg+CisjaW5jbHVk ZSA8V2ViQ29yZS9Gb2N1c0NvbnRyb2xsZXIuaD4KICNpbmNsdWRlIDxXZWJDb3JlL0ZyYW1lTG9h ZFJlcXVlc3QuaD4KICNpbmNsdWRlIDxXZWJDb3JlL0ZyYW1lTG9hZGVyQ2xpZW50Lmg+CiAjaW5j bHVkZSA8V2ViQ29yZS9GcmFtZVZpZXcuaD4KQEAgLTMzMiwxMCArMzMzLDE5IEBAIHZvaWQgUGx1 Z2luVmlldzo6aGFuZGxlRXZlbnQoRXZlbnQqIGV2ZW50KQogICAgICAgICB8fCAoZXZlbnQtPnR5 cGUoKSA9PSBldmVudE5hbWVzKCkubW91c2Vkb3duRXZlbnQgJiYgY3VycmVudEV2ZW50LT50eXBl KCkgPT0gV2ViRXZlbnQ6Ok1vdXNlRG93bikKICAgICAgICAgfHwgKGV2ZW50LT50eXBlKCkgPT0g ZXZlbnROYW1lcygpLm1vdXNldXBFdmVudCAmJiBjdXJyZW50RXZlbnQtPnR5cGUoKSA9PSBXZWJF dmVudDo6TW91c2VVcCkpIHsKICAgICAgICAgLy8gV2UgaGF2ZSBhIG1vdXNlIGV2ZW50LgorICAg ICAgICBpZiAoY3VycmVudEV2ZW50LT50eXBlKCkgPT0gV2ViRXZlbnQ6Ok1vdXNlRG93bikKKyAg ICAgICAgICAgIGZvY3VzUGx1Z2luRWxlbWVudCgpOworCiAgICAgICAgIGRpZEhhbmRsZUV2ZW50 ID0gbV9wbHVnaW4tPmhhbmRsZU1vdXNlRXZlbnQoc3RhdGljX2Nhc3Q8Y29uc3QgV2ViTW91c2VF dmVudCY+KCpjdXJyZW50RXZlbnQpKTsKICAgICB9IGVsc2UgaWYgKGV2ZW50LT50eXBlKCkgPT0g ZXZlbnROYW1lcygpLm1vdXNld2hlZWxFdmVudCAmJiBjdXJyZW50RXZlbnQtPnR5cGUoKSA9PSBX ZWJFdmVudDo6V2hlZWwpIHsKICAgICAgICAgLy8gV2UgaGF2ZSBhIHdoZWVsIGV2ZW50LgogICAg ICAgICBkaWRIYW5kbGVFdmVudCA9IG1fcGx1Z2luLT5oYW5kbGVXaGVlbEV2ZW50KHN0YXRpY19j YXN0PGNvbnN0IFdlYldoZWVsRXZlbnQmPigqY3VycmVudEV2ZW50KSk7CisgICAgfSBlbHNlIGlm IChldmVudC0+dHlwZSgpID09IGV2ZW50TmFtZXMoKS5tb3VzZW92ZXJFdmVudCAmJiBjdXJyZW50 RXZlbnQtPnR5cGUoKSA9PSBXZWJFdmVudDo6TW91c2VNb3ZlKSB7CisgICAgICAgIC8vIFdlIGhh dmUgYSBtb3VzZSBlbnRlciBldmVudC4KKyAgICAgICAgZGlkSGFuZGxlRXZlbnQgPSBtX3BsdWdp bi0+aGFuZGxlTW91c2VFbnRlckV2ZW50KHN0YXRpY19jYXN0PGNvbnN0IFdlYk1vdXNlRXZlbnQm PigqY3VycmVudEV2ZW50KSk7CisgICAgfSBlbHNlIGlmIChldmVudC0+dHlwZSgpID09IGV2ZW50 TmFtZXMoKS5tb3VzZW91dEV2ZW50ICYmIGN1cnJlbnRFdmVudC0+dHlwZSgpID09IFdlYkV2ZW50 OjpNb3VzZU1vdmUpIHsKKyAgICAgICAgLy8gV2UgaGF2ZSBhIG1vdXNlIGxlYXZlIGV2ZW50Lgor ICAgICAgICBkaWRIYW5kbGVFdmVudCA9IG1fcGx1Z2luLT5oYW5kbGVNb3VzZUxlYXZlRXZlbnQo c3RhdGljX2Nhc3Q8Y29uc3QgV2ViTW91c2VFdmVudCY+KCpjdXJyZW50RXZlbnQpKTsKICAgICB9 CiAKICAgICBpZiAoZGlkSGFuZGxlRXZlbnQpCkBAIC0zNjksNiArMzc5LDE1IEBAIEludFJlY3Qg UGx1Z2luVmlldzo6Y2xpcFJlY3RJbldpbmRvd0Nvb3JkaW5hdGVzKCkgY29uc3QKICAgICByZXR1 cm4gaW50ZXJzZWN0aW9uKGZyYW1lUmVjdEluV2luZG93Q29vcmRpbmF0ZXMsIHdpbmRvd0NsaXBS ZWN0KTsKIH0KIAordm9pZCBQbHVnaW5WaWV3Ojpmb2N1c1BsdWdpbkVsZW1lbnQoKQoreworICAg IEFTU0VSVChmcmFtZSgpKTsKKyAgICAKKyAgICBpZiAoUGFnZSogcGFnZSA9IGZyYW1lKCktPnBh Z2UoKSkKKyAgICAgICAgcGFnZS0+Zm9jdXNDb250cm9sbGVyKCktPnNldEZvY3VzZWRGcmFtZShm cmFtZSgpKTsKKyAgICBmcmFtZSgpLT5kb2N1bWVudCgpLT5zZXRGb2N1c2VkTm9kZShtX3BsdWdp bkVsZW1lbnQpOworfQorCiB2b2lkIFBsdWdpblZpZXc6OnBlbmRpbmdVUkxSZXF1ZXN0c1RpbWVy RmlyZWQoKQogewogICAgIEFTU0VSVCghbV9wZW5kaW5nVVJMUmVxdWVzdHMuaXNFbXB0eSgpKTsK QEAgLTUyMyw2ICs1NDIsMTMgQEAgdm9pZCBQbHVnaW5WaWV3OjppbnZhbGlkYXRlUmVjdChjb25z dCBJbnRSZWN0JiBkaXJ0eVJlY3QpCiAgICAgcGFyZW50KCktPmhvc3RXaW5kb3coKS0+aW52YWxp ZGF0ZUNvbnRlbnRzQW5kV2luZG93KGludGVyc2VjdGlvbihkaXJ0eVJlY3RJbldpbmRvd0Nvb3Jk aW5hdGVzLCBjbGlwUmVjdEluV2luZG93Q29vcmRpbmF0ZXMoKSksIGZhbHNlKTsKIH0KIAordm9p ZCBQbHVnaW5WaWV3OjpzZXRGb2N1cyhib29sIGhhc0ZvY3VzKQoreworICAgIFdpZGdldDo6c2V0 Rm9jdXMoaGFzRm9jdXMpOworICAgIAorICAgIG1fcGx1Z2luLT5zZXRGb2N1cyhoYXNGb2N1cyk7 Cit9CisKIHZvaWQgUGx1Z2luVmlldzo6bWVkaWFDYW5TdGFydCgpCiB7CiAgICAgQVNTRVJUKG1f aXNXYWl0aW5nVW50aWxNZWRpYUNhblN0YXJ0KTsKZGlmZiAtLWdpdCBhL1dlYktpdDIvV2ViUHJv Y2Vzcy9QbHVnaW5zL1BsdWdpblZpZXcuaCBiL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1Bs dWdpblZpZXcuaAppbmRleCA1OTY3MjcxNGIwOTNhZDQ0NTViMmQ4MmExZDRiNzE3OWM5ODkwNjFk Li5kYzZiNzEzODhhZjVkZDdiNjlkZGJiZjdmYzg3NDVmYjVhMGRjMTZmIDEwMDY0NAotLS0gYS9X ZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5WaWV3LmgKKysrIGIvV2ViS2l0Mi9XZWJQ cm9jZXNzL1BsdWdpbnMvUGx1Z2luVmlldy5oCkBAIC02Myw3ICs2Myw4IEBAIHByaXZhdGU6CiAK ICAgICB2b2lkIHZpZXdHZW9tZXRyeURpZENoYW5nZSgpOwogICAgIFdlYkNvcmU6OkludFJlY3Qg Y2xpcFJlY3RJbldpbmRvd0Nvb3JkaW5hdGVzKCkgY29uc3Q7Ci0KKyAgICB2b2lkIGZvY3VzUGx1 Z2luRWxlbWVudCgpOworICAgIAogICAgIHZvaWQgcGVuZGluZ1VSTFJlcXVlc3RzVGltZXJGaXJl ZCgpOwogICAgIGNsYXNzIFVSTFJlcXVlc3Q7CiAgICAgdm9pZCBwZXJmb3JtVVJMUmVxdWVzdChV UkxSZXF1ZXN0Kik7CkBAIC04Myw2ICs4NCw3IEBAIHByaXZhdGU6CiAgICAgdmlydHVhbCB2b2lk IHNldEZyYW1lUmVjdChjb25zdCBXZWJDb3JlOjpJbnRSZWN0Jik7CiAgICAgdmlydHVhbCB2b2lk IHBhaW50KFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dCosIGNvbnN0IFdlYkNvcmU6OkludFJlY3Qm KTsKICAgICB2aXJ0dWFsIHZvaWQgaW52YWxpZGF0ZVJlY3QoY29uc3QgV2ViQ29yZTo6SW50UmVj dCYpOworICAgIHZpcnR1YWwgdm9pZCBzZXRGb2N1cyhib29sKTsKICAgICB2aXJ0dWFsIHZvaWQg ZnJhbWVSZWN0c0NoYW5nZWQoKTsKICAgICB2aXJ0dWFsIHZvaWQgc2V0UGFyZW50KFdlYkNvcmU6 OlNjcm9sbFZpZXcqKTsKICAgICB2aXJ0dWFsIHZvaWQgaGFuZGxlRXZlbnQoV2ViQ29yZTo6RXZl bnQqKTsK