150509 2015-10-23 12:35:16 -0700 Simplify the WebKitLegacy menu conversion code 2015-10-23 14:35:08 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 1136110 0 andersca 2015-10-23 12:35:16 -0700 Simplify the WebKitLegacy menu conversion code 1136111 1 263936 andersca 2015-10-23 12:36:06 -0700 Created attachment 263936 Patch 1136142 2 andersca 2015-10-23 14:35:08 -0700 Committed r191512: <http://trac.webkit.org/changeset/191512> 263936 2015-10-23 12:36:06 -0700 2015-10-23 12:55:33 -0700 Patch bug-150509-20151023123520.patch text/plain 6477 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTkxNTA2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21h Yy9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKaW5kZXggZmYxYWJiNGJj YjM2ZTdkMmE2ZmYxYmEwMmY5NTEwNGI2OTA3MDc0My4uM2VkN2QyOTMwN2MxYzVmM2E5NmQwMTIx YzFiZmRiMTQ0ZDA2MDlkOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE3IEBACiAyMDE1 LTEwLTIzICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAg U2ltcGxpZnkgdGhlIFdlYktpdExlZ2FjeSBtZW51IGNvbnZlcnNpb24gY29kZQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUwNTA5CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9X ZWJDb250ZXh0TWVudUNsaWVudC5tbToKKyAgICAgICAgKGZpeE1lbnVzVG9TZW5kVG9PbGRDbGll bnRzKToKKyAgICAgICAgKGZpeE1lbnVzUmVjZWl2ZWRGcm9tT2xkQ2xpZW50cyk6CisgICAgICAg IChXZWJDb250ZXh0TWVudUNsaWVudDo6Z2V0Q3VzdG9tTWVudUZyb21EZWZhdWx0SXRlbXMpOgor CisyMDE1LTEwLTIzICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKICAg ICAgICAgRG9uJ3Qgb3ZlcnJpZGUgYWxyZWFkeSBleGlzdGluZyByZXByZXNlbnRlZCBvYmplY3Rz IG9uIG1lbnUgaXRlbXMKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE1MDUwOAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3Vw cG9ydC9XZWJDb250ZXh0TWVudUNsaWVudC5tbSBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVT dXBwb3J0L1dlYkNvbnRleHRNZW51Q2xpZW50Lm1tCmluZGV4IGFhOThhODAyMTdmMWQxMTIxM2I2 NmQxNWUwYTdjY2Y1YmY0NmIzZTYuLjUyZDI2NzRlODQ0NWMzMTZmNjc0ZDNiOWJiYjEwNDNjOGE5 YTg0ZDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkNv bnRleHRNZW51Q2xpZW50Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0 L1dlYkNvbnRleHRNZW51Q2xpZW50Lm1tCkBAIC0xMDEsOSArMTAxLDkgQEAgc3RhdGljIEJPT0wg aXNQcmVJbnNwZWN0RWxlbWVudFRhZ0NsaWVudCh2b2lkKQogICAgIHJldHVybiBwcmVJbnNwZWN0 RWxlbWVudFRhZ0NsaWVudDsKIH0KIAotc3RhdGljIE5TTXV0YWJsZUFycmF5ICpmaXhNZW51c1Rv U2VuZFRvT2xkQ2xpZW50cyhOU011dGFibGVBcnJheSAqZGVmYXVsdE1lbnVJdGVtcykKK3N0YXRp YyBSZXRhaW5QdHI8TlNBcnJheT4gZml4TWVudXNUb1NlbmRUb09sZENsaWVudHMoTlNNdXRhYmxl QXJyYXkgKmRlZmF1bHRNZW51SXRlbXMpCiB7Ci0gICAgTlNNdXRhYmxlQXJyYXkgKnNhdmVkSXRl bXMgPSBuaWw7CisgICAgYXV0byBzYXZlZEl0ZW1zID0gYWRvcHROUyhbW05TTXV0YWJsZUFycmF5 IGFsbG9jXSBpbml0XSk7CiAKICAgICB1bnNpZ25lZCBkZWZhdWx0SXRlbXNDb3VudCA9IFtkZWZh dWx0TWVudUl0ZW1zIGNvdW50XTsKIApAQCAtMTEyLDcgKzExMiw3IEBAIHN0YXRpYyBOU011dGFi bGVBcnJheSAqZml4TWVudXNUb1NlbmRUb09sZENsaWVudHMoTlNNdXRhYmxlQXJyYXkgKmRlZmF1 bHRNZW51SXRlCiAgICAgICAgIE5TTWVudUl0ZW0gKmxhc3RJdGVtID0gW2RlZmF1bHRNZW51SXRl bXMgb2JqZWN0QXRJbmRleDpkZWZhdWx0SXRlbXNDb3VudCAtIDFdOwogCiAgICAgICAgIGlmIChb c2Vjb25kVG9MYXN0SXRlbSBpc1NlcGFyYXRvckl0ZW1dICYmIFtsYXN0SXRlbSB0YWddID09IFdl Yk1lbnVJdGVtVGFnSW5zcGVjdEVsZW1lbnQpIHsKLSAgICAgICAgICAgIHNhdmVkSXRlbXMgPSBb TlNNdXRhYmxlQXJyYXkgYXJyYXlXaXRoQ2FwYWNpdHk6Ml07CisgICAgICAgICAgICBzYXZlZEl0 ZW1zID0gYWRvcHROUyhbW05TTXV0YWJsZUFycmF5IGFsbG9jXSBpbml0V2l0aENhcGFjaXR5OjJd KTsKICAgICAgICAgICAgIFtzYXZlZEl0ZW1zIGFkZE9iamVjdDpzZWNvbmRUb0xhc3RJdGVtXTsK ICAgICAgICAgICAgIFtzYXZlZEl0ZW1zIGFkZE9iamVjdDpsYXN0SXRlbV07CiAKQEAgLTEyNSwx MCArMTI1LDkgQEAgc3RhdGljIE5TTXV0YWJsZUFycmF5ICpmaXhNZW51c1RvU2VuZFRvT2xkQ2xp ZW50cyhOU011dGFibGVBcnJheSAqZGVmYXVsdE1lbnVJdGUKICAgICBCT09MIHByZVZlcnNpb24z Q2xpZW50ID0gaXNQcmVWZXJzaW9uM0NsaWVudCgpOwogICAgIGlmICghcHJlVmVyc2lvbjNDbGll bnQpCiAgICAgICAgIHJldHVybiBzYXZlZEl0ZW1zOwotICAgICAgICAKLSAgICBmb3IgKHVuc2ln bmVkIGkgPSAwOyBpIDwgZGVmYXVsdEl0ZW1zQ291bnQ7ICsraSkgewotICAgICAgICBOU01lbnVJ dGVtICppdGVtID0gW2RlZmF1bHRNZW51SXRlbXMgb2JqZWN0QXRJbmRleDppXTsKLSAgICAgICAg aW50IHRhZyA9IFtpdGVtIHRhZ107CisKKyAgICBmb3IgKE5TTWVudUl0ZW0gKml0ZW0gaW4gZGVm YXVsdE1lbnVJdGVtcykgeworICAgICAgICBpbnQgdGFnID0gaXRlbS50YWc7CiAgICAgICAgIGlu dCBvbGRTdHlsZVRhZyA9IHRhZzsKIAogICAgICAgICBpZiAodGFnID49IFdFQk1FTlVJVEVNVEFH X1dFQktJVF8zXzBfU1BJX1NUQVJUKSB7CkBAIC0xNTgsMjEgKzE1NywyMyBAQCBzdGF0aWMgTlNN dXRhYmxlQXJyYXkgKmZpeE1lbnVzVG9TZW5kVG9PbGRDbGllbnRzKE5TTXV0YWJsZUFycmF5ICpk ZWZhdWx0TWVudUl0ZQogICAgICAgICAgICAgfQogICAgICAgICB9CiAKLSAgICAgICAgaWYgKG9s ZFN0eWxlVGFnICE9IHRhZykKLSAgICAgICAgICAgIFtpdGVtIHNldFRhZzpvbGRTdHlsZVRhZ107 CisgICAgICAgIGl0ZW0udGFnID0gb2xkU3R5bGVUYWc7CiAgICAgfQogCiAgICAgcmV0dXJuIHNh dmVkSXRlbXM7CiB9CiAKLXN0YXRpYyB2b2lkIGZpeE1lbnVzUmVjZWl2ZWRGcm9tT2xkQ2xpZW50 cyhOU011dGFibGVBcnJheSAqbmV3TWVudUl0ZW1zLCBOU011dGFibGVBcnJheSAqc2F2ZWRJdGVt cykKLXsgICAKKy8vIEZJWE1FOiBUaGlzIHNob3VsZCByZXR1cm4gTlNBcnJheS4KK3N0YXRpYyBS ZXRhaW5QdHI8TlNNdXRhYmxlQXJyYXk+IGZpeE1lbnVzUmVjZWl2ZWRGcm9tT2xkQ2xpZW50cyhO U0FycmF5ICpkZWxlZ2F0ZVN1cHBsaWVkSXRlbXMsIE5TQXJyYXkgKnNhdmVkSXRlbXMpCit7Cisg ICAgYXV0byBuZXdNZW51SXRlbXMgPSBhZG9wdE5TKFtkZWxlZ2F0ZVN1cHBsaWVkSXRlbXMgbXV0 YWJsZUNvcHldKTsKKwogICAgIGlmIChzYXZlZEl0ZW1zKQogICAgICAgICBbbmV3TWVudUl0ZW1z IGFkZE9iamVjdHNGcm9tQXJyYXk6c2F2ZWRJdGVtc107CiAKICAgICBCT09MIHByZVZlcnNpb24z Q2xpZW50ID0gaXNQcmVWZXJzaW9uM0NsaWVudCgpOwogICAgIGlmICghcHJlVmVyc2lvbjNDbGll bnQpCi0gICAgICAgIHJldHVybjsKKyAgICAgICAgcmV0dXJuIG5ld01lbnVJdGVtczsKICAgICAK ICAgICAvLyBSZXN0b3JlIHRoZSBtb2Rlcm4gdGFncyB0byB0aGUgbWVudSBpdGVtcyB3aG9zZSB0 YWdzIHdlIGFsdGVyZWQgaW4gZml4TWVudXNUb1NlbmRUb09sZENsaWVudHMuIAogICAgIHVuc2ln bmVkIG5ld0l0ZW1zQ291bnQgPSBbbmV3TWVudUl0ZW1zIGNvdW50XTsKQEAgLTI4NSw2ICsyODYs OCBAQCBzdGF0aWMgdm9pZCBmaXhNZW51c1JlY2VpdmVkRnJvbU9sZENsaWVudHMoTlNNdXRhYmxl QXJyYXkgKm5ld01lbnVJdGVtcywgTlNNdXRhYgogICAgICAgICBpZiAobW9kZXJuVGFnICE9IHRh ZykKICAgICAgICAgICAgIFtpdGVtIHNldFRhZzptb2Rlcm5UYWddOyAgICAgICAgCiAgICAgfQor CisgICAgcmV0dXJuIG5ld01lbnVJdGVtczsKIH0KIAogTlNNdXRhYmxlQXJyYXkqIFdlYkNvbnRl eHRNZW51Q2xpZW50OjpnZXRDdXN0b21NZW51RnJvbURlZmF1bHRJdGVtcyhDb250ZXh0TWVudSog ZGVmYXVsdE1lbnUpCkBAIC0zMTIsMTIgKzMxNSwxMSBAQCBOU011dGFibGVBcnJheSogV2ViQ29u dGV4dE1lbnVDbGllbnQ6OmdldEN1c3RvbU1lbnVGcm9tRGVmYXVsdEl0ZW1zKENvbnRleHRNZW51 KgogICAgICAgICAgICAgbWVudUl0ZW0ucmVwcmVzZW50ZWRPYmplY3QgPSBlbGVtZW50OwogICAg IH0KIAotICAgIE5TTXV0YWJsZUFycmF5ICpzYXZlZEl0ZW1zID0gW2ZpeE1lbnVzVG9TZW5kVG9P bGRDbGllbnRzKGRlZmF1bHRNZW51SXRlbXMpIHJldGFpbl07CisgICAgYXV0byBzYXZlZEl0ZW1z ID0gZml4TWVudXNUb1NlbmRUb09sZENsaWVudHMoZGVmYXVsdE1lbnVJdGVtcyk7CisKICAgICBO U0FycmF5ICpkZWxlZ2F0ZVN1cHBsaWVkSXRlbXMgPSBDYWxsVUlEZWxlZ2F0ZShtX3dlYlZpZXcs IHNlbGVjdG9yLCBlbGVtZW50LCBkZWZhdWx0TWVudUl0ZW1zKTsKLSAgICBOU011dGFibGVBcnJh eSAqbmV3TWVudUl0ZW1zID0gW2RlbGVnYXRlU3VwcGxpZWRJdGVtcyBtdXRhYmxlQ29weV07Ci0g ICAgZml4TWVudXNSZWNlaXZlZEZyb21PbGRDbGllbnRzKG5ld01lbnVJdGVtcywgc2F2ZWRJdGVt cyk7Ci0gICAgW3NhdmVkSXRlbXMgcmVsZWFzZV07Ci0gICAgcmV0dXJuIFtuZXdNZW51SXRlbXMg YXV0b3JlbGVhc2VdOworCisgICAgcmV0dXJuIGZpeE1lbnVzUmVjZWl2ZWRGcm9tT2xkQ2xpZW50 cyhkZWxlZ2F0ZVN1cHBsaWVkSXRlbXMsIHNhdmVkSXRlbXMuZ2V0KCkpLmF1dG9yZWxlYXNlKCk7 CiB9CiAKIHZvaWQgV2ViQ29udGV4dE1lbnVDbGllbnQ6OmNvbnRleHRNZW51SXRlbVNlbGVjdGVk KENvbnRleHRNZW51SXRlbSogaXRlbSwgY29uc3QgQ29udGV4dE1lbnUqIHBhcmVudE1lbnUpCmRp ZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYTZhNjUw MGVhYTI2ZDE3NTVjZTEyY2ZlNGFiMzZlOTcyYmY5ZDg3Yi4uOTI3YTcyNTM0MGMxNGFmN2IzNmQ3 MDQwMzRkYzllNjkzMWJkODRiYyAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rv b2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE1LTEwLTIzICBBbmRlcnMgQ2FybHNz b24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgU2ltcGxpZnkgdGhlIFdlYktpdExl Z2FjeSBtZW51IGNvbnZlcnNpb24gY29kZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTUwNTA5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgSW1wbGVtZW50IHRoZSBjb250ZXh0IG1lbnUgZGVsZWdhdGUgbWV0 aG9kIHNvIHdlJ2xsIHRlc3QgdGhhdCBjb2RlIHBhdGguCisKKyAgICAgICAgKiBNaW5pQnJvd3Nl ci9tYWMvV0sxQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIubToKKyAgICAgICAgKC1bV0sxQnJvd3Nl cldpbmRvd0NvbnRyb2xsZXIgd2ViVmlldzpjb250ZXh0TWVudUl0ZW1zRm9yRWxlbWVudDpkZWZh dWx0TWVudUl0ZW1zOl0pOgorCiAyMDE1LTEwLTIzICBNYXJrIFNhbGlzYnVyeSAgPG1hcmsuc2Fs aXNidXJ5QGhwLmNvbT4KIAogICAgICAgICBbR1RLXSB1cGRhdGUtd2Via2l0Z3RrLWxpYnMgc2hv dWxkIHVzZSBtZXNhIHRhcmJhbGwKZGlmZiAtLWdpdCBhL1Rvb2xzL01pbmlCcm93c2VyL21hYy9X SzFCcm93c2VyV2luZG93Q29udHJvbGxlci5tIGIvVG9vbHMvTWluaUJyb3dzZXIvbWFjL1dLMUJy b3dzZXJXaW5kb3dDb250cm9sbGVyLm0KaW5kZXggMTJhOWE0MjM5Yzc2ZmI2OGFkMjI3ZTdmMmU4 YjNkNTc2OGNjZmJjMi4uYjBjODgzNzBlNWM4OGQ0NDA1MTQ0YTRjNjdiNTFkNjhhMWQ3NzM2NiAx MDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvbWFjL1dLMUJyb3dzZXJXaW5kb3dDb250cm9s bGVyLm0KKysrIGIvVG9vbHMvTWluaUJyb3dzZXIvbWFjL1dLMUJyb3dzZXJXaW5kb3dDb250cm9s bGVyLm0KQEAgLTM0MSw2ICszNDEsMTEgQEAgLSAodm9pZCl3ZWJWaWV3OihXZWJWaWV3ICopc2Vu ZGVyIGRpZFJlY2VpdmVUaXRsZTooTlNTdHJpbmcgKil0aXRsZSBmb3JGcmFtZTooV2UKICAgICBb c2VsZiB1cGRhdGVUaXRsZTp0aXRsZV07CiB9CiAKKy0gKE5TQXJyYXkgKil3ZWJWaWV3OihXZWJW aWV3ICopc2VuZGVyIGNvbnRleHRNZW51SXRlbXNGb3JFbGVtZW50OihOU0RpY3Rpb25hcnkgKill bGVtZW50IGRlZmF1bHRNZW51SXRlbXM6KE5TQXJyYXkgKilkZWZhdWx0TWVudUl0ZW1zCit7Cisg ICAgcmV0dXJuIGRlZmF1bHRNZW51SXRlbXM7Cit9CisKIC0gKHZvaWQpd2ViVmlldzooV2ViVmll dyAqKXNlbmRlciBydW5KYXZhU2NyaXB0QWxlcnRQYW5lbFdpdGhNZXNzYWdlOihOU1N0cmluZyAq KW1lc3NhZ2UgaW5pdGlhdGVkQnlGcmFtZTooV2ViRnJhbWUgKilmcmFtZQogewogICAgIE5TQWxl cnQgKmFsZXJ0ID0gW1tOU0FsZXJ0IGFsbG9jXSBpbml0XTsK