150418 2015-10-21 14:55:20 -0700 WebContextMenuProxyMac::setupServicesMenu doesn't need to take a context parameter 2015-10-21 15:17:50 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 1135408 0 andersca 2015-10-21 14:55:20 -0700 WebContextMenuProxyMac::setupServicesMenu doesn't need to take a context parameter 1135409 1 263744 andersca 2015-10-21 14:55:33 -0700 Created attachment 263744 Patch 1135423 2 andersca 2015-10-21 15:17:50 -0700 Committed r191407: <http://trac.webkit.org/changeset/191407> 263744 2015-10-21 14:55:33 -0700 2015-10-21 15:15:44 -0700 Patch bug-150418-20151021145449.patch text/plain 4561 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTkxNDAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZjYxYTUwN2FmZmEwODdj ZmJlZTZlNWQwYWYwOGRkMTI5MDZiZjY4Ni4uZDAzNDRiMzI2ZWU0ZjA3OTM2MzcxZjhmYjc5NzQ5 YzQwMDk3ZTRjMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE3IEBACiAyMDE1LTEwLTIxICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgV2ViQ29udGV4dE1l bnVQcm94eU1hYzo6c2V0dXBTZXJ2aWNlc01lbnUgZG9lc24ndCBuZWVkIHRvIHRha2UgYSBjb250 ZXh0IHBhcmFtZXRlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTUwNDE4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBVSVByb2Nlc3MvbWFjL1dlYkNvbnRleHRNZW51UHJveHlNYWMuaDoKKyAgICAgICAg KiBVSVByb2Nlc3MvbWFjL1dlYkNvbnRleHRNZW51UHJveHlNYWMubW06CisgICAgICAgIChXZWJL aXQ6OldlYkNvbnRleHRNZW51UHJveHlNYWM6OnNldHVwU2VydmljZXNNZW51KToKKyAgICAgICAg KFdlYktpdDo6V2ViQ29udGV4dE1lbnVQcm94eU1hYzo6cG9wdWxhdGUpOgorCisyMDE1LTEwLTIx ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKICAgICAgICAgV2ViQ29u dGV4dE1lbnVQcm94eSBkb2Vzbid0IGhhdmUgdG8gYmUgcmVmLWNvdW50ZWQKICAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MDQxNQogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dlYkNvbnRleHRNZW51UHJveHlNYWMuaCBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV2ViQ29udGV4dE1lbnVQcm94eU1hYy5oCmlu ZGV4IDlhNzFhZjMxMjIwNjE2OTAyOThhMTZjNDFhZDQ5NzFlODFlNzE3ZDEuLjc0M2RiZTlhMGZl YmE1Yjk4ZWQzZWJhMmM2MDZkNjQ2ZTIyYmQ3ZGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9tYWMvV2ViQ29udGV4dE1lbnVQcm94eU1hYy5oCisrKyBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9tYWMvV2ViQ29udGV4dE1lbnVQcm94eU1hYy5oCkBAIC02Miw3ICs2Miw3 IEBAIHByaXZhdGU6CiAgICAgdm9pZCBwb3B1bGF0ZShjb25zdCBWZWN0b3I8UmVmUHRyPFdlYkNv bnRleHRNZW51SXRlbT4+Jik7CiAKICNpZiBFTkFCTEUoU0VSVklDRV9DT05UUk9MUykKLSAgICB2 b2lkIHNldHVwU2VydmljZXNNZW51KGNvbnN0IENvbnRleHRNZW51Q29udGV4dERhdGEmKTsKKyAg ICB2b2lkIHNldHVwU2VydmljZXNNZW51KCk7CiAgICAgV2ViQ29yZTo6Q29udGV4dE1lbnVJdGVt IHNoYXJlTWVudUl0ZW0oKTsKICNlbmRpZgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvbWFjL1dlYkNvbnRleHRNZW51UHJveHlNYWMubW0gYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvbWFjL1dlYkNvbnRleHRNZW51UHJveHlNYWMubW0KaW5kZXggN2VlZjM0ZDc2OTVi OWYyMzUxMmM5M2M3OTFkZmM4NzQzNTA4YWIxMy4uODFjZThjNTYxMzcyMmMxNjczNjhjN2Y5NzZm ODJjZWZjZDYxZmJkZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9X ZWJDb250ZXh0TWVudVByb3h5TWFjLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9t YWMvV2ViQ29udGV4dE1lbnVQcm94eU1hYy5tbQpAQCAtMjQ4LDEzICsyNDgsMTMgQEAgdGVtcGxh dGU8dHlwZW5hbWUgSXRlbVR5cGU+IHN0YXRpYyBWZWN0b3I8UmV0YWluUHRyPE5TTWVudUl0ZW0+ PiBuc01lbnVJdGVtVmVjdG8KIH0KIAogI2lmIEVOQUJMRShTRVJWSUNFX0NPTlRST0xTKQotdm9p ZCBXZWJDb250ZXh0TWVudVByb3h5TWFjOjpzZXR1cFNlcnZpY2VzTWVudShjb25zdCBDb250ZXh0 TWVudUNvbnRleHREYXRhJiBjb250ZXh0KQordm9pZCBXZWJDb250ZXh0TWVudVByb3h5TWFjOjpz ZXR1cFNlcnZpY2VzTWVudSgpCiB7Ci0gICAgYm9vbCBpbmNsdWRlRWRpdG9yU2VydmljZXMgPSBj b250ZXh0LmNvbnRyb2xsZWREYXRhSXNFZGl0YWJsZSgpOwotICAgIGJvb2wgaGFzQ29udHJvbGxl ZEltYWdlID0gY29udGV4dC5jb250cm9sbGVkSW1hZ2UoKTsKKyAgICBib29sIGluY2x1ZGVFZGl0 b3JTZXJ2aWNlcyA9IG1fY29udGV4dC5jb250cm9sbGVkRGF0YUlzRWRpdGFibGUoKTsKKyAgICBi b29sIGhhc0NvbnRyb2xsZWRJbWFnZSA9IG1fY29udGV4dC5jb250cm9sbGVkSW1hZ2UoKTsKICAg ICBOU0FycmF5ICppdGVtcyA9IG5pbDsKICAgICBpZiAoaGFzQ29udHJvbGxlZEltYWdlKSB7Ci0g ICAgICAgIFJlZlB0cjxTaGFyZWFibGVCaXRtYXA+IGltYWdlID0gY29udGV4dC5jb250cm9sbGVk SW1hZ2UoKTsKKyAgICAgICAgUmVmUHRyPFNoYXJlYWJsZUJpdG1hcD4gaW1hZ2UgPSBtX2NvbnRl eHQuY29udHJvbGxlZEltYWdlKCk7CiAgICAgICAgIGlmICghaW1hZ2UpCiAgICAgICAgICAgICBy ZXR1cm47CiAKQEAgLTI2Nyw5ICsyNjcsOSBAQCB2b2lkIFdlYkNvbnRleHRNZW51UHJveHlNYWM6 OnNldHVwU2VydmljZXNNZW51KGNvbnN0IENvbnRleHRNZW51Q29udGV4dERhdGEmIGNvbgogI2Vs c2UKICAgICAgICAgaXRlbXMgPSBAWyBdOwogI2VuZGlmCi0gICAgfSBlbHNlIGlmICghY29udGV4 dC5jb250cm9sbGVkU2VsZWN0aW9uRGF0YSgpLmlzRW1wdHkoKSkgewotICAgICAgICBSZXRhaW5Q dHI8TlNEYXRhPiBzZWxlY3Rpb25EYXRhID0gYWRvcHROUyhbW05TRGF0YSBhbGxvY10gaW5pdFdp dGhCeXRlczoodm9pZCopY29udGV4dC5jb250cm9sbGVkU2VsZWN0aW9uRGF0YSgpLmRhdGEoKSBs ZW5ndGg6Y29udGV4dC5jb250cm9sbGVkU2VsZWN0aW9uRGF0YSgpLnNpemUoKV0pOwotICAgICAg ICBSZXRhaW5QdHI8TlNBdHRyaWJ1dGVkU3RyaW5nPiBzZWxlY3Rpb24gPSBhZG9wdE5TKFtbTlNB dHRyaWJ1dGVkU3RyaW5nIGFsbG9jXSBpbml0V2l0aFJURkQ6c2VsZWN0aW9uRGF0YS5nZXQoKSBk b2N1bWVudEF0dHJpYnV0ZXM6bmlsXSk7CisgICAgfSBlbHNlIGlmICghbV9jb250ZXh0LmNvbnRy b2xsZWRTZWxlY3Rpb25EYXRhKCkuaXNFbXB0eSgpKSB7CisgICAgICAgIGF1dG8gc2VsZWN0aW9u RGF0YSA9IGFkb3B0TlMoW1tOU0RhdGEgYWxsb2NdIGluaXRXaXRoQnl0ZXM6c3RhdGljX2Nhc3Q8 Y29uc3Qgdm9pZCo+KG1fY29udGV4dC5jb250cm9sbGVkU2VsZWN0aW9uRGF0YSgpLmRhdGEoKSkg bGVuZ3RoOm1fY29udGV4dC5jb250cm9sbGVkU2VsZWN0aW9uRGF0YSgpLnNpemUoKV0pOworICAg ICAgICBhdXRvIHNlbGVjdGlvbiA9IGFkb3B0TlMoW1tOU0F0dHJpYnV0ZWRTdHJpbmcgYWxsb2Nd IGluaXRXaXRoUlRGRDpzZWxlY3Rpb25EYXRhLmdldCgpIGRvY3VtZW50QXR0cmlidXRlczpuaWxd KTsKIAogICAgICAgICBpdGVtcyA9IEBbIHNlbGVjdGlvbi5nZXQoKSBdOwogICAgIH0gZWxzZSB7 CkBAIC0yOTAsOSArMjkwLDkgQEAgdm9pZCBXZWJDb250ZXh0TWVudVByb3h5TWFjOjpzZXR1cFNl cnZpY2VzTWVudShjb25zdCBDb250ZXh0TWVudUNvbnRleHREYXRhJiBjb24KICAgICAgICAgW21f bWVudSBzZXRTaG93c1N0YXRlQ29sdW1uOllFU107CiAKICAgICAvLyBFeHBsaWNpdGx5IGFkZCBh IG1lbnUgaXRlbSBmb3IgZWFjaCB0ZWxlcGhvbmUgbnVtYmVyIHRoYXQgaXMgaW4gdGhlIHNlbGVj dGlvbi4KLSAgICBjb25zdCBWZWN0b3I8U3RyaW5nPiYgc2VsZWN0ZWRUZWxlcGhvbmVOdW1iZXJz ID0gY29udGV4dC5zZWxlY3RlZFRlbGVwaG9uZU51bWJlcnMoKTsKICAgICBWZWN0b3I8UmV0YWlu UHRyPE5TTWVudUl0ZW0+PiB0ZWxlcGhvbmVOdW1iZXJNZW51SXRlbXM7Ci0gICAgZm9yIChhdXRv JiB0ZWxlcGhvbmVOdW1iZXIgOiBzZWxlY3RlZFRlbGVwaG9uZU51bWJlcnMpIHsKKworICAgIGZv ciAoYXV0byYgdGVsZXBob25lTnVtYmVyIDogbV9jb250ZXh0LnNlbGVjdGVkVGVsZXBob25lTnVt YmVycygpKSB7CiAgICAgICAgIGlmIChOU01lbnVJdGVtICppdGVtID0gbWVudUl0ZW1Gb3JUZWxl cGhvbmVOdW1iZXIodGVsZXBob25lTnVtYmVyKSkgewogICAgICAgICAgICAgW2l0ZW0gc2V0SW5k ZW50YXRpb25MZXZlbDoxXTsKICAgICAgICAgICAgIHRlbGVwaG9uZU51bWJlck1lbnVJdGVtcy5h cHBlbmQoaXRlbSk7CkBAIC0zNjQsNyArMzY0LDcgQEAgdm9pZCBXZWJDb250ZXh0TWVudVByb3h5 TWFjOjpwb3B1bGF0ZShjb25zdCBWZWN0b3I8UmVmUHRyPFdlYkNvbnRleHRNZW51SXRlbT4+Jgog ewogI2lmIEVOQUJMRShTRVJWSUNFX0NPTlRST0xTKQogICAgIGlmIChtX2NvbnRleHQuaXNTZXJ2 aWNlc01lbnUoKSkgewotICAgICAgICBzZXR1cFNlcnZpY2VzTWVudShtX2NvbnRleHQpOworICAg ICAgICBzZXR1cFNlcnZpY2VzTWVudSgpOwogICAgICAgICByZXR1cm47CiAgICAgfQogI2VuZGlm Cg==