205897 2020-01-07 17:43:50 -0800 Remove NATIVE_MOUSE_EVENT_HANDLER macros 2020-01-08 11:59:15 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser commit-queue simon.fraser thorton webkit-bug-importer oldest_to_newest 1603890 0 simon.fraser 2020-01-07 17:43:50 -0800 Remove NATIVE_MOUSE_EVENT_HANDLER macros 1603893 1 387055 simon.fraser 2020-01-07 17:46:17 -0800 Created attachment 387055 Patch 1603934 2 387066 simon.fraser 2020-01-07 21:05:54 -0800 Created attachment 387066 Patch 1604208 3 commit-queue 2020-01-08 11:57:24 -0800 The commit-queue encountered the following flaky tests while processing attachment 387066: imported/w3c/web-platform-tests/IndexedDB/interleaved-cursors-large.html bug 201849 The commit-queue is continuing to process your patch. 1604210 4 387066 commit-queue 2020-01-08 11:58:12 -0800 Comment on attachment 387066 Patch Clearing flags on attachment: 387066 Committed r254213: <https://trac.webkit.org/changeset/254213> 1604211 5 commit-queue 2020-01-08 11:58:14 -0800 All reviewed patches have been landed. Closing bug. 1604212 6 webkit-bug-importer 2020-01-08 11:59:15 -0800 <rdar://problem/58416681> 387055 2020-01-07 17:46:17 -0800 2020-01-07 21:05:52 -0800 Patch macros.patch text/plain 9606 simon.fraser ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggMWM1MWNhMTM1OTM0M2IwMmEzZGEyMjI0MzYwMTM4ZmMzYmEzYjUyZC4uNjhm N2FlNjE4ZWU4ZGYyMzNjY2M0NTkwNjczNzg0MzMzMDNmZTZiNiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwzMiBAQAorMjAyMC0wMS0wNyAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNv bT4KKworICAgICAgICBSZW1vdmUgTkFUSVZFX01PVVNFX0VWRU5UX0hBTkRMRVIgbWFjcm9zCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDU4OTcKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW1vdmUgdGhl IE5BVElWRV9NT1VTRV9FVkVOVF9IQU5ETEVSIGFuZCBOQVRJVkVfTU9VU0VfRVZFTlRfSEFORExF Ul9JTlRFUk5BTCB3aGljaCBhcmUgYWxtb3N0IGlkZW50aWNhbCwKKyAgICAgICAgY2FsbGluZyBh IGNvdXBsZSBvZiBzaGFyZWQgZnVuY3Rpb25zIGluc3RlYWQuIFRoZSBvbmx5IHJlYXNvbiB0aGUg ZXZlbnROYW1lIHdhcyB1c2VkIHdhcyBmb3IgbG9nZ2luZywgc28ganVzdAorICAgICAgICBsb2cg dGhlIC1bTlNFdmVudCB0eXBlXSBpbnN0ZWFkLgorCisgICAgICAgICogVUlQcm9jZXNzL0NvY29h L1dlYlZpZXdJbXBsLmg6CisgICAgICAgICogVUlQcm9jZXNzL0NvY29hL1dlYlZpZXdJbXBsLm1t OgorICAgICAgICAoV2ViS2l0OjpvcGVyYXRvcjw8KToKKyAgICAgICAgKFdlYktpdDo6V2ViVmll d0ltcGw6Om5hdGl2ZU1vdXNlRXZlbnRIYW5kbGVyKToKKyAgICAgICAgKFdlYktpdDo6V2ViVmll d0ltcGw6Om5hdGl2ZU1vdXNlRXZlbnRIYW5kbGVySW50ZXJuYWwpOgorICAgICAgICAoV2ViS2l0 OjpXZWJWaWV3SW1wbDo6bW91c2VFbnRlcmVkKToKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0lt cGw6Om1vdXNlRXhpdGVkKToKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6Om90aGVyTW91 c2VEb3duKToKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6Om90aGVyTW91c2VEcmFnZ2Vk KToKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6Om90aGVyTW91c2VVcCk6CisgICAgICAg IChXZWJLaXQ6OldlYlZpZXdJbXBsOjpyaWdodE1vdXNlRG93bik6CisgICAgICAgIChXZWJLaXQ6 OldlYlZpZXdJbXBsOjpyaWdodE1vdXNlRHJhZ2dlZCk6CisgICAgICAgIChXZWJLaXQ6OldlYlZp ZXdJbXBsOjpyaWdodE1vdXNlVXApOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6bW91 c2VNb3ZlZEludGVybmFsKToKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6Om1vdXNlRG93 bkludGVybmFsKToKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6Om1vdXNlVXBJbnRlcm5h bCk6CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXdJbXBsOjptb3VzZURyYWdnZWRJbnRlcm5hbCk6 CisKIDIwMjAtMDEtMDcgIERhbmllbCBCYXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29tPgogCiAgICAg ICAgIEZpcnN0IGNoYXJhY3RlciBpbiBlYWNoIHdvcmQtd3JhcHBlZCBsaW5lIGhhcyBpbmNvcnJl Y3QgY2hhcmFjdGVyIHJlY3Qgd2hlbiByZXF1ZXN0ZWQgcmFuZ2Ugc3BhbnMgbXVsdGlwbGUgbGlu ZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlZpZXdJbXBs LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9XZWJWaWV3SW1wbC5oCmluZGV4IDRi OWRlOWM2YWZiNDNjODdmNzUxOGI4MTVlODEyYjllYmIwMTVkN2EuLjVjNTAxNjM5MDJjN2IxNzc1 OTM0NWRjMDRiYzRjNjkzM2ExYmJiMTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL0NvY29hL1dlYlZpZXdJbXBsLmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29j b2EvV2ViVmlld0ltcGwuaApAQCAtNjY4LDYgKzY2OCw5IEBAIHByaXZhdGU6CiAgICAgVmVjdG9y PFdlYkNvcmU6OktleXByZXNzQ29tbWFuZD4gY29sbGVjdEtleWJvYXJkTGF5b3V0Q29tbWFuZHNG b3JFdmVudChOU0V2ZW50ICopOwogICAgIHZvaWQgaW50ZXJwcmV0S2V5RXZlbnQoTlNFdmVudCAq LCB2b2lkKF5jb21wbGV0aW9uSGFuZGxlcikoQk9PTCBoYW5kbGVkLCBjb25zdCBWZWN0b3I8V2Vi Q29yZTo6S2V5cHJlc3NDb21tYW5kPiYpKTsKIAorICAgIHZvaWQgbmF0aXZlTW91c2VFdmVudEhh bmRsZXIoTlNFdmVudCAqKTsKKyAgICB2b2lkIG5hdGl2ZU1vdXNlRXZlbnRIYW5kbGVySW50ZXJu YWwoTlNFdmVudCAqKTsKKyAgICAKICAgICB2b2lkIG1vdXNlTW92ZWRJbnRlcm5hbChOU0V2ZW50 ICopOwogICAgIHZvaWQgbW91c2VEb3duSW50ZXJuYWwoTlNFdmVudCAqKTsKICAgICB2b2lkIG1v dXNlVXBJbnRlcm5hbChOU0V2ZW50ICopOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvQ29jb2EvV2ViVmlld0ltcGwubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2Nv YS9XZWJWaWV3SW1wbC5tbQppbmRleCBhMDAxNjlkMmIwMjUwNmZmOTIxNjc5NWY4MjIzOTY5M2Q1 YTFiZTQyLi44OTE2MzMwYWUyZWI2NGUzMmI2ZDdmOGM3NTA5NTQ4ZmM1NjljMzEzIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9XZWJWaWV3SW1wbC5tbQorKysgYi9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9XZWJWaWV3SW1wbC5tbQpAQCAtNTIzOCw2OSAr NTIzOCwxMjIgQEAgdm9pZCBXZWJWaWV3SW1wbDo6ZmxhZ3NDaGFuZ2VkKE5TRXZlbnQgKmV2ZW50 KQogICAgIH0pOwogfQogCi0jZGVmaW5lIE5BVElWRV9NT1VTRV9FVkVOVF9IQU5ETEVSKEV2ZW50 TmFtZSkgXAotICAgIHZvaWQgV2ViVmlld0ltcGw6OkV2ZW50TmFtZShOU0V2ZW50ICpldmVudCkg XAotICAgIHsgXAotICAgICAgICBpZiAobV9pZ25vcmVzTm9uV2hlZWxFdmVudHMpIFwKLSAgICAg ICAgICAgIHJldHVybjsgXAotICAgICAgICBpZiAoTlNUZXh0SW5wdXRDb250ZXh0ICpjb250ZXh0 ID0gW21fdmlldyBpbnB1dENvbnRleHRdKSB7IFwKLSAgICAgICAgICAgIGF1dG8gd2Vha1RoaXMg PSBtYWtlV2Vha1B0cigqdGhpcyk7IFwKLSAgICAgICAgICAgIFJldGFpblB0cjxOU0V2ZW50PiBy ZXRhaW5lZEV2ZW50ID0gZXZlbnQ7IFwKLSAgICAgICAgICAgIFtjb250ZXh0IGhhbmRsZUV2ZW50 OmV2ZW50IGNvbXBsZXRpb25IYW5kbGVyOlt3ZWFrVGhpcywgcmV0YWluZWRFdmVudF0gKEJPT0wg aGFuZGxlZCkgeyBcCi0gICAgICAgICAgICAgICAgaWYgKCF3ZWFrVGhpcykgXAotICAgICAgICAg ICAgICAgICAgICByZXR1cm47IFwKLSAgICAgICAgICAgICAgICBpZiAoaGFuZGxlZCkgXAotICAg ICAgICAgICAgICAgICAgICBMT0coVGV4dElucHV0LCAiJXMgd2FzIGhhbmRsZWQgYnkgdGV4dCBp bnB1dCBjb250ZXh0IiwgU3RyaW5nKCNFdmVudE5hbWUpLnN1YnN0cmluZygwLCBTdHJpbmcoI0V2 ZW50TmFtZSkuZmluZCgiSW50ZXJuYWwiKSkuYXNjaWkoKS5kYXRhKCkpOyBcCi0gICAgICAgICAg ICAgICAgZWxzZSB7IFwKLSAgICAgICAgICAgICAgICAgICAgTmF0aXZlV2ViTW91c2VFdmVudCB3 ZWJFdmVudChyZXRhaW5lZEV2ZW50LmdldCgpLCB3ZWFrVGhpcy0+bV9sYXN0UHJlc3N1cmVFdmVu dC5nZXQoKSwgd2Vha1RoaXMtPm1fdmlldy5nZXRBdXRvcmVsZWFzZWQoKSk7IFwKLSAgICAgICAg ICAgICAgICAgICAgd2Vha1RoaXMtPm1fcGFnZS0+aGFuZGxlTW91c2VFdmVudCh3ZWJFdmVudCk7 IFwKLSAgICAgICAgICAgICAgICB9IFwKLSAgICAgICAgICAgIH1dOyBcCi0gICAgICAgICAgICBy ZXR1cm47IFwKLSAgICAgICAgfSBcCi0gICAgICAgIE5hdGl2ZVdlYk1vdXNlRXZlbnQgd2ViRXZl bnQoZXZlbnQsIG1fbGFzdFByZXNzdXJlRXZlbnQuZ2V0KCksIG1fdmlldy5nZXRBdXRvcmVsZWFz ZWQoKSk7IFwKLSAgICAgICAgbV9wYWdlLT5oYW5kbGVNb3VzZUV2ZW50KHdlYkV2ZW50KTsgXAor c3RhdGljIFRleHRTdHJlYW0mIG9wZXJhdG9yPDwoVGV4dFN0cmVhbSYgdHMsIE5TRXZlbnRUeXBl IGV2ZW50VHlwZSkKK3sKKyAgICBzd2l0Y2ggKGV2ZW50VHlwZSkgeworICAgIGNhc2UgTlNFdmVu dFR5cGVMZWZ0TW91c2VEb3duOiB0cyA8PCAiTlNFdmVudFR5cGVMZWZ0TW91c2VEb3duIjsgYnJl YWs7CisgICAgY2FzZSBOU0V2ZW50VHlwZUxlZnRNb3VzZVVwOiB0cyA8PCAiTlNFdmVudFR5cGVM ZWZ0TW91c2VVcCI7IGJyZWFrOworICAgIGNhc2UgTlNFdmVudFR5cGVSaWdodE1vdXNlRG93bjog dHMgPDwgIk5TRXZlbnRUeXBlUmlnaHRNb3VzZURvd24iOyBicmVhazsKKyAgICBjYXNlIE5TRXZl bnRUeXBlUmlnaHRNb3VzZVVwOiB0cyA8PCAiTlNFdmVudFR5cGVSaWdodE1vdXNlVXAiOyBicmVh azsKKyAgICBjYXNlIE5TRXZlbnRUeXBlTW91c2VNb3ZlZDogdHMgPDwgIk5TRXZlbnRUeXBlTW91 c2VNb3ZlZCI7IGJyZWFrOworICAgIGNhc2UgTlNFdmVudFR5cGVMZWZ0TW91c2VEcmFnZ2VkOiB0 cyA8PCAiTlNFdmVudFR5cGVMZWZ0TW91c2VEcmFnZ2VkIjsgYnJlYWs7CisgICAgY2FzZSBOU0V2 ZW50VHlwZVJpZ2h0TW91c2VEcmFnZ2VkOiB0cyA8PCAiTlNFdmVudFR5cGVSaWdodE1vdXNlRHJh Z2dlZCI7IGJyZWFrOworICAgIGNhc2UgTlNFdmVudFR5cGVNb3VzZUVudGVyZWQ6IHRzIDw8ICJO U0V2ZW50VHlwZU1vdXNlRW50ZXJlZCI7IGJyZWFrOworICAgIGNhc2UgTlNFdmVudFR5cGVNb3Vz ZUV4aXRlZDogdHMgPDwgIk5TRXZlbnRUeXBlTW91c2VFeGl0ZWQiOyBicmVhazsKKyAgICBjYXNl IE5TRXZlbnRUeXBlS2V5RG93bjogdHMgPDwgIk5TRXZlbnRUeXBlS2V5RG93biI7IGJyZWFrOwor ICAgIGNhc2UgTlNFdmVudFR5cGVLZXlVcDogdHMgPDwgIk5TRXZlbnRUeXBlS2V5VXAiOyBicmVh azsKKyAgICBjYXNlIE5TRXZlbnRUeXBlU2Nyb2xsV2hlZWw6IHRzIDw8ICJOU0V2ZW50VHlwZVNj cm9sbFdoZWVsIjsgYnJlYWs7CisgICAgY2FzZSBOU0V2ZW50VHlwZU90aGVyTW91c2VEb3duOiB0 cyA8PCAiTlNFdmVudFR5cGVPdGhlck1vdXNlRG93biI7IGJyZWFrOworICAgIGNhc2UgTlNFdmVu dFR5cGVPdGhlck1vdXNlVXA6IHRzIDw8ICJOU0V2ZW50VHlwZU90aGVyTW91c2VVcCI7IGJyZWFr OworICAgIGNhc2UgTlNFdmVudFR5cGVPdGhlck1vdXNlRHJhZ2dlZDogdHMgPDwgIk5TRXZlbnRU eXBlT3RoZXJNb3VzZURyYWdnZWQiOyBicmVhazsKKyAgICBkZWZhdWx0OgorICAgICAgICB0cyA8 PCAiT3RoZXIiOwogICAgIH0KLSNkZWZpbmUgTkFUSVZFX01PVVNFX0VWRU5UX0hBTkRMRVJfSU5U RVJOQUwoRXZlbnROYW1lKSBcCi0gICAgdm9pZCBXZWJWaWV3SW1wbDo6RXZlbnROYW1lKE5TRXZl bnQgKmV2ZW50KSBcCi0gICAgeyBcCi0gICAgICAgIGlmIChtX2lnbm9yZXNOb25XaGVlbEV2ZW50 cyB8fCBtX3NhZmVCcm93c2luZ1dhcm5pbmcpIFwKLSAgICAgICAgICAgIHJldHVybjsgXAotICAg ICAgICBpZiAoTlNUZXh0SW5wdXRDb250ZXh0ICpjb250ZXh0ID0gW21fdmlldyBpbnB1dENvbnRl eHRdKSB7IFwKLSAgICAgICAgICAgIGF1dG8gd2Vha1RoaXMgPSBtYWtlV2Vha1B0cigqdGhpcyk7 IFwKLSAgICAgICAgICAgIFJldGFpblB0cjxOU0V2ZW50PiByZXRhaW5lZEV2ZW50ID0gZXZlbnQ7 IFwKLSAgICAgICAgICAgIFtjb250ZXh0IGhhbmRsZUV2ZW50OmV2ZW50IGNvbXBsZXRpb25IYW5k bGVyOlt3ZWFrVGhpcywgcmV0YWluZWRFdmVudF0gKEJPT0wgaGFuZGxlZCkgeyBcCi0gICAgICAg ICAgICAgICAgaWYgKCF3ZWFrVGhpcykgXAotICAgICAgICAgICAgICAgICAgICByZXR1cm47IFwK LSAgICAgICAgICAgICAgICBpZiAoaGFuZGxlZCkgXAotICAgICAgICAgICAgICAgICAgICBMT0co VGV4dElucHV0LCAiJXMgd2FzIGhhbmRsZWQgYnkgdGV4dCBpbnB1dCBjb250ZXh0IiwgU3RyaW5n KCNFdmVudE5hbWUpLnN1YnN0cmluZygwLCBTdHJpbmcoI0V2ZW50TmFtZSkuZmluZCgiSW50ZXJu YWwiKSkuYXNjaWkoKS5kYXRhKCkpOyBcCi0gICAgICAgICAgICAgICAgZWxzZSB7IFwKLSAgICAg ICAgICAgICAgICAgICAgTmF0aXZlV2ViTW91c2VFdmVudCB3ZWJFdmVudChyZXRhaW5lZEV2ZW50 LmdldCgpLCB3ZWFrVGhpcy0+bV9sYXN0UHJlc3N1cmVFdmVudC5nZXQoKSwgd2Vha1RoaXMtPm1f dmlldy5nZXRBdXRvcmVsZWFzZWQoKSk7IFwKLSAgICAgICAgICAgICAgICAgICAgd2Vha1RoaXMt Pm1fcGFnZS0+aGFuZGxlTW91c2VFdmVudCh3ZWJFdmVudCk7IFwKLSAgICAgICAgICAgICAgICB9 IFwKLSAgICAgICAgICAgIH1dOyBcCi0gICAgICAgICAgICByZXR1cm47IFwKLSAgICAgICAgfSBc Ci0gICAgICAgIE5hdGl2ZVdlYk1vdXNlRXZlbnQgd2ViRXZlbnQoZXZlbnQsIG1fbGFzdFByZXNz dXJlRXZlbnQuZ2V0KCksIG1fdmlldy5nZXRBdXRvcmVsZWFzZWQoKSk7IFwKLSAgICAgICAgbV9w YWdlLT5oYW5kbGVNb3VzZUV2ZW50KHdlYkV2ZW50KTsgXAorCisgICAgcmV0dXJuIHRzOworfQor Cit2b2lkIFdlYlZpZXdJbXBsOjpuYXRpdmVNb3VzZUV2ZW50SGFuZGxlcihOU0V2ZW50ICpldmVu dCkKK3sKKyAgICBpZiAobV9pZ25vcmVzTm9uV2hlZWxFdmVudHMpCisgICAgICAgIHJldHVybjsK KworICAgIGlmIChOU1RleHRJbnB1dENvbnRleHQgKmNvbnRleHQgPSBbbV92aWV3IGlucHV0Q29u dGV4dF0pIHsKKyAgICAgICAgYXV0byB3ZWFrVGhpcyA9IG1ha2VXZWFrUHRyKCp0aGlzKTsKKyAg ICAgICAgUmV0YWluUHRyPE5TRXZlbnQ+IHJldGFpbmVkRXZlbnQgPSBldmVudDsKKyAgICAgICAg W2NvbnRleHQgaGFuZGxlRXZlbnQ6ZXZlbnQgY29tcGxldGlvbkhhbmRsZXI6W3dlYWtUaGlzLCBy ZXRhaW5lZEV2ZW50XSAoQk9PTCBoYW5kbGVkKSB7CisgICAgICAgICAgICBpZiAoIXdlYWtUaGlz KQorICAgICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICAgIGlmIChoYW5kbGVkKQorICAg ICAgICAgICAgICAgIExPR19XSVRIX1NUUkVBTShUZXh0SW5wdXQsIHN0cmVhbSA8PCAiRXZlbnQg IiA8PCBbcmV0YWluZWRFdmVudCB0eXBlXSA8PCAiIHdhcyBoYW5kbGVkIGJ5IHRleHQgaW5wdXQg Y29udGV4dCIpOworICAgICAgICAgICAgZWxzZSB7CisgICAgICAgICAgICAgICAgTmF0aXZlV2Vi TW91c2VFdmVudCB3ZWJFdmVudChyZXRhaW5lZEV2ZW50LmdldCgpLCB3ZWFrVGhpcy0+bV9sYXN0 UHJlc3N1cmVFdmVudC5nZXQoKSwgd2Vha1RoaXMtPm1fdmlldy5nZXRBdXRvcmVsZWFzZWQoKSk7 CisgICAgICAgICAgICAgICAgd2Vha1RoaXMtPm1fcGFnZS0+aGFuZGxlTW91c2VFdmVudCh3ZWJF dmVudCk7CisgICAgICAgICAgICB9CisgICAgICAgIH1dOworICAgICAgICByZXR1cm47CiAgICAg fQorICAgIE5hdGl2ZVdlYk1vdXNlRXZlbnQgd2ViRXZlbnQoZXZlbnQsIG1fbGFzdFByZXNzdXJl RXZlbnQuZ2V0KCksIG1fdmlldy5nZXRBdXRvcmVsZWFzZWQoKSk7CisgICAgbV9wYWdlLT5oYW5k bGVNb3VzZUV2ZW50KHdlYkV2ZW50KTsKK30KKwordm9pZCBXZWJWaWV3SW1wbDo6bmF0aXZlTW91 c2VFdmVudEhhbmRsZXJJbnRlcm5hbChOU0V2ZW50ICpldmVudCkKK3sKKyAgICBpZiAobV9zYWZl QnJvd3NpbmdXYXJuaW5nKQorICAgICAgICByZXR1cm47CisKKyAgICBuYXRpdmVNb3VzZUV2ZW50 SGFuZGxlcihldmVudCk7Cit9CiAKLU5BVElWRV9NT1VTRV9FVkVOVF9IQU5ETEVSKG1vdXNlRW50 ZXJlZCkKLU5BVElWRV9NT1VTRV9FVkVOVF9IQU5ETEVSKG1vdXNlRXhpdGVkKQotTkFUSVZFX01P VVNFX0VWRU5UX0hBTkRMRVIob3RoZXJNb3VzZURvd24pCi1OQVRJVkVfTU9VU0VfRVZFTlRfSEFO RExFUihvdGhlck1vdXNlRHJhZ2dlZCkKLU5BVElWRV9NT1VTRV9FVkVOVF9IQU5ETEVSKG90aGVy TW91c2VVcCkKLU5BVElWRV9NT1VTRV9FVkVOVF9IQU5ETEVSKHJpZ2h0TW91c2VEb3duKQotTkFU SVZFX01PVVNFX0VWRU5UX0hBTkRMRVIocmlnaHRNb3VzZURyYWdnZWQpCi1OQVRJVkVfTU9VU0Vf RVZFTlRfSEFORExFUihyaWdodE1vdXNlVXApCi0KLU5BVElWRV9NT1VTRV9FVkVOVF9IQU5ETEVS X0lOVEVSTkFMKG1vdXNlTW92ZWRJbnRlcm5hbCkKLU5BVElWRV9NT1VTRV9FVkVOVF9IQU5ETEVS X0lOVEVSTkFMKG1vdXNlRG93bkludGVybmFsKQotTkFUSVZFX01PVVNFX0VWRU5UX0hBTkRMRVJf SU5URVJOQUwobW91c2VVcEludGVybmFsKQotTkFUSVZFX01PVVNFX0VWRU5UX0hBTkRMRVJfSU5U RVJOQUwobW91c2VEcmFnZ2VkSW50ZXJuYWwpCi0KLSN1bmRlZiBOQVRJVkVfTU9VU0VfRVZFTlRf SEFORExFUgotI3VuZGVmIE5BVElWRV9NT1VTRV9FVkVOVF9IQU5ETEVSX0lOVEVSTkFMCit2b2lk IFdlYlZpZXdJbXBsOjptb3VzZUVudGVyZWQoTlNFdmVudCAqZXZlbnQpCit7CisgICAgbmF0aXZl TW91c2VFdmVudEhhbmRsZXIoZXZlbnQpOworfQorCit2b2lkIFdlYlZpZXdJbXBsOjptb3VzZUV4 aXRlZChOU0V2ZW50ICpldmVudCkKK3sKKyAgICBuYXRpdmVNb3VzZUV2ZW50SGFuZGxlcihldmVu dCk7Cit9CisKK3ZvaWQgV2ViVmlld0ltcGw6Om90aGVyTW91c2VEb3duKE5TRXZlbnQgKmV2ZW50 KQoreworICAgIG5hdGl2ZU1vdXNlRXZlbnRIYW5kbGVyKGV2ZW50KTsKK30KKwordm9pZCBXZWJW aWV3SW1wbDo6b3RoZXJNb3VzZURyYWdnZWQoTlNFdmVudCAqZXZlbnQpCit7CisgICAgbmF0aXZl TW91c2VFdmVudEhhbmRsZXIoZXZlbnQpOworfQorCit2b2lkIFdlYlZpZXdJbXBsOjpvdGhlck1v dXNlVXAoTlNFdmVudCAqZXZlbnQpCit7CisgICAgbmF0aXZlTW91c2VFdmVudEhhbmRsZXIoZXZl bnQpOworfQorCit2b2lkIFdlYlZpZXdJbXBsOjpyaWdodE1vdXNlRG93bihOU0V2ZW50ICpldmVu dCkKK3sKKyAgICBuYXRpdmVNb3VzZUV2ZW50SGFuZGxlcihldmVudCk7Cit9CisKK3ZvaWQgV2Vi Vmlld0ltcGw6OnJpZ2h0TW91c2VEcmFnZ2VkKE5TRXZlbnQgKmV2ZW50KQoreworICAgIG5hdGl2 ZU1vdXNlRXZlbnRIYW5kbGVyKGV2ZW50KTsKK30KKwordm9pZCBXZWJWaWV3SW1wbDo6cmlnaHRN b3VzZVVwKE5TRXZlbnQgKmV2ZW50KQoreworICAgIG5hdGl2ZU1vdXNlRXZlbnRIYW5kbGVyKGV2 ZW50KTsKK30KKwordm9pZCBXZWJWaWV3SW1wbDo6bW91c2VNb3ZlZEludGVybmFsKE5TRXZlbnQg KmV2ZW50KQoreworICAgIG5hdGl2ZU1vdXNlRXZlbnRIYW5kbGVySW50ZXJuYWwoZXZlbnQpOwor fQorCit2b2lkIFdlYlZpZXdJbXBsOjptb3VzZURvd25JbnRlcm5hbChOU0V2ZW50ICpldmVudCkK K3sKKyAgICBuYXRpdmVNb3VzZUV2ZW50SGFuZGxlckludGVybmFsKGV2ZW50KTsKK30KKwordm9p ZCBXZWJWaWV3SW1wbDo6bW91c2VVcEludGVybmFsKE5TRXZlbnQgKmV2ZW50KQoreworICAgIG5h dGl2ZU1vdXNlRXZlbnRIYW5kbGVySW50ZXJuYWwoZXZlbnQpOworfQorCit2b2lkIFdlYlZpZXdJ bXBsOjptb3VzZURyYWdnZWRJbnRlcm5hbChOU0V2ZW50ICpldmVudCkKK3sKKyAgICBuYXRpdmVN b3VzZUV2ZW50SGFuZGxlckludGVybmFsKGV2ZW50KTsKK30KIAogdm9pZCBXZWJWaWV3SW1wbDo6 bW91c2VNb3ZlZChOU0V2ZW50ICpldmVudCkKIHsK 387066 2020-01-07 21:05:54 -0800 2020-01-08 11:58:12 -0800 Patch bug-205897-20200107210553.patch text/plain 9620 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjU0MDU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDk5YzM3MjcwMWZjMzMzMDQz NDQxOWE2ZGE1YjM2NmIxODdhN2Y3ZTcuLjdiNDllMjc2YjgyNzEzZGI0MWUzOGQ1ZDJhYzU4ZTRm OTdlMjMwOWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzIgQEAKKzIwMjAtMDEtMDcgIFNpbW9uIEZy YXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAgUmVtb3ZlIE5BVElWRV9N T1VTRV9FVkVOVF9IQU5ETEVSIG1hY3JvcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjA1ODk3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgUmVtb3ZlIHRoZSBOQVRJVkVfTU9VU0VfRVZFTlRfSEFORExFUiBh bmQgTkFUSVZFX01PVVNFX0VWRU5UX0hBTkRMRVJfSU5URVJOQUwgd2hpY2ggYXJlIGFsbW9zdCBp ZGVudGljYWwsCisgICAgICAgIGNhbGxpbmcgYSBjb3VwbGUgb2Ygc2hhcmVkIGZ1bmN0aW9ucyBp bnN0ZWFkLiBUaGUgb25seSByZWFzb24gdGhlIGV2ZW50TmFtZSB3YXMgdXNlZCB3YXMgZm9yIGxv Z2dpbmcsIHNvIGp1c3QKKyAgICAgICAgbG9nIHRoZSAtW05TRXZlbnQgdHlwZV0gaW5zdGVhZC4K KworICAgICAgICAqIFVJUHJvY2Vzcy9Db2NvYS9XZWJWaWV3SW1wbC5oOgorICAgICAgICAqIFVJ UHJvY2Vzcy9Db2NvYS9XZWJWaWV3SW1wbC5tbToKKyAgICAgICAgKFdlYktpdDo6b3BlcmF0b3I8 PCk6CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXdJbXBsOjpuYXRpdmVNb3VzZUV2ZW50SGFuZGxl cik6CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXdJbXBsOjpuYXRpdmVNb3VzZUV2ZW50SGFuZGxl ckludGVybmFsKToKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6Om1vdXNlRW50ZXJlZCk6 CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXdJbXBsOjptb3VzZUV4aXRlZCk6CisgICAgICAgIChX ZWJLaXQ6OldlYlZpZXdJbXBsOjpvdGhlck1vdXNlRG93bik6CisgICAgICAgIChXZWJLaXQ6Oldl YlZpZXdJbXBsOjpvdGhlck1vdXNlRHJhZ2dlZCk6CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXdJ bXBsOjpvdGhlck1vdXNlVXApOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6cmlnaHRN b3VzZURvd24pOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6cmlnaHRNb3VzZURyYWdn ZWQpOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6cmlnaHRNb3VzZVVwKToKKyAgICAg ICAgKFdlYktpdDo6V2ViVmlld0ltcGw6Om1vdXNlTW92ZWRJbnRlcm5hbCk6CisgICAgICAgIChX ZWJLaXQ6OldlYlZpZXdJbXBsOjptb3VzZURvd25JbnRlcm5hbCk6CisgICAgICAgIChXZWJLaXQ6 OldlYlZpZXdJbXBsOjptb3VzZVVwSW50ZXJuYWwpOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3 SW1wbDo6bW91c2VEcmFnZ2VkSW50ZXJuYWwpOgorCiAyMDIwLTAxLTA2ICBQZXIgQXJuZSBWb2xs YW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbaU9TXSBJc3N1ZSBtYWNoIGxvb2t1 cCBleHRlbnNpb24gdG8gbGF1bmNoIHNlcnZpY2VzIGRhZW1vbiBmb3IgTWFpbApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2ViVmlld0ltcGwuaCBiL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlZpZXdJbXBsLmgKaW5kZXggMGE0ZWU4M2YxNGQ0ZjYz OWMzZTAzZDNlN2ZiNmM2OWQ0YTRkODY1Yy4uYzQ2NGQ3NWRlZTZlYjBkYTU0NzNlOTg5NjU2MDYz YmQwMjQzNDdkZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2Vi Vmlld0ltcGwuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9XZWJWaWV3SW1w bC5oCkBAIC02NjQsNiArNjY0LDkgQEAgcHJpdmF0ZToKICAgICBWZWN0b3I8V2ViQ29yZTo6S2V5 cHJlc3NDb21tYW5kPiBjb2xsZWN0S2V5Ym9hcmRMYXlvdXRDb21tYW5kc0ZvckV2ZW50KE5TRXZl bnQgKik7CiAgICAgdm9pZCBpbnRlcnByZXRLZXlFdmVudChOU0V2ZW50ICosIHZvaWQoXmNvbXBs ZXRpb25IYW5kbGVyKShCT09MIGhhbmRsZWQsIGNvbnN0IFZlY3RvcjxXZWJDb3JlOjpLZXlwcmVz c0NvbW1hbmQ+JikpOwogCisgICAgdm9pZCBuYXRpdmVNb3VzZUV2ZW50SGFuZGxlcihOU0V2ZW50 ICopOworICAgIHZvaWQgbmF0aXZlTW91c2VFdmVudEhhbmRsZXJJbnRlcm5hbChOU0V2ZW50ICop OworICAgIAogICAgIHZvaWQgbW91c2VNb3ZlZEludGVybmFsKE5TRXZlbnQgKik7CiAgICAgdm9p ZCBtb3VzZURvd25JbnRlcm5hbChOU0V2ZW50ICopOwogICAgIHZvaWQgbW91c2VVcEludGVybmFs KE5TRXZlbnQgKik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9X ZWJWaWV3SW1wbC5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlZpZXdJbXBs Lm1tCmluZGV4IDcxMzhlZmM5NDE1ZjhhNjE0ZjIzYWZiYTJhNGM2YTE1NTNlYzNkODguLmU2NDU2 Y2ZhYmU2ZmJjOGFlZmFhN2E5OGNkNzM1ZjAwNTJmZDVkNDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlZpZXdJbXBsLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL0NvY29hL1dlYlZpZXdJbXBsLm1tCkBAIC01MjEzLDY5ICs1MjEzLDEyNCBAQCB2 b2lkIFdlYlZpZXdJbXBsOjpmbGFnc0NoYW5nZWQoTlNFdmVudCAqZXZlbnQpCiAgICAgfSk7CiB9 CiAKLSNkZWZpbmUgTkFUSVZFX01PVVNFX0VWRU5UX0hBTkRMRVIoRXZlbnROYW1lKSBcCi0gICAg dm9pZCBXZWJWaWV3SW1wbDo6RXZlbnROYW1lKE5TRXZlbnQgKmV2ZW50KSBcCi0gICAgeyBcCi0g ICAgICAgIGlmIChtX2lnbm9yZXNOb25XaGVlbEV2ZW50cykgXAotICAgICAgICAgICAgcmV0dXJu OyBcCi0gICAgICAgIGlmIChOU1RleHRJbnB1dENvbnRleHQgKmNvbnRleHQgPSBbbV92aWV3IGlu cHV0Q29udGV4dF0pIHsgXAotICAgICAgICAgICAgYXV0byB3ZWFrVGhpcyA9IG1ha2VXZWFrUHRy KCp0aGlzKTsgXAotICAgICAgICAgICAgUmV0YWluUHRyPE5TRXZlbnQ+IHJldGFpbmVkRXZlbnQg PSBldmVudDsgXAotICAgICAgICAgICAgW2NvbnRleHQgaGFuZGxlRXZlbnQ6ZXZlbnQgY29tcGxl dGlvbkhhbmRsZXI6W3dlYWtUaGlzLCByZXRhaW5lZEV2ZW50XSAoQk9PTCBoYW5kbGVkKSB7IFwK LSAgICAgICAgICAgICAgICBpZiAoIXdlYWtUaGlzKSBcCi0gICAgICAgICAgICAgICAgICAgIHJl dHVybjsgXAotICAgICAgICAgICAgICAgIGlmIChoYW5kbGVkKSBcCi0gICAgICAgICAgICAgICAg ICAgIExPRyhUZXh0SW5wdXQsICIlcyB3YXMgaGFuZGxlZCBieSB0ZXh0IGlucHV0IGNvbnRleHQi LCBTdHJpbmcoI0V2ZW50TmFtZSkuc3Vic3RyaW5nKDAsIFN0cmluZygjRXZlbnROYW1lKS5maW5k KCJJbnRlcm5hbCIpKS5hc2NpaSgpLmRhdGEoKSk7IFwKLSAgICAgICAgICAgICAgICBlbHNlIHsg XAotICAgICAgICAgICAgICAgICAgICBOYXRpdmVXZWJNb3VzZUV2ZW50IHdlYkV2ZW50KHJldGFp bmVkRXZlbnQuZ2V0KCksIHdlYWtUaGlzLT5tX2xhc3RQcmVzc3VyZUV2ZW50LmdldCgpLCB3ZWFr VGhpcy0+bV92aWV3LmdldEF1dG9yZWxlYXNlZCgpKTsgXAotICAgICAgICAgICAgICAgICAgICB3 ZWFrVGhpcy0+bV9wYWdlLT5oYW5kbGVNb3VzZUV2ZW50KHdlYkV2ZW50KTsgXAotICAgICAgICAg ICAgICAgIH0gXAotICAgICAgICAgICAgfV07IFwKLSAgICAgICAgICAgIHJldHVybjsgXAotICAg ICAgICB9IFwKLSAgICAgICAgTmF0aXZlV2ViTW91c2VFdmVudCB3ZWJFdmVudChldmVudCwgbV9s YXN0UHJlc3N1cmVFdmVudC5nZXQoKSwgbV92aWV3LmdldEF1dG9yZWxlYXNlZCgpKTsgXAotICAg ICAgICBtX3BhZ2UtPmhhbmRsZU1vdXNlRXZlbnQod2ViRXZlbnQpOyBcCisjaWYgIUxPR19ESVNB QkxFRAorc3RhdGljIFRleHRTdHJlYW0mIG9wZXJhdG9yPDwoVGV4dFN0cmVhbSYgdHMsIE5TRXZl bnRUeXBlIGV2ZW50VHlwZSkKK3sKKyAgICBzd2l0Y2ggKGV2ZW50VHlwZSkgeworICAgIGNhc2Ug TlNFdmVudFR5cGVMZWZ0TW91c2VEb3duOiB0cyA8PCAiTlNFdmVudFR5cGVMZWZ0TW91c2VEb3du IjsgYnJlYWs7CisgICAgY2FzZSBOU0V2ZW50VHlwZUxlZnRNb3VzZVVwOiB0cyA8PCAiTlNFdmVu dFR5cGVMZWZ0TW91c2VVcCI7IGJyZWFrOworICAgIGNhc2UgTlNFdmVudFR5cGVSaWdodE1vdXNl RG93bjogdHMgPDwgIk5TRXZlbnRUeXBlUmlnaHRNb3VzZURvd24iOyBicmVhazsKKyAgICBjYXNl IE5TRXZlbnRUeXBlUmlnaHRNb3VzZVVwOiB0cyA8PCAiTlNFdmVudFR5cGVSaWdodE1vdXNlVXAi OyBicmVhazsKKyAgICBjYXNlIE5TRXZlbnRUeXBlTW91c2VNb3ZlZDogdHMgPDwgIk5TRXZlbnRU eXBlTW91c2VNb3ZlZCI7IGJyZWFrOworICAgIGNhc2UgTlNFdmVudFR5cGVMZWZ0TW91c2VEcmFn Z2VkOiB0cyA8PCAiTlNFdmVudFR5cGVMZWZ0TW91c2VEcmFnZ2VkIjsgYnJlYWs7CisgICAgY2Fz ZSBOU0V2ZW50VHlwZVJpZ2h0TW91c2VEcmFnZ2VkOiB0cyA8PCAiTlNFdmVudFR5cGVSaWdodE1v dXNlRHJhZ2dlZCI7IGJyZWFrOworICAgIGNhc2UgTlNFdmVudFR5cGVNb3VzZUVudGVyZWQ6IHRz IDw8ICJOU0V2ZW50VHlwZU1vdXNlRW50ZXJlZCI7IGJyZWFrOworICAgIGNhc2UgTlNFdmVudFR5 cGVNb3VzZUV4aXRlZDogdHMgPDwgIk5TRXZlbnRUeXBlTW91c2VFeGl0ZWQiOyBicmVhazsKKyAg ICBjYXNlIE5TRXZlbnRUeXBlS2V5RG93bjogdHMgPDwgIk5TRXZlbnRUeXBlS2V5RG93biI7IGJy ZWFrOworICAgIGNhc2UgTlNFdmVudFR5cGVLZXlVcDogdHMgPDwgIk5TRXZlbnRUeXBlS2V5VXAi OyBicmVhazsKKyAgICBjYXNlIE5TRXZlbnRUeXBlU2Nyb2xsV2hlZWw6IHRzIDw8ICJOU0V2ZW50 VHlwZVNjcm9sbFdoZWVsIjsgYnJlYWs7CisgICAgY2FzZSBOU0V2ZW50VHlwZU90aGVyTW91c2VE b3duOiB0cyA8PCAiTlNFdmVudFR5cGVPdGhlck1vdXNlRG93biI7IGJyZWFrOworICAgIGNhc2Ug TlNFdmVudFR5cGVPdGhlck1vdXNlVXA6IHRzIDw8ICJOU0V2ZW50VHlwZU90aGVyTW91c2VVcCI7 IGJyZWFrOworICAgIGNhc2UgTlNFdmVudFR5cGVPdGhlck1vdXNlRHJhZ2dlZDogdHMgPDwgIk5T RXZlbnRUeXBlT3RoZXJNb3VzZURyYWdnZWQiOyBicmVhazsKKyAgICBkZWZhdWx0OgorICAgICAg ICB0cyA8PCAiT3RoZXIiOwogICAgIH0KLSNkZWZpbmUgTkFUSVZFX01PVVNFX0VWRU5UX0hBTkRM RVJfSU5URVJOQUwoRXZlbnROYW1lKSBcCi0gICAgdm9pZCBXZWJWaWV3SW1wbDo6RXZlbnROYW1l KE5TRXZlbnQgKmV2ZW50KSBcCi0gICAgeyBcCi0gICAgICAgIGlmIChtX2lnbm9yZXNOb25XaGVl bEV2ZW50cyB8fCBtX3NhZmVCcm93c2luZ1dhcm5pbmcpIFwKLSAgICAgICAgICAgIHJldHVybjsg XAotICAgICAgICBpZiAoTlNUZXh0SW5wdXRDb250ZXh0ICpjb250ZXh0ID0gW21fdmlldyBpbnB1 dENvbnRleHRdKSB7IFwKLSAgICAgICAgICAgIGF1dG8gd2Vha1RoaXMgPSBtYWtlV2Vha1B0cigq dGhpcyk7IFwKLSAgICAgICAgICAgIFJldGFpblB0cjxOU0V2ZW50PiByZXRhaW5lZEV2ZW50ID0g ZXZlbnQ7IFwKLSAgICAgICAgICAgIFtjb250ZXh0IGhhbmRsZUV2ZW50OmV2ZW50IGNvbXBsZXRp b25IYW5kbGVyOlt3ZWFrVGhpcywgcmV0YWluZWRFdmVudF0gKEJPT0wgaGFuZGxlZCkgeyBcCi0g ICAgICAgICAgICAgICAgaWYgKCF3ZWFrVGhpcykgXAotICAgICAgICAgICAgICAgICAgICByZXR1 cm47IFwKLSAgICAgICAgICAgICAgICBpZiAoaGFuZGxlZCkgXAotICAgICAgICAgICAgICAgICAg ICBMT0coVGV4dElucHV0LCAiJXMgd2FzIGhhbmRsZWQgYnkgdGV4dCBpbnB1dCBjb250ZXh0Iiwg U3RyaW5nKCNFdmVudE5hbWUpLnN1YnN0cmluZygwLCBTdHJpbmcoI0V2ZW50TmFtZSkuZmluZCgi SW50ZXJuYWwiKSkuYXNjaWkoKS5kYXRhKCkpOyBcCi0gICAgICAgICAgICAgICAgZWxzZSB7IFwK LSAgICAgICAgICAgICAgICAgICAgTmF0aXZlV2ViTW91c2VFdmVudCB3ZWJFdmVudChyZXRhaW5l ZEV2ZW50LmdldCgpLCB3ZWFrVGhpcy0+bV9sYXN0UHJlc3N1cmVFdmVudC5nZXQoKSwgd2Vha1Ro aXMtPm1fdmlldy5nZXRBdXRvcmVsZWFzZWQoKSk7IFwKLSAgICAgICAgICAgICAgICAgICAgd2Vh a1RoaXMtPm1fcGFnZS0+aGFuZGxlTW91c2VFdmVudCh3ZWJFdmVudCk7IFwKLSAgICAgICAgICAg ICAgICB9IFwKLSAgICAgICAgICAgIH1dOyBcCi0gICAgICAgICAgICByZXR1cm47IFwKLSAgICAg ICAgfSBcCi0gICAgICAgIE5hdGl2ZVdlYk1vdXNlRXZlbnQgd2ViRXZlbnQoZXZlbnQsIG1fbGFz dFByZXNzdXJlRXZlbnQuZ2V0KCksIG1fdmlldy5nZXRBdXRvcmVsZWFzZWQoKSk7IFwKLSAgICAg ICAgbV9wYWdlLT5oYW5kbGVNb3VzZUV2ZW50KHdlYkV2ZW50KTsgXAorCisgICAgcmV0dXJuIHRz OworfQorI2VuZGlmCisKK3ZvaWQgV2ViVmlld0ltcGw6Om5hdGl2ZU1vdXNlRXZlbnRIYW5kbGVy KE5TRXZlbnQgKmV2ZW50KQoreworICAgIGlmIChtX2lnbm9yZXNOb25XaGVlbEV2ZW50cykKKyAg ICAgICAgcmV0dXJuOworCisgICAgaWYgKE5TVGV4dElucHV0Q29udGV4dCAqY29udGV4dCA9IFtt X3ZpZXcgaW5wdXRDb250ZXh0XSkgeworICAgICAgICBhdXRvIHdlYWtUaGlzID0gbWFrZVdlYWtQ dHIoKnRoaXMpOworICAgICAgICBSZXRhaW5QdHI8TlNFdmVudD4gcmV0YWluZWRFdmVudCA9IGV2 ZW50OworICAgICAgICBbY29udGV4dCBoYW5kbGVFdmVudDpldmVudCBjb21wbGV0aW9uSGFuZGxl cjpbd2Vha1RoaXMsIHJldGFpbmVkRXZlbnRdIChCT09MIGhhbmRsZWQpIHsKKyAgICAgICAgICAg IGlmICghd2Vha1RoaXMpCisgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgaWYg KGhhbmRsZWQpCisgICAgICAgICAgICAgICAgTE9HX1dJVEhfU1RSRUFNKFRleHRJbnB1dCwgc3Ry ZWFtIDw8ICJFdmVudCAiIDw8IFtyZXRhaW5lZEV2ZW50IHR5cGVdIDw8ICIgd2FzIGhhbmRsZWQg YnkgdGV4dCBpbnB1dCBjb250ZXh0Iik7CisgICAgICAgICAgICBlbHNlIHsKKyAgICAgICAgICAg ICAgICBOYXRpdmVXZWJNb3VzZUV2ZW50IHdlYkV2ZW50KHJldGFpbmVkRXZlbnQuZ2V0KCksIHdl YWtUaGlzLT5tX2xhc3RQcmVzc3VyZUV2ZW50LmdldCgpLCB3ZWFrVGhpcy0+bV92aWV3LmdldEF1 dG9yZWxlYXNlZCgpKTsKKyAgICAgICAgICAgICAgICB3ZWFrVGhpcy0+bV9wYWdlLT5oYW5kbGVN b3VzZUV2ZW50KHdlYkV2ZW50KTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfV07CisgICAgICAg IHJldHVybjsKICAgICB9CisgICAgTmF0aXZlV2ViTW91c2VFdmVudCB3ZWJFdmVudChldmVudCwg bV9sYXN0UHJlc3N1cmVFdmVudC5nZXQoKSwgbV92aWV3LmdldEF1dG9yZWxlYXNlZCgpKTsKKyAg ICBtX3BhZ2UtPmhhbmRsZU1vdXNlRXZlbnQod2ViRXZlbnQpOworfQorCit2b2lkIFdlYlZpZXdJ bXBsOjpuYXRpdmVNb3VzZUV2ZW50SGFuZGxlckludGVybmFsKE5TRXZlbnQgKmV2ZW50KQorewor ICAgIGlmIChtX3NhZmVCcm93c2luZ1dhcm5pbmcpCisgICAgICAgIHJldHVybjsKKworICAgIG5h dGl2ZU1vdXNlRXZlbnRIYW5kbGVyKGV2ZW50KTsKK30KKwordm9pZCBXZWJWaWV3SW1wbDo6bW91 c2VFbnRlcmVkKE5TRXZlbnQgKmV2ZW50KQoreworICAgIG5hdGl2ZU1vdXNlRXZlbnRIYW5kbGVy KGV2ZW50KTsKK30KKwordm9pZCBXZWJWaWV3SW1wbDo6bW91c2VFeGl0ZWQoTlNFdmVudCAqZXZl bnQpCit7CisgICAgbmF0aXZlTW91c2VFdmVudEhhbmRsZXIoZXZlbnQpOworfQogCi1OQVRJVkVf TU9VU0VfRVZFTlRfSEFORExFUihtb3VzZUVudGVyZWQpCi1OQVRJVkVfTU9VU0VfRVZFTlRfSEFO RExFUihtb3VzZUV4aXRlZCkKLU5BVElWRV9NT1VTRV9FVkVOVF9IQU5ETEVSKG90aGVyTW91c2VE b3duKQotTkFUSVZFX01PVVNFX0VWRU5UX0hBTkRMRVIob3RoZXJNb3VzZURyYWdnZWQpCi1OQVRJ VkVfTU9VU0VfRVZFTlRfSEFORExFUihvdGhlck1vdXNlVXApCi1OQVRJVkVfTU9VU0VfRVZFTlRf SEFORExFUihyaWdodE1vdXNlRG93bikKLU5BVElWRV9NT1VTRV9FVkVOVF9IQU5ETEVSKHJpZ2h0 TW91c2VEcmFnZ2VkKQotTkFUSVZFX01PVVNFX0VWRU5UX0hBTkRMRVIocmlnaHRNb3VzZVVwKQot Ci1OQVRJVkVfTU9VU0VfRVZFTlRfSEFORExFUl9JTlRFUk5BTChtb3VzZU1vdmVkSW50ZXJuYWwp Ci1OQVRJVkVfTU9VU0VfRVZFTlRfSEFORExFUl9JTlRFUk5BTChtb3VzZURvd25JbnRlcm5hbCkK LU5BVElWRV9NT1VTRV9FVkVOVF9IQU5ETEVSX0lOVEVSTkFMKG1vdXNlVXBJbnRlcm5hbCkKLU5B VElWRV9NT1VTRV9FVkVOVF9IQU5ETEVSX0lOVEVSTkFMKG1vdXNlRHJhZ2dlZEludGVybmFsKQot Ci0jdW5kZWYgTkFUSVZFX01PVVNFX0VWRU5UX0hBTkRMRVIKLSN1bmRlZiBOQVRJVkVfTU9VU0Vf RVZFTlRfSEFORExFUl9JTlRFUk5BTAordm9pZCBXZWJWaWV3SW1wbDo6b3RoZXJNb3VzZURvd24o TlNFdmVudCAqZXZlbnQpCit7CisgICAgbmF0aXZlTW91c2VFdmVudEhhbmRsZXIoZXZlbnQpOwor fQorCit2b2lkIFdlYlZpZXdJbXBsOjpvdGhlck1vdXNlRHJhZ2dlZChOU0V2ZW50ICpldmVudCkK K3sKKyAgICBuYXRpdmVNb3VzZUV2ZW50SGFuZGxlcihldmVudCk7Cit9CisKK3ZvaWQgV2ViVmll d0ltcGw6Om90aGVyTW91c2VVcChOU0V2ZW50ICpldmVudCkKK3sKKyAgICBuYXRpdmVNb3VzZUV2 ZW50SGFuZGxlcihldmVudCk7Cit9CisKK3ZvaWQgV2ViVmlld0ltcGw6OnJpZ2h0TW91c2VEb3du KE5TRXZlbnQgKmV2ZW50KQoreworICAgIG5hdGl2ZU1vdXNlRXZlbnRIYW5kbGVyKGV2ZW50KTsK K30KKwordm9pZCBXZWJWaWV3SW1wbDo6cmlnaHRNb3VzZURyYWdnZWQoTlNFdmVudCAqZXZlbnQp Cit7CisgICAgbmF0aXZlTW91c2VFdmVudEhhbmRsZXIoZXZlbnQpOworfQorCit2b2lkIFdlYlZp ZXdJbXBsOjpyaWdodE1vdXNlVXAoTlNFdmVudCAqZXZlbnQpCit7CisgICAgbmF0aXZlTW91c2VF dmVudEhhbmRsZXIoZXZlbnQpOworfQorCit2b2lkIFdlYlZpZXdJbXBsOjptb3VzZU1vdmVkSW50 ZXJuYWwoTlNFdmVudCAqZXZlbnQpCit7CisgICAgbmF0aXZlTW91c2VFdmVudEhhbmRsZXJJbnRl cm5hbChldmVudCk7Cit9CisKK3ZvaWQgV2ViVmlld0ltcGw6Om1vdXNlRG93bkludGVybmFsKE5T RXZlbnQgKmV2ZW50KQoreworICAgIG5hdGl2ZU1vdXNlRXZlbnRIYW5kbGVySW50ZXJuYWwoZXZl bnQpOworfQorCit2b2lkIFdlYlZpZXdJbXBsOjptb3VzZVVwSW50ZXJuYWwoTlNFdmVudCAqZXZl bnQpCit7CisgICAgbmF0aXZlTW91c2VFdmVudEhhbmRsZXJJbnRlcm5hbChldmVudCk7Cit9CisK K3ZvaWQgV2ViVmlld0ltcGw6Om1vdXNlRHJhZ2dlZEludGVybmFsKE5TRXZlbnQgKmV2ZW50KQor eworICAgIG5hdGl2ZU1vdXNlRXZlbnRIYW5kbGVySW50ZXJuYWwoZXZlbnQpOworfQogCiB2b2lk IFdlYlZpZXdJbXBsOjptb3VzZU1vdmVkKE5TRXZlbnQgKmV2ZW50KQogewo=