150420 2015-10-21 15:45:23 -0700 Move services menu handling out into a separate function 2015-10-21 16:15:11 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 1135436 0 andersca 2015-10-21 15:45:23 -0700 Move services menu handling out into a separate function 1135437 1 263753 andersca 2015-10-21 15:48:02 -0700 Created attachment 263753 Patch 1135450 2 andersca 2015-10-21 16:15:11 -0700 Committed r191412: <http://trac.webkit.org/changeset/191412> 263753 2015-10-21 15:48:02 -0700 2015-10-21 16:07:13 -0700 Patch bug-150420-20151021154718.patch text/plain 5255 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTkxNDA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggODMxYTY4NDRiNDhjYzlm ZDlhZGY0NmYyZjEzM2NkM2UyZDEzODA2MS4uNDQxMzZiOTllZWFjN2RkZjczOGQ4OTRhNWY5ZWM2 ZTIwZjBlM2U2YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE5IEBACiAyMDE1LTEwLTIxICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgTW92ZSBzZXJ2aWNl cyBtZW51IGhhbmRsaW5nIG91dCBpbnRvIGEgc2VwYXJhdGUgZnVuY3Rpb24KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MDQyMAorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVUlQcm9jZXNzL21hYy9XZWJD b250ZXh0TWVudVByb3h5TWFjLmg6CisgICAgICAgICogVUlQcm9jZXNzL21hYy9XZWJDb250ZXh0 TWVudVByb3h5TWFjLm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJDb250ZXh0TWVudVByb3h5TWFj OjpzaG93U2VydmljZXNNZW51KToKKyAgICAgICAgKFdlYktpdDo6V2ViQ29udGV4dE1lbnVQcm94 eU1hYzo6c2hvdyk6CisgICAgICAgIChXZWJLaXQ6OldlYkNvbnRleHRNZW51UHJveHlNYWM6OnNo b3dDb250ZXh0TWVudSk6CisgICAgICAgIChXZWJLaXQ6OldlYkNvbnRleHRNZW51UHJveHlNYWM6 OnBvcHVsYXRlKTogRGVsZXRlZC4KKworMjAxNS0xMC0yMSAgQW5kZXJzIENhcmxzc29uICA8YW5k ZXJzY2FAYXBwbGUuY29tPgorCiAgICAgICAgIFdlYkNvbnRleHRNZW51UHJveHlNYWM6OnNldHVw U2VydmljZXNNZW51IGRvZXNuJ3QgbmVlZCB0byB0YWtlIGEgY29udGV4dCBwYXJhbWV0ZXIKICAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MDQxOAogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dlYkNvbnRleHRNZW51UHJv eHlNYWMuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV2ViQ29udGV4dE1lbnVQcm94 eU1hYy5oCmluZGV4IDc0M2RiZTlhMGZlYmE1Yjk4ZWQzZWJhMmM2MDZkNjQ2ZTIyYmQ3ZGUuLjFk OTBkNzA3ZGZiZjA5OTFmOTc0MjRjODhkNWVlNGVmNzU5NjgzYjAgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV2ViQ29udGV4dE1lbnVQcm94eU1hYy5oCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV2ViQ29udGV4dE1lbnVQcm94eU1hYy5oCkBAIC01 OSw5ICs1OSwxMCBAQCBwdWJsaWM6CiBwcml2YXRlOgogICAgIHZpcnR1YWwgdm9pZCBzaG93KCkg b3ZlcnJpZGU7CiAKLSAgICB2b2lkIHBvcHVsYXRlKGNvbnN0IFZlY3RvcjxSZWZQdHI8V2ViQ29u dGV4dE1lbnVJdGVtPj4mKTsKKyAgICB2b2lkIHNob3dDb250ZXh0TWVudSgpOwogCiAjaWYgRU5B QkxFKFNFUlZJQ0VfQ09OVFJPTFMpCisgICAgdm9pZCBzaG93U2VydmljZXNNZW51KCk7CiAgICAg dm9pZCBzZXR1cFNlcnZpY2VzTWVudSgpOwogICAgIFdlYkNvcmU6OkNvbnRleHRNZW51SXRlbSBz aGFyZU1lbnVJdGVtKCk7CiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9tYWMvV2ViQ29udGV4dE1lbnVQcm94eU1hYy5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9tYWMvV2ViQ29udGV4dE1lbnVQcm94eU1hYy5tbQppbmRleCA4MWNlOGM1NjEzNzIyYzE2 NzM2OGM3Zjk3NmY4MmNlZmNkNjFmYmRmLi4yMDEzNGFjMWJhZDFmNmY4N2NiODVhZDUyNzM2MTVj ODNiNjIwM2MzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dlYkNv bnRleHRNZW51UHJveHlNYWMubW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9X ZWJDb250ZXh0TWVudVByb3h5TWFjLm1tCkBAIC0zMTgsNiArMzE4LDE0IEBAIHZvaWQgV2ViQ29u dGV4dE1lbnVQcm94eU1hYzo6c2V0dXBTZXJ2aWNlc01lbnUoKQogICAgICAgICBTZXJ2aWNlc0Nv bnRyb2xsZXI6OnNpbmdsZXRvbigpLnJlZnJlc2hFeGlzdGluZ1NlcnZpY2VzKCk7CiB9CiAKK3Zv aWQgV2ViQ29udGV4dE1lbnVQcm94eU1hYzo6c2hvd1NlcnZpY2VzTWVudSgpCit7CisgICAgc2V0 dXBTZXJ2aWNlc01lbnUoKTsKKworICAgIFtbV0tTaGFyaW5nU2VydmljZVBpY2tlckRlbGVnYXRl IHNoYXJlZFNoYXJpbmdTZXJ2aWNlUGlja2VyRGVsZWdhdGVdIHNldE1lbnVQcm94eTp0aGlzXTsK KyAgICBbbV9tZW51IHBvcFVwTWVudVBvc2l0aW9uaW5nSXRlbTpuaWwgYXRMb2NhdGlvbjptX2Nv bnRleHQubWVudUxvY2F0aW9uKCkgaW5WaWV3Om1fd2ViVmlld107Cit9CisKIHZvaWQgV2ViQ29u dGV4dE1lbnVQcm94eU1hYzo6Y2xlYXJTZXJ2aWNlc01lbnUoKQogewogICAgIFtbV0tTaGFyaW5n U2VydmljZVBpY2tlckRlbGVnYXRlIHNoYXJlZFNoYXJpbmdTZXJ2aWNlUGlja2VyRGVsZWdhdGVd IHNldFBpY2tlcjpudWxscHRyXTsKQEAgLTM2MCwzMCArMzY4LDIyIEBAIENvbnRleHRNZW51SXRl bSBXZWJDb250ZXh0TWVudVByb3h5TWFjOjpzaGFyZU1lbnVJdGVtKCkKIH0KICNlbmRpZgogCi12 b2lkIFdlYkNvbnRleHRNZW51UHJveHlNYWM6OnBvcHVsYXRlKGNvbnN0IFZlY3RvcjxSZWZQdHI8 V2ViQ29udGV4dE1lbnVJdGVtPj4mIGl0ZW1zKQordm9pZCBXZWJDb250ZXh0TWVudVByb3h5TWFj OjpzaG93KCkKIHsKKyAgICBSZWY8V2ViUGFnZVByb3h5PiBwcm90ZWN0KG1fcGFnZSk7CisKICNp ZiBFTkFCTEUoU0VSVklDRV9DT05UUk9MUykKICAgICBpZiAobV9jb250ZXh0LmlzU2VydmljZXNN ZW51KCkpIHsKLSAgICAgICAgc2V0dXBTZXJ2aWNlc01lbnUoKTsKKyAgICAgICAgc2hvd1NlcnZp Y2VzTWVudSgpOwogICAgICAgICByZXR1cm47CiAgICAgfQogI2VuZGlmCiAKLSAgICBtX21lbnUg PSBbW05TTWVudSBhbGxvY10gaW5pdFdpdGhUaXRsZTpAIiJdOwotICAgIFttX21lbnUgc2V0QXV0 b2VuYWJsZXNJdGVtczpOT107Ci0KLSAgICBwb3B1bGF0ZU5TTWVudShtX21lbnUuZ2V0KCksIG5z TWVudUl0ZW1WZWN0b3IoaXRlbXMpKTsKKyAgICBzaG93Q29udGV4dE1lbnUoKTsKIH0KIAotdm9p ZCBXZWJDb250ZXh0TWVudVByb3h5TWFjOjpzaG93KCkKK3ZvaWQgV2ViQ29udGV4dE1lbnVQcm94 eU1hYzo6c2hvd0NvbnRleHRNZW51KCkKIHsKLSAgICAvLyBVbmxlc3MgdGhpcyBpcyBhbiBpbWFn ZSBjb250cm9sLCBnaXZlIHRoZSBQYWdlQ29udGV4dE1lbnVDbGllbnQgb25lIGxhc3Qgc3dpcGUg YXQgY2hhbmdpbmcgdGhlIG1lbnUuCi0gICAgYm9vbCBhc2tDbGllbnRUb0NoYW5nZU1lbnUgPSB0 cnVlOwotI2lmIEVOQUJMRShTRVJWSUNFX0NPTlRST0xTKQotICAgIGlmIChtX2NvbnRleHQuaXNT ZXJ2aWNlc01lbnUoKSB8fCBtX2NvbnRleHQuY29udHJvbGxlZEltYWdlKCkpCi0gICAgICAgIGFz a0NsaWVudFRvQ2hhbmdlTWVudSA9IGZhbHNlOwotI2VuZGlmCi0KICAgICBWZWN0b3I8UmVmUHRy PFdlYkNvbnRleHRNZW51SXRlbT4+IHByb3Bvc2VkQVBJSXRlbXM7CiAgICAgZm9yIChhdXRvJiBp dGVtIDogbV9jb250ZXh0Lm1lbnVJdGVtcygpKSB7CiAgICAgICAgIGlmIChpdGVtLmFjdGlvbigp ICE9IENvbnRleHRNZW51SXRlbVRhZ1NoYXJlTWVudSkgewpAQCAtNDAxLDMwICs0MDEsMjAgQEAg dm9pZCBXZWJDb250ZXh0TWVudVByb3h5TWFjOjpzaG93KCkKICAgICBWZWN0b3I8UmVmUHRyPFdl YkNvbnRleHRNZW51SXRlbT4+IGNsaWVudEl0ZW1zOwogICAgIGJvb2wgdXNlUHJvcG9zZWRJdGVt cyA9IHRydWU7CiAKLSAgICBpZiAoYXNrQ2xpZW50VG9DaGFuZ2VNZW51ICYmIG1fcGFnZS5jb250 ZXh0TWVudUNsaWVudCgpLmdldENvbnRleHRNZW51RnJvbVByb3Bvc2VkTWVudShtX3BhZ2UsIHBy b3Bvc2VkQVBJSXRlbXMsIGNsaWVudEl0ZW1zLCBtX2NvbnRleHQud2ViSGl0VGVzdFJlc3VsdERh dGEoKSwgbV9wYWdlLnByb2Nlc3MoKS50cmFuc2Zvcm1IYW5kbGVzVG9PYmplY3RzKG1fdXNlckRh dGEub2JqZWN0KCkpLmdldCgpKSkKKyAgICBpZiAobV9wYWdlLmNvbnRleHRNZW51Q2xpZW50KCku Z2V0Q29udGV4dE1lbnVGcm9tUHJvcG9zZWRNZW51KG1fcGFnZSwgcHJvcG9zZWRBUElJdGVtcywg Y2xpZW50SXRlbXMsIG1fY29udGV4dC53ZWJIaXRUZXN0UmVzdWx0RGF0YSgpLCBtX3BhZ2UucHJv Y2VzcygpLnRyYW5zZm9ybUhhbmRsZXNUb09iamVjdHMobV91c2VyRGF0YS5vYmplY3QoKSkuZ2V0 KCkpKQogICAgICAgICB1c2VQcm9wb3NlZEl0ZW1zID0gZmFsc2U7CiAKICAgICBjb25zdCBWZWN0 b3I8UmVmUHRyPFdlYkNvbnRleHRNZW51SXRlbT4+JiBpdGVtcyA9IHVzZVByb3Bvc2VkSXRlbXMg PyBwcm9wb3NlZEFQSUl0ZW1zIDogY2xpZW50SXRlbXM7CiAKLSNpZiBFTkFCTEUoU0VSVklDRV9D T05UUk9MUykKLSAgICBpZiAoaXRlbXMuaXNFbXB0eSgpICYmICFtX2NvbnRleHQuaXNTZXJ2aWNl c01lbnUoKSkKLSAgICAgICAgcmV0dXJuOwotI2Vsc2UKICAgICBpZiAoaXRlbXMuaXNFbXB0eSgp KQogICAgICAgICByZXR1cm47Ci0jZW5kaWYKLQotICAgIHBvcHVsYXRlKGl0ZW1zKTsKLQotICAg IFtbV0tNZW51VGFyZ2V0IHNoYXJlZE1lbnVUYXJnZXRdIHNldE1lbnVQcm94eTp0aGlzXTsKIAot I2lmIEVOQUJMRShTRVJWSUNFX0NPTlRST0xTKQotICAgIGlmIChtX2NvbnRleHQuaXNTZXJ2aWNl c01lbnUoKSkKLSAgICAgICAgW1tXS1NoYXJpbmdTZXJ2aWNlUGlja2VyRGVsZWdhdGUgc2hhcmVk U2hhcmluZ1NlcnZpY2VQaWNrZXJEZWxlZ2F0ZV0gc2V0TWVudVByb3h5OnRoaXNdOwotI2VuZGlm CisgICAgbV9tZW51ID0gW1tOU01lbnUgYWxsb2NdIGluaXRXaXRoVGl0bGU6QCIiXTsKKyAgICBb bV9tZW51IHNldEF1dG9lbmFibGVzSXRlbXM6Tk9dOwogCi0gICAgUmVmPFdlYlBhZ2VQcm94eT4g cHJvdGVjdChtX3BhZ2UpOworICAgIHBvcHVsYXRlTlNNZW51KG1fbWVudS5nZXQoKSwgbnNNZW51 SXRlbVZlY3RvcihpdGVtcykpOwogCisgICAgW1tXS01lbnVUYXJnZXQgc2hhcmVkTWVudVRhcmdl dF0gc2V0TWVudVByb3h5OnRoaXNdOwogICAgIFttX21lbnUgcG9wVXBNZW51UG9zaXRpb25pbmdJ dGVtOm5pbCBhdExvY2F0aW9uOm1fY29udGV4dC5tZW51TG9jYXRpb24oKSBpblZpZXc6bV93ZWJW aWV3XTsKIH0KIAo=