150206 2015-10-15 16:51:39 -0700 Use the ShowContextMenu message for service menus as well 2015-10-16 10:08:53 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 1133683 0 andersca 2015-10-15 16:51:39 -0700 Use the ShowContextMenu message for service menus as well 1133684 1 263223 andersca 2015-10-15 16:52:02 -0700 Created attachment 263223 Patch 1133894 2 andersca 2015-10-16 10:08:53 -0700 Committed r191181: <http://trac.webkit.org/changeset/191181> 263223 2015-10-15 16:52:02 -0700 2015-10-15 17:06:40 -0700 Patch bug-150206-20151015165123.patch text/plain 15654 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTkxMTQ0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYWUxMThlZTAxZTMyYmZj M2NkMjMwMTVmNGFiNTAxMmU1NjM3ZWViYy4uNThlOTZhOTczMjM1OWU0MTA0YzlmMDhlM2QwNzUy MTFiYzRmZjk5OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM0IEBACiAyMDE1LTEwLTE1ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgVXNlIHRoZSBTaG93 Q29udGV4dE1lbnUgbWVzc2FnZSBmb3Igc2VydmljZSBtZW51cyBhcyB3ZWxsCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTAyMDYKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNoYXJlZC9Db250ZXh0TWVu dUNvbnRleHREYXRhLmNwcDoKKyAgICAgICAgKFdlYktpdDo6Q29udGV4dE1lbnVDb250ZXh0RGF0 YTo6Q29udGV4dE1lbnVDb250ZXh0RGF0YSk6CisgICAgICAgIChXZWJLaXQ6OkNvbnRleHRNZW51 Q29udGV4dERhdGE6OmVuY29kZSk6CisgICAgICAgIChXZWJLaXQ6OkNvbnRleHRNZW51Q29udGV4 dERhdGE6OmRlY29kZSk6CisgICAgICAgICogU2hhcmVkL0NvbnRleHRNZW51Q29udGV4dERhdGEu aDoKKyAgICAgICAgKFdlYktpdDo6Q29udGV4dE1lbnVDb250ZXh0RGF0YTo6dHlwZSk6CisgICAg ICAgIChXZWJLaXQ6OkNvbnRleHRNZW51Q29udGV4dERhdGE6OkNvbnRleHRNZW51Q29udGV4dERh dGEpOgorICAgICAgICAoV2ViS2l0OjpDb250ZXh0TWVudUNvbnRleHREYXRhOjppc1NlcnZpY2Vz TWVudSk6CisgICAgICAgIChXZWJLaXQ6OkNvbnRleHRNZW51Q29udGV4dERhdGE6Om5lZWRzU2Vy dmljZXNNZW51KTogRGVsZXRlZC4KKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNw cDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpzaG93Q29udGV4dE1lbnUpOgorICAg ICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmludGVybmFsU2hvd0NvbnRleHRNZW51KToKKyAg ICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5Lmg6CisgICAgICAgICogVUlQcm9jZXNzL1dl YlBhZ2VQcm94eS5tZXNzYWdlcy5pbjoKKyAgICAgICAgKiBVSVByb2Nlc3MvbWFjL1dlYkNvbnRl eHRNZW51UHJveHlNYWMubW06CisgICAgICAgIChXZWJLaXQ6OldlYkNvbnRleHRNZW51UHJveHlN YWM6OnBvcHVsYXRlKToKKyAgICAgICAgKFdlYktpdDo6V2ViQ29udGV4dE1lbnVQcm94eU1hYzo6 c2hvd0NvbnRleHRNZW51KToKKyAgICAgICAgKiBVSVByb2Nlc3MvbWFjL1dlYlBhZ2VQcm94eU1h Yy5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpzaG93U2VsZWN0aW9uU2Vydmlj ZU1lbnUpOiBEZWxldGVkLgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9tYWMvV2ViUGFn ZU1hYy5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6aGFuZGxlU2VsZWN0aW9uU2Vydmlj ZUNsaWNrKToKKworMjAxNS0xMC0xNSAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUu Y29tPgorCiAgICAgICAgIFVzZSB0aGUgY29udGV4dCBpbnNpZGUgV2ViQ29udGV4dE1lbnVQcm94 eU1hYwogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUw MTk2CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9Db250ZXh0TWVudUNvbnRl eHREYXRhLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9Db250ZXh0TWVudUNvbnRleHREYXRh LmNwcAppbmRleCA5NzZjYzQ0ZmExMGQ4OTM5ZGQwYTU5M2U2ZWNlNTRlNzljNzQ5ODEwLi45MTQ0 OWU0OThkZDI2Y2M3ODE0ZTM1ODllZDM2MDA2MTcwODUyOWI2IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9TaGFyZWQvQ29udGV4dE1lbnVDb250ZXh0RGF0YS5jcHAKKysrIGIvU291cmNlL1dl YktpdDIvU2hhcmVkL0NvbnRleHRNZW51Q29udGV4dERhdGEuY3BwCkBAIC0zOCwxNCArMzgsMTYg QEAgdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiBuYW1lc3BhY2UgV2ViS2l0IHsKIAogQ29udGV4 dE1lbnVDb250ZXh0RGF0YTo6Q29udGV4dE1lbnVDb250ZXh0RGF0YSgpCisgICAgOiBtX3R5cGUo VHlwZTo6Q29udGV4dE1lbnUpCiAjaWYgRU5BQkxFKFNFUlZJQ0VfQ09OVFJPTFMpCi0gICAgOiBt X3NlbGVjdGlvbklzRWRpdGFibGUoZmFsc2UpCisgICAgLCBtX3NlbGVjdGlvbklzRWRpdGFibGUo ZmFsc2UpCiAjZW5kaWYKIHsKIH0KIAogQ29udGV4dE1lbnVDb250ZXh0RGF0YTo6Q29udGV4dE1l bnVDb250ZXh0RGF0YShjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYgbWVudUxvY2F0aW9uLCBjb25z dCBWZWN0b3I8V2ViS2l0OjpXZWJDb250ZXh0TWVudUl0ZW1EYXRhPiYgbWVudUl0ZW1zLCBjb25z dCBDb250ZXh0TWVudUNvbnRleHQmIGNvbnRleHQpCi0gICAgOiBtX21lbnVMb2NhdGlvbihtZW51 TG9jYXRpb24pCisgICAgOiBtX3R5cGUoVHlwZTo6Q29udGV4dE1lbnUpCisgICAgLCBtX21lbnVM b2NhdGlvbihtZW51TG9jYXRpb24pCiAgICAgLCBtX21lbnVJdGVtcyhtZW51SXRlbXMpCiAgICAg LCBtX3dlYkhpdFRlc3RSZXN1bHREYXRhKGNvbnRleHQuaGl0VGVzdFJlc3VsdCgpLCB0cnVlKQog ICAgICwgbV9zZWxlY3RlZFRleHQoY29udGV4dC5zZWxlY3RlZFRleHQoKSkKQEAgLTY2LDYgKzY4 LDcgQEAgQ29udGV4dE1lbnVDb250ZXh0RGF0YTo6Q29udGV4dE1lbnVDb250ZXh0RGF0YShjb25z dCBXZWJDb3JlOjpJbnRQb2ludCYgbWVudUxvY2EKIAogdm9pZCBDb250ZXh0TWVudUNvbnRleHRE YXRhOjplbmNvZGUoSVBDOjpBcmd1bWVudEVuY29kZXImIGVuY29kZXIpIGNvbnN0CiB7CisgICAg ZW5jb2Rlci5lbmNvZGVFbnVtKG1fdHlwZSk7CiAgICAgZW5jb2RlciA8PCBtX21lbnVMb2NhdGlv bjsKICAgICBlbmNvZGVyIDw8IG1fbWVudUl0ZW1zOwogICAgIGVuY29kZXIgPDwgbV93ZWJIaXRU ZXN0UmVzdWx0RGF0YTsKQEAgLTc2LDExICs3OSwxNyBAQCB2b2lkIENvbnRleHRNZW51Q29udGV4 dERhdGE6OmVuY29kZShJUEM6OkFyZ3VtZW50RW5jb2RlciYgZW5jb2RlcikgY29uc3QKICAgICBp ZiAobV9jb250cm9sbGVkSW1hZ2UpCiAgICAgICAgIG1fY29udHJvbGxlZEltYWdlLT5jcmVhdGVI YW5kbGUoaGFuZGxlLCBTaGFyZWRNZW1vcnk6OlByb3RlY3Rpb246OlJlYWRPbmx5KTsKICAgICBl bmNvZGVyIDw8IGhhbmRsZTsKKyAgICBlbmNvZGVyIDw8IG1fY29udHJvbGxlZFNlbGVjdGlvbkRh dGE7CisgICAgZW5jb2RlciA8PCBtX3NlbGVjdGVkVGVsZXBob25lTnVtYmVyczsKKyAgICBlbmNv ZGVyIDw8IG1fc2VsZWN0aW9uSXNFZGl0YWJsZTsKICNlbmRpZgogfQogCiBib29sIENvbnRleHRN ZW51Q29udGV4dERhdGE6OmRlY29kZShJUEM6OkFyZ3VtZW50RGVjb2RlciYgZGVjb2RlciwgQ29u dGV4dE1lbnVDb250ZXh0RGF0YSYgcmVzdWx0KQogeworICAgIGlmICghZGVjb2Rlci5kZWNvZGVF bnVtKHJlc3VsdC5tX3R5cGUpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKICAgICBpZiAoIWRl Y29kZXIuZGVjb2RlKHJlc3VsdC5tX21lbnVMb2NhdGlvbikpCiAgICAgICAgIHJldHVybiBmYWxz ZTsKIApAQCAtMTAwLDYgKzEwOSwxMyBAQCBib29sIENvbnRleHRNZW51Q29udGV4dERhdGE6OmRl Y29kZShJUEM6OkFyZ3VtZW50RGVjb2RlciYgZGVjb2RlciwgQ29udGV4dE1lbnVDbwogCiAgICAg aWYgKCFoYW5kbGUuaXNOdWxsKCkpCiAgICAgICAgIHJlc3VsdC5tX2NvbnRyb2xsZWRJbWFnZSA9 IFNoYXJlYWJsZUJpdG1hcDo6Y3JlYXRlKGhhbmRsZSwgU2hhcmVkTWVtb3J5OjpQcm90ZWN0aW9u OjpSZWFkT25seSk7CisKKyAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHJlc3VsdC5tX2NvbnRyb2xs ZWRTZWxlY3Rpb25EYXRhKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIGlmICghZGVjb2Rl ci5kZWNvZGUocmVzdWx0Lm1fc2VsZWN0ZWRUZWxlcGhvbmVOdW1iZXJzKSkKKyAgICAgICAgcmV0 dXJuIGZhbHNlOworICAgIGlmICghZGVjb2Rlci5kZWNvZGUocmVzdWx0Lm1fc2VsZWN0aW9uSXNF ZGl0YWJsZSkpCisgICAgICAgIHJldHVybiBmYWxzZTsKICNlbmRpZgogCiAgICAgcmV0dXJuIHRy dWU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQ29udGV4dE1lbnVDb250ZXh0 RGF0YS5oIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL0NvbnRleHRNZW51Q29udGV4dERhdGEuaApp bmRleCA2ZGM1YmNlZGY5NzU5MzY4MTZmMjk3MWZkZDU3Y2QwYTUyMTVjMmM0Li5iMzQ3NDc3ODI3 ODE4NzUzZDQzOTVmNGQ5OWVlNjcwYThiNzIxNDQzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9TaGFyZWQvQ29udGV4dE1lbnVDb250ZXh0RGF0YS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1No YXJlZC9Db250ZXh0TWVudUNvbnRleHREYXRhLmgKQEAgLTQ2LDkgKzQ2LDE1IEBAIG5hbWVzcGFj ZSBXZWJLaXQgewogCiBjbGFzcyBDb250ZXh0TWVudUNvbnRleHREYXRhIHsKIHB1YmxpYzoKKyAg ICBlbnVtIGNsYXNzIFR5cGUgeworICAgICAgICBDb250ZXh0TWVudSwKKyAgICAgICAgU2Vydmlj ZXNNZW51LAorICAgIH07CisKICAgICBDb250ZXh0TWVudUNvbnRleHREYXRhKCk7CiAgICAgQ29u dGV4dE1lbnVDb250ZXh0RGF0YShjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYgbWVudUxvY2F0aW9u LCBjb25zdCBWZWN0b3I8V2ViS2l0OjpXZWJDb250ZXh0TWVudUl0ZW1EYXRhPiYgbWVudUl0ZW1z LCBjb25zdCBXZWJDb3JlOjpDb250ZXh0TWVudUNvbnRleHQmKTsKIAorICAgIFR5cGUgdHlwZSgp IGNvbnN0IHsgcmV0dXJuIG1fdHlwZTsgfQogICAgIGNvbnN0IFdlYkNvcmU6OkludFBvaW50JiBt ZW51TG9jYXRpb24oKSBjb25zdCB7IHJldHVybiBtX21lbnVMb2NhdGlvbjsgfQogICAgIGNvbnN0 IFZlY3RvcjxXZWJLaXQ6OldlYkNvbnRleHRNZW51SXRlbURhdGE+JiBtZW51SXRlbXMoKSBjb25z dCB7IHJldHVybiBtX21lbnVJdGVtczsgfQogCkBAIC01Niw5ICs2Miw5IEBAIHB1YmxpYzoKICAg ICBjb25zdCBTdHJpbmcmIHNlbGVjdGVkVGV4dCgpIGNvbnN0IHsgcmV0dXJuIG1fc2VsZWN0ZWRU ZXh0OyB9CiAKICNpZiBFTkFCTEUoU0VSVklDRV9DT05UUk9MUykKLSAgICBDb250ZXh0TWVudUNv bnRleHREYXRhKGNvbnN0IFdlYkNvcmU6OkludFBvaW50JiBtZW51TG9jYXRpb24sIGNvbnN0IFZl Y3RvcjxXZWJLaXQ6OldlYkNvbnRleHRNZW51SXRlbURhdGE+JiBtZW51SXRlbXMsIGNvbnN0IFZl Y3Rvcjx1aW50OF90PiYgc2VsZWN0aW9uRGF0YSwgY29uc3QgVmVjdG9yPFN0cmluZz4mIHNlbGVj dGVkVGVsZXBob25lTnVtYmVycywgYm9vbCBpc0VkaXRhYmxlKQotICAgICAgICA6IG1fbWVudUxv Y2F0aW9uKG1lbnVMb2NhdGlvbikKLSAgICAgICAgLCBtX21lbnVJdGVtcyhtZW51SXRlbXMpCisg ICAgQ29udGV4dE1lbnVDb250ZXh0RGF0YShjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYgbWVudUxv Y2F0aW9uLCBjb25zdCBWZWN0b3I8dWludDhfdD4mIHNlbGVjdGlvbkRhdGEsIGNvbnN0IFZlY3Rv cjxTdHJpbmc+JiBzZWxlY3RlZFRlbGVwaG9uZU51bWJlcnMsIGJvb2wgaXNFZGl0YWJsZSkKKyAg ICAgICAgOiBtX3R5cGUoVHlwZTo6U2VydmljZXNNZW51KQorICAgICAgICAsIG1fbWVudUxvY2F0 aW9uKG1lbnVMb2NhdGlvbikKICAgICAgICAgLCBtX2NvbnRyb2xsZWRTZWxlY3Rpb25EYXRhKHNl bGVjdGlvbkRhdGEpCiAgICAgICAgICwgbV9zZWxlY3RlZFRlbGVwaG9uZU51bWJlcnMoc2VsZWN0 ZWRUZWxlcGhvbmVOdW1iZXJzKQogICAgICAgICAsIG1fc2VsZWN0aW9uSXNFZGl0YWJsZShpc0Vk aXRhYmxlKQpAQCAtNjksMTQgKzc1LDE2IEBAIHB1YmxpYzoKICAgICBjb25zdCBWZWN0b3I8dWlu dDhfdD4mIGNvbnRyb2xsZWRTZWxlY3Rpb25EYXRhKCkgY29uc3QgeyByZXR1cm4gbV9jb250cm9s bGVkU2VsZWN0aW9uRGF0YTsgfQogICAgIGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBzZWxlY3RlZFRl bGVwaG9uZU51bWJlcnMoKSBjb25zdCB7IHJldHVybiBtX3NlbGVjdGVkVGVsZXBob25lTnVtYmVy czsgfQogCisgICAgYm9vbCBpc1NlcnZpY2VzTWVudSgpIGNvbnN0IHsgcmV0dXJuIG1fdHlwZSA9 PSBDb250ZXh0TWVudUNvbnRleHREYXRhOjpUeXBlOjpTZXJ2aWNlc01lbnU7IH0KICAgICBib29s IGNvbnRyb2xsZWREYXRhSXNFZGl0YWJsZSgpIGNvbnN0OwotICAgIGJvb2wgbmVlZHNTZXJ2aWNl c01lbnUoKSBjb25zdCB7IHJldHVybiBtX2NvbnRyb2xsZWRJbWFnZSB8fCAhbV9jb250cm9sbGVk U2VsZWN0aW9uRGF0YS5pc0VtcHR5KCk7IH0KICNlbmRpZgogCiAgICAgdm9pZCBlbmNvZGUoSVBD OjpBcmd1bWVudEVuY29kZXImKSBjb25zdDsKICAgICBzdGF0aWMgYm9vbCBkZWNvZGUoSVBDOjpB cmd1bWVudERlY29kZXImLCBDb250ZXh0TWVudUNvbnRleHREYXRhJik7CiAKIHByaXZhdGU6Cisg ICAgVHlwZSBtX3R5cGU7CisKICAgICBXZWJDb3JlOjpJbnRQb2ludCBtX21lbnVMb2NhdGlvbjsK ICAgICBWZWN0b3I8V2ViS2l0OjpXZWJDb250ZXh0TWVudUl0ZW1EYXRhPiBtX21lbnVJdGVtczsK IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAppbmRleCAwNGVmY2Q2 NThmMzE0ZTQzNDA4MjQwMjMxOTJjMDEzYzNjN2E1NWRkLi5jMzMwZGVjODcxNTUyZmI2NWU5NmMy YTZkYzFhNzNiMTg4OTI0Mjg2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv V2ViUGFnZVByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVBy b3h5LmNwcApAQCAtNDE4NywxMyArNDE4NywxMyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6c2hvd0Nv bnRleHRNZW51KGNvbnN0IENvbnRleHRNZW51Q29udGV4dERhdGEmIGNvbnRleHRNZW51Q29udAog ICAgIC8vIFNob3dpbmcgYSBjb250ZXh0IG1lbnUgcnVucyBhIG5lc3RlZCBydW5sb29wLCB3aGlj aCBjYW4gaGFuZGxlIG1lc3NhZ2VzIHRoYXQgY2F1c2UgfHRoaXN8IHRvIGdldCBjbG9zZWQuCiAg ICAgUmVmPFdlYlBhZ2VQcm94eT4gcHJvdGVjdCgqdGhpcyk7CiAKLSAgICBpbnRlcm5hbFNob3dD b250ZXh0TWVudShjb250ZXh0TWVudUNvbnRleHREYXRhLCBDb250ZXh0TWVudUNsaWVudEVsaWdp YmlsaXR5OjpFbGlnaWJsZUZvckNsaWVudCwgdXNlckRhdGEpOworICAgIGludGVybmFsU2hvd0Nv bnRleHRNZW51KGNvbnRleHRNZW51Q29udGV4dERhdGEsIHVzZXJEYXRhKTsKICAgICAKICAgICAv LyBObyBtYXR0ZXIgdGhlIHJlc3VsdCBvZiBpbnRlcm5hbFNob3dDb250ZXh0TWVudSwgYWx3YXlz IG5vdGlmeSB0aGUgV2ViUHJvY2VzcyB0aGF0IHRoZSBtZW51IGlzIGhpZGRlbiBzbyBpdCBzdGFy dHMgaGFuZGxpbmcgbW91c2UgZXZlbnRzIGFnYWluLgogICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNz YWdlczo6V2ViUGFnZTo6Q29udGV4dE1lbnVIaWRkZW4oKSwgbV9wYWdlSUQpOwogfQogCi12b2lk IFdlYlBhZ2VQcm94eTo6aW50ZXJuYWxTaG93Q29udGV4dE1lbnUoY29uc3QgQ29udGV4dE1lbnVD b250ZXh0RGF0YSYgY29udGV4dE1lbnVDb250ZXh0RGF0YSwgQ29udGV4dE1lbnVDbGllbnRFbGln aWJpbGl0eSBjbGllbnRFbGlnaWJpbGl0eSwgY29uc3QgVXNlckRhdGEmIHVzZXJEYXRhKQordm9p ZCBXZWJQYWdlUHJveHk6OmludGVybmFsU2hvd0NvbnRleHRNZW51KGNvbnN0IENvbnRleHRNZW51 Q29udGV4dERhdGEmIGNvbnRleHRNZW51Q29udGV4dERhdGEsIGNvbnN0IFVzZXJEYXRhJiB1c2Vy RGF0YSkKIHsKICAgICBtX2FjdGl2ZUNvbnRleHRNZW51Q29udGV4dERhdGEgPSBjb250ZXh0TWVu dUNvbnRleHREYXRhOwogCkBAIC00MjEwLDkgKzQyMTAsOSBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6 aW50ZXJuYWxTaG93Q29udGV4dE1lbnUoY29uc3QgQ29udGV4dE1lbnVDb250ZXh0RGF0YSYgY29u dGV4dAogICAgIG1fcHJvY2Vzcy0+cmVzcG9uc2l2ZW5lc3NUaW1lcigpLT5zdG9wKCk7CiAKICAg ICAvLyBVbmxlc3MgdGhpcyBpcyBhbiBpbWFnZSBjb250cm9sLCBnaXZlIHRoZSBQYWdlQ29udGV4 dE1lbnVDbGllbnQgb25lIGxhc3Qgc3dpcGUgYXQgY2hhbmdpbmcgdGhlIG1lbnUuCi0gICAgYm9v bCBhc2tDbGllbnRUb0NoYW5nZU1lbnUgPSBjbGllbnRFbGlnaWJpbGl0eSA9PSBDb250ZXh0TWVu dUNsaWVudEVsaWdpYmlsaXR5OjpFbGlnaWJsZUZvckNsaWVudDsKKyAgICBib29sIGFza0NsaWVu dFRvQ2hhbmdlTWVudSA9IHRydWU7CiAjaWYgRU5BQkxFKFNFUlZJQ0VfQ09OVFJPTFMpCi0gICAg aWYgKGNvbnRleHRNZW51Q29udGV4dERhdGEuY29udHJvbGxlZEltYWdlKCkpCisgICAgaWYgKGNv bnRleHRNZW51Q29udGV4dERhdGEuaXNTZXJ2aWNlc01lbnUoKSB8fCBjb250ZXh0TWVudUNvbnRl eHREYXRhLmNvbnRyb2xsZWRJbWFnZSgpKQogICAgICAgICBhc2tDbGllbnRUb0NoYW5nZU1lbnUg PSBmYWxzZTsKICNlbmRpZgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv V2ViUGFnZVByb3h5LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgK aW5kZXggZThmYmNiMTk4N2EwMGVlMWQ2ZWEyMTk4MDMzYWE5ZmVmZmFiNzZiZS4uZWUzY2ZhOWI2 N2NjNzBkNDBmY2ZlODA5MWMwZWM1ZmQwZWM5YzE1YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9XZWJQYWdlUHJveHkuaApAQCAtMTI2MiwxMiArMTI2Miw4IEBAIHByaXZhdGU6CiAgICAgdm9p ZCBoaWRlUG9wdXBNZW51KCk7CiAKICNpZiBFTkFCTEUoQ09OVEVYVF9NRU5VUykKLSAgICBlbnVt IGNsYXNzIENvbnRleHRNZW51Q2xpZW50RWxpZ2liaWxpdHkgewotICAgICAgICBFbGlnaWJsZUZv ckNsaWVudCwKLSAgICAgICAgTm90RWxpZ2libGVGb3JDbGllbnQKLSAgICB9OwogICAgIHZvaWQg c2hvd0NvbnRleHRNZW51KGNvbnN0IENvbnRleHRNZW51Q29udGV4dERhdGEmLCBjb25zdCBVc2Vy RGF0YSYpOwotICAgIHZvaWQgaW50ZXJuYWxTaG93Q29udGV4dE1lbnUoY29uc3QgQ29udGV4dE1l bnVDb250ZXh0RGF0YSYsIENvbnRleHRNZW51Q2xpZW50RWxpZ2liaWxpdHksIGNvbnN0IFVzZXJE YXRhJik7CisgICAgdm9pZCBpbnRlcm5hbFNob3dDb250ZXh0TWVudShjb25zdCBDb250ZXh0TWVu dUNvbnRleHREYXRhJiwgY29uc3QgVXNlckRhdGEmKTsKICAgICBXZWJDb3JlOjpDb250ZXh0TWVu dUl0ZW0gcGxhdGZvcm1Jbml0aWFsaXplU2hhcmVNZW51SXRlbShjb25zdCBDb250ZXh0TWVudUNv bnRleHREYXRhJik7CiAjZW5kaWYKIApAQCAtMTI3NywxMCArMTI3Myw2IEBAIHByaXZhdGU6CiAj ZW5kaWYKICNlbmRpZgogCi0jaWYgRU5BQkxFKFNFUlZJQ0VfQ09OVFJPTFMpCi0gICAgdm9pZCBz aG93U2VsZWN0aW9uU2VydmljZU1lbnUoY29uc3QgSVBDOjpEYXRhUmVmZXJlbmNlJiBzZWxlY3Rp b25Bc1JURkQsIGNvbnN0IFZlY3RvcjxTdHJpbmc+JiB0ZWxlcGhvbmVOdW1iZXJzLCBib29sIGlz RWRpdGFibGUsIGNvbnN0IFdlYkNvcmU6OkludFBvaW50Jik7Ci0jZW5kaWYKLQogICAgIC8vIFNl YXJjaCBwb3B1cCByZXN1bHRzCiAgICAgdm9pZCBzYXZlUmVjZW50U2VhcmNoZXMoY29uc3QgU3Ry aW5nJiwgY29uc3QgVmVjdG9yPFdlYkNvcmU6OlJlY2VudFNlYXJjaD4mKTsKICAgICB2b2lkIGxv YWRSZWNlbnRTZWFyY2hlcyhjb25zdCBTdHJpbmcmLCBWZWN0b3I8V2ViQ29yZTo6UmVjZW50U2Vh cmNoPiYpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94 eS5tZXNzYWdlcy5pbiBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkubWVz c2FnZXMuaW4KaW5kZXggOTJlNTQ4MzkzNmE3NzQ2Y2UyNGM5YmNmMmY2ZmJjMGI4MWMxYjQxNC4u MzFjMDdjMzBlOGVjN2IzODdjY2Y5ZWE4NWZlNGUwY2RiYTY2OWMwOSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdlcy5pbgorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5Lm1lc3NhZ2VzLmluCkBAIC0yNDcsNyAr MjQ3LDYgQEAgbWVzc2FnZXMgLT4gV2ViUGFnZVByb3h5IHsKICAgICBIaWRlUG9wdXBNZW51KCkK IAogI2lmIEVOQUJMRShDT05URVhUX01FTlVTKQotICAgICMgQ29udGV4dE1lbnUgbWVzc2FnZXMK ICAgICBTaG93Q29udGV4dE1lbnUoV2ViS2l0OjpDb250ZXh0TWVudUNvbnRleHREYXRhIGNvbnRl eHRNZW51Q29udGV4dERhdGEsIFdlYktpdDo6VXNlckRhdGEgdXNlckRhdGEpCiAjZW5kaWYKIApA QCAtNDA4LDEwICs0MDcsNiBAQCBtZXNzYWdlcyAtPiBXZWJQYWdlUHJveHkgewogI2VuZGlmCiAj ZW5kaWYKIAotI2lmIEVOQUJMRShTRVJWSUNFX0NPTlRST0xTKQotICAgIFNob3dTZWxlY3Rpb25T ZXJ2aWNlTWVudShJUEM6OkRhdGFSZWZlcmVuY2Ugc2VsZWN0aW9uQXNSVEZELCBWZWN0b3I8U3Ry aW5nPiB0ZWxlcGhvbmVOdW1iZXJzLCBib29sIGlzRWRpdGFibGUsIFdlYkNvcmU6OkludFBvaW50 IHBvaW50KQotI2VuZGlmCi0KICNpZiBVU0UoUVVJQ0tfTE9PSykKICAgICBEaWRTdGFydExvYWRG b3JRdWlja0xvb2tEb2N1bWVudEluTWFpbkZyYW1lKFN0cmluZyBmaWxlTmFtZSwgU3RyaW5nIHV0 aSkKICAgICBEaWRGaW5pc2hMb2FkRm9yUXVpY2tMb29rRG9jdW1lbnRJbk1haW5GcmFtZShXZWJL aXQ6OlF1aWNrTG9va0RvY3VtZW50RGF0YSBkYXRhKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL21hYy9XZWJDb250ZXh0TWVudVByb3h5TWFjLm1tIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL21hYy9XZWJDb250ZXh0TWVudVByb3h5TWFjLm1tCmluZGV4IDU1ZTEzYzlh MTMzOTZmNzQ4MjM5MTQ0Nzg2MWU0NTdmZTVmM2Y2MDMuLjlkYzQzMTZjNjgxNTAzNmNjYTdjYjc1 MTk5ODQ4MzE3MzU3MTg5MTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9t YWMvV2ViQ29udGV4dE1lbnVQcm94eU1hYy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvbWFjL1dlYkNvbnRleHRNZW51UHJveHlNYWMubW0KQEAgLTMyNyw3ICszMjcsNyBAQCB2b2lk IFdlYkNvbnRleHRNZW51UHJveHlNYWM6OmNsZWFyU2VydmljZXNNZW51KCkKIHZvaWQgV2ViQ29u dGV4dE1lbnVQcm94eU1hYzo6cG9wdWxhdGUoY29uc3QgVmVjdG9yPFJlZlB0cjxXZWJDb250ZXh0 TWVudUl0ZW0+PiYgaXRlbXMpCiB7CiAjaWYgRU5BQkxFKFNFUlZJQ0VfQ09OVFJPTFMpCi0gICAg aWYgKG1fY29udGV4dC5uZWVkc1NlcnZpY2VzTWVudSgpKSB7CisgICAgaWYgKG1fY29udGV4dC5p c1NlcnZpY2VzTWVudSgpKSB7CiAgICAgICAgIHNldHVwU2VydmljZXNNZW51KG1fY29udGV4dCk7 CiAgICAgICAgIHJldHVybjsKICAgICB9CkBAIC0zNDksNyArMzQ5LDcgQEAgdm9pZCBXZWJDb250 ZXh0TWVudVByb3h5TWFjOjpwb3B1bGF0ZShjb25zdCBWZWN0b3I8UmVmUHRyPFdlYkNvbnRleHRN ZW51SXRlbT4+Jgogdm9pZCBXZWJDb250ZXh0TWVudVByb3h5TWFjOjpzaG93Q29udGV4dE1lbnUo Y29uc3QgVmVjdG9yPFJlZlB0cjxXZWJDb250ZXh0TWVudUl0ZW0+PiYgaXRlbXMpCiB7CiAjaWYg RU5BQkxFKFNFUlZJQ0VfQ09OVFJPTFMpCi0gICAgaWYgKGl0ZW1zLmlzRW1wdHkoKSAmJiAhbV9j b250ZXh0Lm5lZWRzU2VydmljZXNNZW51KCkpCisgICAgaWYgKGl0ZW1zLmlzRW1wdHkoKSAmJiAh bV9jb250ZXh0LmlzU2VydmljZXNNZW51KCkpCiAgICAgICAgIHJldHVybjsKICNlbHNlCiAgICAg aWYgKGl0ZW1zLmlzRW1wdHkoKSkKQEAgLTM2NCw3ICszNjQsNyBAQCB2b2lkIFdlYkNvbnRleHRN ZW51UHJveHlNYWM6OnNob3dDb250ZXh0TWVudShjb25zdCBWZWN0b3I8UmVmUHRyPFdlYkNvbnRl eHRNZW51SQogICAgIE5TUmVjdCBtZW51UmVjdCA9IE5TTWFrZVJlY3QobWVudUxvY2F0aW9uLngs IG1lbnVMb2NhdGlvbi55LCAwLCAwKTsKIAogI2lmIEVOQUJMRShTRVJWSUNFX0NPTlRST0xTKQot ICAgIGlmIChtX2NvbnRleHQubmVlZHNTZXJ2aWNlc01lbnUoKSkKKyAgICBpZiAobV9jb250ZXh0 LmlzU2VydmljZXNNZW51KCkpCiAgICAgICAgIFtbV0tTaGFyaW5nU2VydmljZVBpY2tlckRlbGVn YXRlIHNoYXJlZFNoYXJpbmdTZXJ2aWNlUGlja2VyRGVsZWdhdGVdIHNldE1lbnVQcm94eTp0aGlz XTsKIAogICAgIGlmICghbV9zZXJ2aWNlc01lbnUpCkBAIC0zNzYsNyArMzc2LDcgQEAgdm9pZCBX ZWJDb250ZXh0TWVudVByb3h5TWFjOjpzaG93Q29udGV4dE1lbnUoY29uc3QgVmVjdG9yPFJlZlB0 cjxXZWJDb250ZXh0TWVudUkKICAgICAvLyBGSVhNRTogVGhhdCBBUEkgaXMgYmV0dGVyIHRoYW4g V0tQb3B1cENvbnRleHRNZW51LiBJbiB0aGUgZnV0dXJlIGFsbCBtZW51cyBzaG91bGQgdXNlIGVp dGhlciBpdAogICAgIC8vIG9yIHRoZSBbTlNNZW51IHBvcFVwQ29udGV4dE1lbnU6d2l0aEV2ZW50 OmZvclZpZXc6XSBBUEksIGRlcGVuZGluZyBvbiB0aGUgbWVudSB0eXBlLgogICAgIC8vIFRoZW4g d2UgY291bGQgZ2V0IHJpZCBvZiBOU1BvcFVwQnV0dG9uQ2VsbCwgY3VzdG9tIG1ldHJpY3MsIGFu ZCBXS1BvcHVwQ29udGV4dE1lbnUuCi0gICAgaWYgKG1fY29udGV4dC5uZWVkc1NlcnZpY2VzTWVu dSgpKSB7CisgICAgaWYgKG1fY29udGV4dC5pc1NlcnZpY2VzTWVudSgpKSB7CiAgICAgICAgIFtt ZW51IHBvcFVwTWVudVBvc2l0aW9uaW5nSXRlbTpuaWwgYXRMb2NhdGlvbjptZW51TG9jYXRpb24g aW5WaWV3Om1fd2ViVmlld107CiAgICAgICAgIGhpZGVDb250ZXh0TWVudSgpOwogICAgICAgICBy ZXR1cm47CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dlYlBhZ2VQ cm94eU1hYy5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV2ViUGFnZVByb3h5TWFj Lm1tCmluZGV4IDNjNDI5ZTQ2Y2RhMmFhYjI0NTNjOWMxNDYyYzMwOGFmNWQ4ZGVjYjEuLjVlMDI1 NzM4ZmY0ODI4ZDEwYmQ2Y2QwZjdhNDMxNjNjZWRlMWQwN2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV2ViUGFnZVByb3h5TWFjLm1tCisrKyBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9tYWMvV2ViUGFnZVByb3h5TWFjLm1tCkBAIC02ODQsMTYgKzY4NCw2IEBA IHZvaWQgV2ViUGFnZVByb3h5OjpzaG93VGVsZXBob25lTnVtYmVyTWVudShjb25zdCBTdHJpbmcm IHRlbGVwaG9uZU51bWJlciwgY29uc3QKIH0KICNlbmRpZgogCi0jaWYgRU5BQkxFKFNFUlZJQ0Vf Q09OVFJPTFMpCi12b2lkIFdlYlBhZ2VQcm94eTo6c2hvd1NlbGVjdGlvblNlcnZpY2VNZW51KGNv bnN0IElQQzo6RGF0YVJlZmVyZW5jZSYgc2VsZWN0aW9uQXNSVEZELCBjb25zdCBWZWN0b3I8U3Ry aW5nPiYgdGVsZXBob25lTnVtYmVycywgYm9vbCBpc0VkaXRhYmxlLCBjb25zdCBJbnRQb2ludCYg cG9pbnQpCi17Ci0gICAgVmVjdG9yPFdlYkNvbnRleHRNZW51SXRlbURhdGE+IGl0ZW1zOwotICAg IENvbnRleHRNZW51Q29udGV4dERhdGEgY29udGV4dERhdGEocG9pbnQsIGl0ZW1zLCBzZWxlY3Rp b25Bc1JURkQudmVjdG9yKCksIHRlbGVwaG9uZU51bWJlcnMsIGlzRWRpdGFibGUpOwotCi0gICAg aW50ZXJuYWxTaG93Q29udGV4dE1lbnUoY29udGV4dERhdGEsIENvbnRleHRNZW51Q2xpZW50RWxp Z2liaWxpdHk6Ok5vdEVsaWdpYmxlRm9yQ2xpZW50LCBVc2VyRGF0YSgpKTsKLX0KLSNlbmRpZgot CiBDR1JlY3QgV2ViUGFnZVByb3h5Ojpib3VuZHNPZkxheWVySW5MYXllckJhY2tlZFdpbmRvd0Nv b3JkaW5hdGVzKENBTGF5ZXIgKmxheWVyKSBjb25zdAogewogICAgIHJldHVybiBtX3BhZ2VDbGll bnQuYm91bmRzT2ZMYXllckluTGF5ZXJCYWNrZWRXaW5kb3dDb29yZGluYXRlcyhsYXllcik7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1dlYlBhZ2VN YWMubW0gYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1dlYlBhZ2VNYWMu bW0KaW5kZXggMTFlZWNhOWE4MjI1NGI0ZDZmYjUzNTU3ZjgyYjNiY2FjMGIyYmY2ZC4uNzRiYWNi ZTZhYTQzYmUyNjk5MzM5NzJlZTdiOWZkMmYzNTYyM2FiYyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9XZWJQYWdlTWFjLm1tCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvV2ViUGFnZU1hYy5tbQpAQCAtMjksNiArMjks NyBAQAogI2lmIFBMQVRGT1JNKE1BQykKIAogI2ltcG9ydCAiQXR0cmlidXRlZFN0cmluZy5oIgor I2ltcG9ydCAiQ29udGV4dE1lbnVDb250ZXh0RGF0YS5oIgogI2ltcG9ydCAiRGF0YVJlZmVyZW5j ZS5oIgogI2ltcG9ydCAiRWRpdGluZ1JhbmdlLmgiCiAjaW1wb3J0ICJFZGl0b3JTdGF0ZS5oIgpA QCAtMTA1NiwxMSArMTA1NywxMiBAQCB2b2lkIFdlYlBhZ2U6OmhhbmRsZVNlbGVjdGlvblNlcnZp Y2VDbGljayhGcmFtZVNlbGVjdGlvbiYgc2VsZWN0aW9uLCBjb25zdCBWZWN0bwogICAgIGlmICgh YXR0cmlidXRlZFNlbGVjdGlvbikKICAgICAgICAgcmV0dXJuOwogCi0gICAgTlNEYXRhICpzZWxl Y3Rpb25EYXRhID0gW2F0dHJpYnV0ZWRTZWxlY3Rpb24gUlRGREZyb21SYW5nZTpOU01ha2VSYW5n ZSgwLCBbYXR0cmlidXRlZFNlbGVjdGlvbiBsZW5ndGhdKSBkb2N1bWVudEF0dHJpYnV0ZXM6QHsg fV07Ci0gICAgSVBDOjpEYXRhUmVmZXJlbmNlIGRhdGEgPSBJUEM6OkRhdGFSZWZlcmVuY2UocmVp bnRlcnByZXRfY2FzdDxjb25zdCB1aW50OF90Kj4oW3NlbGVjdGlvbkRhdGEgYnl0ZXNdKSwgW3Nl bGVjdGlvbkRhdGEgbGVuZ3RoXSk7Ci0gICAgYm9vbCBpc0VkaXRhYmxlID0gc2VsZWN0aW9uLnNl bGVjdGlvbigpLmlzQ29udGVudEVkaXRhYmxlKCk7CisgICAgTlNEYXRhICpzZWxlY3Rpb25EYXRh ID0gW2F0dHJpYnV0ZWRTZWxlY3Rpb24gUlRGREZyb21SYW5nZTpOU01ha2VSYW5nZSgwLCBhdHRy aWJ1dGVkU2VsZWN0aW9uLmxlbmd0aCkgZG9jdW1lbnRBdHRyaWJ1dGVzOkB7IH1dOwogCi0gICAg c2VuZChNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpTaG93U2VsZWN0aW9uU2VydmljZU1lbnUoZGF0 YSwgcGhvbmVOdW1iZXJzLCBpc0VkaXRhYmxlLCBwb2ludCkpOworICAgIFZlY3Rvcjx1aW50OF90 PiBzZWxlY3Rpb25EYXRhVmVjdG9yOworICAgIHNlbGVjdGlvbkRhdGFWZWN0b3IuYXBwZW5kKHJl aW50ZXJwcmV0X2Nhc3Q8Y29uc3QgdWludDhfdCo+KHNlbGVjdGlvbkRhdGEuYnl0ZXMpLCBzZWxl Y3Rpb25EYXRhLmxlbmd0aCk7CisKKyAgICBzZW5kKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OlNo b3dDb250ZXh0TWVudShDb250ZXh0TWVudUNvbnRleHREYXRhKHBvaW50LCBzZWxlY3Rpb25EYXRh VmVjdG9yLCBwaG9uZU51bWJlcnMsIHNlbGVjdGlvbi5zZWxlY3Rpb24oKS5pc0NvbnRlbnRFZGl0 YWJsZSgpKSwgVXNlckRhdGEoKSkpOwogfQogI2VuZGlmCiAK