150196 2015-10-15 15:50:53 -0700 Use the context inside WebContextMenuProxyMac 2015-10-15 15:52:08 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 1133642 0 andersca 2015-10-15 15:50:53 -0700 Use the context inside WebContextMenuProxyMac 1133643 1 263210 andersca 2015-10-15 15:51:10 -0700 Created attachment 263210 Patch 1133645 2 andersca 2015-10-15 15:52:08 -0700 Committed r191144: <http://trac.webkit.org/changeset/191144> 263210 2015-10-15 15:51:10 -0700 2015-10-15 15:51:47 -0700 Patch bug-150196-20151015155031.patch text/plain 6260 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTkxMTQzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggOTE4NDk5NDQzNGI3ZmU0 Yjc2YmZjZmVjYzg5NzRkM2RhZTA0OTlmOS4uNGIxNWZiYjE2MDRkMTMxODA3YWE2OWNkMDEyY2Yz YzY2ZDI1YTAzNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIwIEBACiAyMDE1LTEwLTE1ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgVXNlIHRoZSBjb250 ZXh0IGluc2lkZSBXZWJDb250ZXh0TWVudVByb3h5TWFjCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTAxOTYKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJDb250ZXh0TWVudVByb3h5 Lmg6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHA6CisgICAgICAgIChXZWJL aXQ6OldlYlBhZ2VQcm94eTo6aW50ZXJuYWxTaG93Q29udGV4dE1lbnUpOgorICAgICAgICAqIFVJ UHJvY2Vzcy9tYWMvV2ViQ29udGV4dE1lbnVQcm94eU1hYy5oOgorICAgICAgICAqIFVJUHJvY2Vz cy9tYWMvV2ViQ29udGV4dE1lbnVQcm94eU1hYy5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViQ29u dGV4dE1lbnVQcm94eU1hYzo6cG9wdWxhdGUpOgorICAgICAgICAoV2ViS2l0OjpXZWJDb250ZXh0 TWVudVByb3h5TWFjOjpzaG93Q29udGV4dE1lbnUpOgorCisyMDE1LTEwLTE1ICBBbmRlcnMgQ2Fy bHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKICAgICAgICAgVXNlIHRoZSBjb250ZXh0IG1l bnUgbG9jYXRpb24gdGhhdCdzIHN0b3JlZCBpbiB0aGUgY29udGV4dCBkYXRhCiAgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTAxOTQKIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkNvbnRleHRNZW51UHJveHkuaCBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJDb250ZXh0TWVudVByb3h5LmgKaW5kZXggMWYzYzRhM2E4 MjA3ZTgyOGZlOWRiY2RhMTM3YTk1OTk4ZTM2YzNkZC4uMzFlNTkzZGQyN2VmNDA4OTJjYmMxMjVj NDNmMWJmMjc4MWE5NmQ5ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dl YkNvbnRleHRNZW51UHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQ29u dGV4dE1lbnVQcm94eS5oCkBAIC0zOSw3ICszOSw3IEBAIGNsYXNzIFdlYkNvbnRleHRNZW51UHJv eHkgOiBwdWJsaWMgUmVmQ291bnRlZDxXZWJDb250ZXh0TWVudVByb3h5PiB7CiBwdWJsaWM6CiAg ICAgdmlydHVhbCB+V2ViQ29udGV4dE1lbnVQcm94eSgpOwogCi0gICAgdmlydHVhbCB2b2lkIHNo b3dDb250ZXh0TWVudShjb25zdCBWZWN0b3I8UmVmUHRyPFdlYkNvbnRleHRNZW51SXRlbT4+Jiwg Y29uc3QgQ29udGV4dE1lbnVDb250ZXh0RGF0YSYpID0gMDsKKyAgICB2aXJ0dWFsIHZvaWQgc2hv d0NvbnRleHRNZW51KGNvbnN0IFZlY3RvcjxSZWZQdHI8V2ViQ29udGV4dE1lbnVJdGVtPj4mKSA9 IDA7CiAgICAgdmlydHVhbCB2b2lkIGhpZGVDb250ZXh0TWVudSgpID0gMDsKICAgICB2aXJ0dWFs IHZvaWQgY2FuY2VsVHJhY2tpbmcoKSB7IH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vi UGFnZVByb3h5LmNwcAppbmRleCA5ODVhMGVmZGEzN2M0OGIxYzYxYzIyZTQzOTg3Zjc4NTJjZmIw NGU5Li4wNGVmY2Q2NThmMzE0ZTQzNDA4MjQwMjMxOTJjMDEzYzNjN2E1NWRkIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcApAQCAtNDIzNiw3ICs0MjM2LDcgQEAg dm9pZCBXZWJQYWdlUHJveHk6OmludGVybmFsU2hvd0NvbnRleHRNZW51KGNvbnN0IENvbnRleHRN ZW51Q29udGV4dERhdGEmIGNvbnRleHQKIAogICAgIGNvbnN0IFZlY3RvcjxSZWZQdHI8V2ViQ29u dGV4dE1lbnVJdGVtPj4mIGl0ZW1zVG9TaG93ID0gdXNlUHJvcG9zZWRJdGVtcyA/IHByb3Bvc2Vk QVBJSXRlbXMgOiBjbGllbnRJdGVtczsKICAgICBpZiAoIW1fY29udGV4dE1lbnVDbGllbnQtPnNo b3dDb250ZXh0TWVudSgqdGhpcywgY29udGV4dE1lbnVDb250ZXh0RGF0YS5tZW51TG9jYXRpb24o KSwgaXRlbXNUb1Nob3cpKQotICAgICAgICBtX2FjdGl2ZUNvbnRleHRNZW51LT5zaG93Q29udGV4 dE1lbnUoaXRlbXNUb1Nob3csIGNvbnRleHRNZW51Q29udGV4dERhdGEpOworICAgICAgICBtX2Fj dGl2ZUNvbnRleHRNZW51LT5zaG93Q29udGV4dE1lbnUoaXRlbXNUb1Nob3cpOwogCiAgICAgbV9j b250ZXh0TWVudUNsaWVudC0+Y29udGV4dE1lbnVEaXNtaXNzZWQoKnRoaXMpOwogfQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XZWJDb250ZXh0TWVudVByb3h5TWFj LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dlYkNvbnRleHRNZW51UHJveHlNYWMu aAppbmRleCAyNDViMDZhMmY2OGEyM2U2ZTExZTI1OWJkYWU1YTI3YTQ4OTgzZDNlLi43N2I5ZjE4 MTc2NDljNTk4MjMyYzk5OGQ1MzczOTcyZGQyOWU5NjVmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvbWFjL1dlYkNvbnRleHRNZW51UHJveHlNYWMuaAorKysgYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dlYkNvbnRleHRNZW51UHJveHlNYWMuaApAQCAtNTAsNyAr NTAsNyBAQCBwdWJsaWM6CiAgICAgfQogICAgIH5XZWJDb250ZXh0TWVudVByb3h5TWFjKCk7CiAK LSAgICB2aXJ0dWFsIHZvaWQgc2hvd0NvbnRleHRNZW51KGNvbnN0IFZlY3RvcjxSZWZQdHI8V2Vi Q29udGV4dE1lbnVJdGVtPj4mLCBjb25zdCBDb250ZXh0TWVudUNvbnRleHREYXRhJikgb3ZlcnJp ZGU7CisgICAgdmlydHVhbCB2b2lkIHNob3dDb250ZXh0TWVudShjb25zdCBWZWN0b3I8UmVmUHRy PFdlYkNvbnRleHRNZW51SXRlbT4+Jikgb3ZlcnJpZGU7CiAKICAgICB2aXJ0dWFsIHZvaWQgaGlk ZUNvbnRleHRNZW51KCkgb3ZlcnJpZGU7CiAgICAgdmlydHVhbCB2b2lkIGNhbmNlbFRyYWNraW5n KCkgb3ZlcnJpZGU7CkBAIC02Nyw3ICs2Nyw3IEBAIHB1YmxpYzoKIHByaXZhdGU6CiAgICAgV2Vi Q29udGV4dE1lbnVQcm94eU1hYyhXS1ZpZXcqLCBXZWJQYWdlUHJveHkmLCBjb25zdCBDb250ZXh0 TWVudUNvbnRleHREYXRhJiwgY29uc3QgVXNlckRhdGEmKTsKIAotICAgIHZvaWQgcG9wdWxhdGUo Y29uc3QgVmVjdG9yPFJlZlB0cjxXZWJDb250ZXh0TWVudUl0ZW0+PiYsIGNvbnN0IENvbnRleHRN ZW51Q29udGV4dERhdGEmKTsKKyAgICB2b2lkIHBvcHVsYXRlKGNvbnN0IFZlY3RvcjxSZWZQdHI8 V2ViQ29udGV4dE1lbnVJdGVtPj4mKTsKIAogI2lmIEVOQUJMRShTRVJWSUNFX0NPTlRST0xTKQog ICAgIHZvaWQgc2V0dXBTZXJ2aWNlc01lbnUoY29uc3QgQ29udGV4dE1lbnVDb250ZXh0RGF0YSYp OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XZWJDb250ZXh0TWVu dVByb3h5TWFjLm1tIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XZWJDb250ZXh0TWVu dVByb3h5TWFjLm1tCmluZGV4IDg5YjViNTcwNGY3NGRkMDU0ZWFhYTc5MDRhMzE5NDcxNjA0MmQw N2UuLjU1ZTEzYzlhMTMzOTZmNzQ4MjM5MTQ0Nzg2MWU0NTdmZTVmM2Y2MDMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV2ViQ29udGV4dE1lbnVQcm94eU1hYy5tbQor KysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dlYkNvbnRleHRNZW51UHJveHlNYWMu bW0KQEAgLTMyNCwxMSArMzI0LDExIEBAIHZvaWQgV2ViQ29udGV4dE1lbnVQcm94eU1hYzo6Y2xl YXJTZXJ2aWNlc01lbnUoKQogfQogI2VuZGlmCiAKLXZvaWQgV2ViQ29udGV4dE1lbnVQcm94eU1h Yzo6cG9wdWxhdGUoY29uc3QgVmVjdG9yPFJlZlB0cjxXZWJDb250ZXh0TWVudUl0ZW0+PiYgaXRl bXMsIGNvbnN0IENvbnRleHRNZW51Q29udGV4dERhdGEmIGNvbnRleHQpCit2b2lkIFdlYkNvbnRl eHRNZW51UHJveHlNYWM6OnBvcHVsYXRlKGNvbnN0IFZlY3RvcjxSZWZQdHI8V2ViQ29udGV4dE1l bnVJdGVtPj4mIGl0ZW1zKQogewogI2lmIEVOQUJMRShTRVJWSUNFX0NPTlRST0xTKQotICAgIGlm IChjb250ZXh0Lm5lZWRzU2VydmljZXNNZW51KCkpIHsKLSAgICAgICAgc2V0dXBTZXJ2aWNlc01l bnUoY29udGV4dCk7CisgICAgaWYgKG1fY29udGV4dC5uZWVkc1NlcnZpY2VzTWVudSgpKSB7Cisg ICAgICAgIHNldHVwU2VydmljZXNNZW51KG1fY29udGV4dCk7CiAgICAgICAgIHJldHVybjsKICAg ICB9CiAjZW5kaWYKQEAgLTM0NiwxNyArMzQ2LDE3IEBAIHZvaWQgV2ViQ29udGV4dE1lbnVQcm94 eU1hYzo6cG9wdWxhdGUoY29uc3QgVmVjdG9yPFJlZlB0cjxXZWJDb250ZXh0TWVudUl0ZW0+PiYK ICAgICBwb3B1bGF0ZU5TTWVudShtZW51LCBuc01lbnVJdGVtVmVjdG9yKGl0ZW1zKSk7CiB9CiAK LXZvaWQgV2ViQ29udGV4dE1lbnVQcm94eU1hYzo6c2hvd0NvbnRleHRNZW51KGNvbnN0IFZlY3Rv cjxSZWZQdHI8V2ViQ29udGV4dE1lbnVJdGVtPj4mIGl0ZW1zLCBjb25zdCBDb250ZXh0TWVudUNv bnRleHREYXRhJiBjb250ZXh0KQordm9pZCBXZWJDb250ZXh0TWVudVByb3h5TWFjOjpzaG93Q29u dGV4dE1lbnUoY29uc3QgVmVjdG9yPFJlZlB0cjxXZWJDb250ZXh0TWVudUl0ZW0+PiYgaXRlbXMp CiB7CiAjaWYgRU5BQkxFKFNFUlZJQ0VfQ09OVFJPTFMpCi0gICAgaWYgKGl0ZW1zLmlzRW1wdHko KSAmJiAhY29udGV4dC5uZWVkc1NlcnZpY2VzTWVudSgpKQorICAgIGlmIChpdGVtcy5pc0VtcHR5 KCkgJiYgIW1fY29udGV4dC5uZWVkc1NlcnZpY2VzTWVudSgpKQogICAgICAgICByZXR1cm47CiAj ZWxzZQogICAgIGlmIChpdGVtcy5pc0VtcHR5KCkpCiAgICAgICAgIHJldHVybjsKICNlbmRpZgog Ci0gICAgcG9wdWxhdGUoaXRlbXMsIGNvbnRleHQpOworICAgIHBvcHVsYXRlKGl0ZW1zKTsKIAog ICAgIFtbV0tNZW51VGFyZ2V0IHNoYXJlZE1lbnVUYXJnZXRdIHNldE1lbnVQcm94eTp0aGlzXTsK IApAQCAtMzY0LDcgKzM2NCw3IEBAIHZvaWQgV2ViQ29udGV4dE1lbnVQcm94eU1hYzo6c2hvd0Nv bnRleHRNZW51KGNvbnN0IFZlY3RvcjxSZWZQdHI8V2ViQ29udGV4dE1lbnVJCiAgICAgTlNSZWN0 IG1lbnVSZWN0ID0gTlNNYWtlUmVjdChtZW51TG9jYXRpb24ueCwgbWVudUxvY2F0aW9uLnksIDAs IDApOwogCiAjaWYgRU5BQkxFKFNFUlZJQ0VfQ09OVFJPTFMpCi0gICAgaWYgKGNvbnRleHQubmVl ZHNTZXJ2aWNlc01lbnUoKSkKKyAgICBpZiAobV9jb250ZXh0Lm5lZWRzU2VydmljZXNNZW51KCkp CiAgICAgICAgIFtbV0tTaGFyaW5nU2VydmljZVBpY2tlckRlbGVnYXRlIHNoYXJlZFNoYXJpbmdT ZXJ2aWNlUGlja2VyRGVsZWdhdGVdIHNldE1lbnVQcm94eTp0aGlzXTsKIAogICAgIGlmICghbV9z ZXJ2aWNlc01lbnUpCkBAIC0zNzYsNyArMzc2LDcgQEAgdm9pZCBXZWJDb250ZXh0TWVudVByb3h5 TWFjOjpzaG93Q29udGV4dE1lbnUoY29uc3QgVmVjdG9yPFJlZlB0cjxXZWJDb250ZXh0TWVudUkK ICAgICAvLyBGSVhNRTogVGhhdCBBUEkgaXMgYmV0dGVyIHRoYW4gV0tQb3B1cENvbnRleHRNZW51 LiBJbiB0aGUgZnV0dXJlIGFsbCBtZW51cyBzaG91bGQgdXNlIGVpdGhlciBpdAogICAgIC8vIG9y IHRoZSBbTlNNZW51IHBvcFVwQ29udGV4dE1lbnU6d2l0aEV2ZW50OmZvclZpZXc6XSBBUEksIGRl cGVuZGluZyBvbiB0aGUgbWVudSB0eXBlLgogICAgIC8vIFRoZW4gd2UgY291bGQgZ2V0IHJpZCBv ZiBOU1BvcFVwQnV0dG9uQ2VsbCwgY3VzdG9tIG1ldHJpY3MsIGFuZCBXS1BvcHVwQ29udGV4dE1l bnUuCi0gICAgaWYgKGNvbnRleHQubmVlZHNTZXJ2aWNlc01lbnUoKSkgeworICAgIGlmIChtX2Nv bnRleHQubmVlZHNTZXJ2aWNlc01lbnUoKSkgewogICAgICAgICBbbWVudSBwb3BVcE1lbnVQb3Np dGlvbmluZ0l0ZW06bmlsIGF0TG9jYXRpb246bWVudUxvY2F0aW9uIGluVmlldzptX3dlYlZpZXdd OwogICAgICAgICBoaWRlQ29udGV4dE1lbnUoKTsKICAgICAgICAgcmV0dXJuOwo=