150640 2015-10-28 15:45:42 -0700 WebKit, not WebCore, should do context menu conversion 2016-10-15 16:00:55 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca mitz oldest_to_newest 1137318 0 andersca 2015-10-28 15:45:42 -0700 WebKit, not webCore, should do context menu conversion 1137319 1 264257 andersca 2015-10-28 15:46:16 -0700 Created attachment 264257 Patch 1137321 2 264257 thorton 2015-10-28 15:48:53 -0700 Comment on attachment 264257 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=264257&action=review > Source/WebKit/mac/ChangeLog:3 > + WebKit, not webCore, should do context menu conversion capital W 1137326 3 andersca 2015-10-28 15:54:24 -0700 Committed r191699: <http://trac.webkit.org/changeset/191699> 1240659 4 mitz 2016-10-15 16:00:55 -0700 (In reply to comment #3) > Committed r191699: <http://trac.webkit.org/changeset/191699> This caused bug 163492. 264257 2015-10-28 15:46:16 -0700 2015-10-28 15:48:53 -0700 Patch bug-150640-20151028154556.patch text/plain 6313 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTkxNjkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21h Yy9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKaW5kZXggYzM4N2RhNWM3 NDZjMmE0MTBlYjQwNmVkYTE1NmExMWZjY2VlMjY2Mi4uZDY4ZTdmNzNhYWM2OTM4NWQ2NDcwOGU2 MjUwNzVhMjAzYWVjNjY4OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE1 LTEwLTI4ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAg V2ViS2l0LCBub3Qgd2ViQ29yZSwgc2hvdWxkIGRvIGNvbnRleHQgbWVudSBjb252ZXJzaW9uCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTA2NDAKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYlZpZXcv V2ViSFRNTFZpZXcubW06CisgICAgICAgIChjcmVhdGVTaGFyZU1lbnVJdGVtKToKKyAgICAgICAg KGNyZWF0ZU1lbnVJdGVtKToKKyAgICAgICAgKGNyZWF0ZU1lbnVJdGVtcyk6CisgICAgICAgIChj dXN0b21NZW51RnJvbURlZmF1bHRJdGVtcyk6CisKIDIwMTUtMTAtMjYgIEFuZGVycyBDYXJsc3Nv biAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUgZGVhZCBjb250ZXh0IG1l bnUgY29kZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJIVE1MVmll dy5tbSBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViSFRNTFZpZXcubW0KaW5kZXggMWY0 YzNjMTljYmNmOTEwMDNhMGZmZTRjZWZlNWJiN2RiNDU0M2ZlMi4uYzM2ZDQ3OGE2OGZkZDBjOGEz ZTUwNjVmMGI2ZjlmNTRlY2U0MTc3MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvV2Vi Vmlldy9XZWJIVE1MVmlldy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYkhU TUxWaWV3Lm1tCkBAIC0zNTI4LDM0ICszNTI4LDExOSBAQCBzdGF0aWMgUmV0YWluUHRyPE5TQXJy YXk+IGZpeE1lbnVzUmVjZWl2ZWRGcm9tT2xkQ2xpZW50cyhOU0FycmF5ICpkZWxlZ2F0ZVN1cHBs aQogICAgIHJldHVybiBuZXdNZW51SXRlbXM7CiB9CiAKK3N0YXRpYyBSZXRhaW5QdHI8TlNNZW51 SXRlbT4gY3JlYXRlU2hhcmVNZW51SXRlbShjb25zdCBIaXRUZXN0UmVzdWx0JiBoaXRUZXN0UmVz dWx0KQoreworICAgIGlmICghW1tOU01lbnVJdGVtIGNsYXNzXSByZXNwb25kc1RvU2VsZWN0b3I6 QHNlbGVjdG9yKHN0YW5kYXJkU2hhcmVNZW51SXRlbVdpdGhJdGVtczopXSkKKyAgICAgICAgcmV0 dXJuIG5pbDsKKworICAgIGF1dG8gaXRlbXMgPSBhZG9wdE5TKFtbTlNNdXRhYmxlQXJyYXkgYWxs b2NdIGluaXRdKTsKKworICAgIGlmICghaGl0VGVzdFJlc3VsdC5hYnNvbHV0ZUxpbmtVUkwoKS5p c0VtcHR5KCkpIHsKKyAgICAgICAgTlNVUkwgKmFic29sdXRlTGlua1VSTCA9IGhpdFRlc3RSZXN1 bHQuYWJzb2x1dGVMaW5rVVJMKCk7CisgICAgICAgIFtpdGVtcyBhZGRPYmplY3Q6YWJzb2x1dGVM aW5rVVJMXTsKKyAgICB9CisKKyAgICBpZiAoIWhpdFRlc3RSZXN1bHQuYWJzb2x1dGVNZWRpYVVS TCgpLmlzRW1wdHkoKSAmJiBoaXRUZXN0UmVzdWx0LmlzRG93bmxvYWRhYmxlTWVkaWEoKSkgewor ICAgICAgICBOU1VSTCAqZG93bmxvYWRhYmxlTWVkaWFVUkwgPSBoaXRUZXN0UmVzdWx0LmFic29s dXRlTWVkaWFVUkwoKTsKKyAgICAgICAgW2l0ZW1zIGFkZE9iamVjdDpkb3dubG9hZGFibGVNZWRp YVVSTF07CisgICAgfQorCisgICAgaWYgKEltYWdlKiBpbWFnZSA9IGhpdFRlc3RSZXN1bHQuaW1h Z2UoKSkgeworICAgICAgICBpZiAoUmVmUHRyPFNoYXJlZEJ1ZmZlcj4gYnVmZmVyID0gaW1hZ2Ut PmRhdGEoKSkKKyAgICAgICAgICAgIFtpdGVtcyBhZGRPYmplY3Q6YWRvcHROUyhbW05TSW1hZ2Ug YWxsb2NdIGluaXRXaXRoRGF0YTpbTlNEYXRhIGRhdGFXaXRoQnl0ZXM6YnVmZmVyLT5kYXRhKCkg bGVuZ3RoOmJ1ZmZlci0+c2l6ZSgpXV0pLmdldCgpXTsKKyAgICB9CisKKyAgICBpZiAoIWhpdFRl c3RSZXN1bHQuc2VsZWN0ZWRUZXh0KCkuaXNFbXB0eSgpKSB7CisgICAgICAgIE5TU3RyaW5nICpz ZWxlY3RlZFRleHQgPSBoaXRUZXN0UmVzdWx0LnNlbGVjdGVkVGV4dCgpOworICAgICAgICBbaXRl bXMgYWRkT2JqZWN0OnNlbGVjdGVkVGV4dF07CisgICAgfQorCisgICAgaWYgKCFbaXRlbXMgY291 bnRdKQorICAgICAgICByZXR1cm4gbmlsOworCisgICAgcmV0dXJuIFtOU01lbnVJdGVtIHN0YW5k YXJkU2hhcmVNZW51SXRlbVdpdGhJdGVtczppdGVtcy5nZXQoKV07Cit9CisKK3N0YXRpYyBSZXRh aW5QdHI8TlNNdXRhYmxlQXJyYXk+IGNyZWF0ZU1lbnVJdGVtcyhjb25zdCBIaXRUZXN0UmVzdWx0 JiwgY29uc3QgVmVjdG9yPENvbnRleHRNZW51SXRlbT4mKTsKKworc3RhdGljIFJldGFpblB0cjxO U01lbnVJdGVtPiBjcmVhdGVNZW51SXRlbShjb25zdCBIaXRUZXN0UmVzdWx0JiBoaXRUZXN0UmVz dWx0LCBjb25zdCBDb250ZXh0TWVudUl0ZW0mIGl0ZW0pCit7CisgICAgaWYgKGl0ZW0uYWN0aW9u KCkgPT0gQ29udGV4dE1lbnVJdGVtVGFnU2hhcmVNZW51KQorICAgICAgICByZXR1cm4gY3JlYXRl U2hhcmVNZW51SXRlbShoaXRUZXN0UmVzdWx0KTsKKworICAgIHN3aXRjaCAoaXRlbS50eXBlKCkp IHsKKyAgICBjYXNlIFdlYkNvcmU6OkFjdGlvblR5cGU6CisgICAgY2FzZSBXZWJDb3JlOjpDaGVj a2FibGVBY3Rpb25UeXBlOiB7CisgICAgICAgIGF1dG8gbWVudUl0ZW0gPSBhZG9wdE5TKFtbTlNN ZW51SXRlbSBhbGxvY10gaW5pdFdpdGhUaXRsZTppdGVtLnRpdGxlKCkgYWN0aW9uOkBzZWxlY3Rv cihmb3J3YXJkQ29udGV4dE1lbnVBY3Rpb246KSBrZXlFcXVpdmFsZW50OkAiIl0pOworCisgICAg ICAgIFttZW51SXRlbSBzZXRUYWc6aXRlbS5hY3Rpb24oKV07CisgICAgICAgIFttZW51SXRlbSBz ZXRFbmFibGVkOml0ZW0uZW5hYmxlZCgpXTsKKyAgICAgICAgW21lbnVJdGVtIHNldFN0YXRlOml0 ZW0uY2hlY2tlZCgpID8gTlNPblN0YXRlIDogTlNPZmZTdGF0ZV07CisgICAgICAgIFttZW51SXRl bSBzZXRUYXJnZXQ6W1dlYk1lbnVUYXJnZXQgc2hhcmVkTWVudVRhcmdldF1dOworCisgICAgICAg IHJldHVybiBtZW51SXRlbTsKKyAgICB9CisKKyAgICBjYXNlIFNlcGFyYXRvclR5cGU6CisgICAg ICAgIHJldHVybiBbTlNNZW51SXRlbSBzZXBhcmF0b3JJdGVtXTsKKworICAgIGNhc2UgU3VibWVu dVR5cGU6IHsKKyAgICAgICAgYXV0byBtZW51ID0gYWRvcHROUyhbW05TTWVudSBhbGxvY10gaW5p dF0pOworCisgICAgICAgIGF1dG8gc3VibWVudUl0ZW1zID0gY3JlYXRlTWVudUl0ZW1zKGhpdFRl c3RSZXN1bHQsIGNvbnRleHRNZW51SXRlbVZlY3RvcihpdGVtLnBsYXRmb3JtU3ViTWVudSgpKSk7 CisgICAgICAgIGZvciAoTlNNZW51SXRlbSAqbWVudUl0ZW0gaW4gc3VibWVudUl0ZW1zLmdldCgp KQorICAgICAgICAgICAgW21lbnUgYWRkSXRlbTptZW51SXRlbV07CisKKyAgICAgICAgYXV0byBt ZW51SXRlbSA9IGFkb3B0TlMoW1tOU01lbnVJdGVtIGFsbG9jXSBpbml0V2l0aFRpdGxlOml0ZW0u dGl0bGUoKSBhY3Rpb246bnVsbHB0ciBrZXlFcXVpdmFsZW50OkAiIl0pOworICAgICAgICBbbWVu dUl0ZW0gc2V0RW5hYmxlZDppdGVtLmVuYWJsZWQoKV07CisgICAgICAgIFttZW51SXRlbSBzZXRT dWJtZW51Om1lbnUuZ2V0KCldOworCisgICAgICAgIHJldHVybiBtZW51SXRlbTsKKyAgICB9Cisg ICAgfQorfQorCitzdGF0aWMgUmV0YWluUHRyPE5TTXV0YWJsZUFycmF5PiBjcmVhdGVNZW51SXRl bXMoY29uc3QgSGl0VGVzdFJlc3VsdCYgaGl0VGVzdFJlc3VsdCwgY29uc3QgVmVjdG9yPENvbnRl eHRNZW51SXRlbT4mIGl0ZW1zKQoreworICAgIGF1dG8gbWVudUl0ZW1zID0gYWRvcHROUyhbW05T TXV0YWJsZUFycmF5IGFsbG9jXSBpbml0XSk7CisKKyAgICBmb3IgKGF1dG8mIGl0ZW0gOiBpdGVt cykgeworICAgICAgICBpZiAoYXV0byBtZW51SXRlbSA9IGNyZWF0ZU1lbnVJdGVtKGhpdFRlc3RS ZXN1bHQsIGl0ZW0pKQorICAgICAgICAgICAgW21lbnVJdGVtcyBhZGRPYmplY3Q6bWVudUl0ZW0u Z2V0KCldOworICAgIH0KKworICAgIHJldHVybiBtZW51SXRlbXM7Cit9CisKIHN0YXRpYyBSZXRh aW5QdHI8TlNBcnJheT4gY3VzdG9tTWVudUZyb21EZWZhdWx0SXRlbXMoV2ViVmlldyAqd2ViVmll dywgY29uc3QgQ29udGV4dE1lbnUmIGRlZmF1bHRNZW51KQogeworICAgIGNvbnN0IGF1dG8mIGhp dFRlc3RSZXN1bHQgPSB3ZWJWaWV3LnBhZ2UtPmNvbnRleHRNZW51Q29udHJvbGxlcigpLmhpdFRl c3RSZXN1bHQoKTsKKyAgICBhdXRvIGRlZmF1bHRNZW51SXRlbXMgPSBjcmVhdGVNZW51SXRlbXMo aGl0VGVzdFJlc3VsdCwgY29udGV4dE1lbnVJdGVtVmVjdG9yKGRlZmF1bHRNZW51LnBsYXRmb3Jt RGVzY3JpcHRpb24oKSkpOworCiAgICAgaWQgZGVsZWdhdGUgPSBbd2ViVmlldyBVSURlbGVnYXRl XTsKICAgICBTRUwgc2VsZWN0b3IgPSBAc2VsZWN0b3Iod2ViVmlldzpjb250ZXh0TWVudUl0ZW1z Rm9yRWxlbWVudDpkZWZhdWx0TWVudUl0ZW1zOik7CiAgICAgaWYgKCFbZGVsZWdhdGUgcmVzcG9u ZHNUb1NlbGVjdG9yOnNlbGVjdG9yXSkKLSAgICAgICAgcmV0dXJuIGRlZmF1bHRNZW51LnBsYXRm b3JtRGVzY3JpcHRpb24oKTsKKyAgICAgICAgcmV0dXJuIGRlZmF1bHRNZW51SXRlbXM7CiAKLSAg ICBhdXRvIGVsZW1lbnQgPSBhZG9wdE5TKFtbV2ViRWxlbWVudERpY3Rpb25hcnkgYWxsb2NdIGlu aXRXaXRoSGl0VGVzdFJlc3VsdDpbd2ViVmlldyBwYWdlXS0+Y29udGV4dE1lbnVDb250cm9sbGVy KCkuaGl0VGVzdFJlc3VsdCgpXSk7CisgICAgYXV0byBlbGVtZW50ID0gYWRvcHROUyhbW1dlYkVs ZW1lbnREaWN0aW9uYXJ5IGFsbG9jXSBpbml0V2l0aEhpdFRlc3RSZXN1bHQ6aGl0VGVzdFJlc3Vs dF0pOwogCiAgICAgQk9PTCBwcmVWZXJzaW9uM0NsaWVudCA9IGlzUHJlVmVyc2lvbjNDbGllbnQo KTsKICAgICBpZiAocHJlVmVyc2lvbjNDbGllbnQpIHsKICAgICAgICAgRE9NTm9kZSAqbm9kZSA9 IFtlbGVtZW50IG9iamVjdEZvcktleTpXZWJFbGVtZW50RE9NTm9kZUtleV07CiAgICAgICAgIGlm IChbbm9kZSBpc0tpbmRPZkNsYXNzOltET01IVE1MSW5wdXRFbGVtZW50IGNsYXNzXV0gJiYgWyhE T01IVE1MSW5wdXRFbGVtZW50ICopbm9kZSBfaXNUZXh0RmllbGRdKQotICAgICAgICAgICAgcmV0 dXJuIGRlZmF1bHRNZW51LnBsYXRmb3JtRGVzY3JpcHRpb24oKTsKKyAgICAgICAgICAgIHJldHVy biBkZWZhdWx0TWVudUl0ZW1zOwogICAgICAgICBpZiAoW25vZGUgaXNLaW5kT2ZDbGFzczpbRE9N SFRNTFRleHRBcmVhRWxlbWVudCBjbGFzc11dKQotICAgICAgICAgICAgcmV0dXJuIGRlZmF1bHRN ZW51LnBsYXRmb3JtRGVzY3JpcHRpb24oKTsKKyAgICAgICAgICAgIHJldHVybiBkZWZhdWx0TWVu dUl0ZW1zOwogICAgIH0KIAotICAgIE5TTXV0YWJsZUFycmF5ICpkZWZhdWx0TWVudUl0ZW1zID0g ZGVmYXVsdE1lbnUucGxhdGZvcm1EZXNjcmlwdGlvbigpOwotCi0gICAgZm9yIChOU01lbnVJdGVt ICptZW51SXRlbSBpbiBkZWZhdWx0TWVudUl0ZW1zKSB7CisgICAgZm9yIChOU01lbnVJdGVtICpt ZW51SXRlbSBpbiBkZWZhdWx0TWVudUl0ZW1zLmdldCgpKSB7CiAgICAgICAgIGlmICghbWVudUl0 ZW0ucmVwcmVzZW50ZWRPYmplY3QpCiAgICAgICAgICAgICBtZW51SXRlbS5yZXByZXNlbnRlZE9i amVjdCA9IGVsZW1lbnQuZ2V0KCk7CiAgICAgfQogCi0gICAgYXV0byBzYXZlZEl0ZW1zID0gZml4 TWVudXNUb1NlbmRUb09sZENsaWVudHMoZGVmYXVsdE1lbnVJdGVtcyk7CisgICAgYXV0byBzYXZl ZEl0ZW1zID0gZml4TWVudXNUb1NlbmRUb09sZENsaWVudHMoZGVmYXVsdE1lbnVJdGVtcy5nZXQo KSk7CiAKLSAgICBOU0FycmF5ICpkZWxlZ2F0ZVN1cHBsaWVkSXRlbXMgPSBDYWxsVUlEZWxlZ2F0 ZSh3ZWJWaWV3LCBzZWxlY3RvciwgZWxlbWVudC5nZXQoKSwgZGVmYXVsdE1lbnVJdGVtcyk7Cisg ICAgTlNBcnJheSAqZGVsZWdhdGVTdXBwbGllZEl0ZW1zID0gQ2FsbFVJRGVsZWdhdGUod2ViVmll dywgc2VsZWN0b3IsIGVsZW1lbnQuZ2V0KCksIGRlZmF1bHRNZW51SXRlbXMuZ2V0KCkpOwogCiAg ICAgcmV0dXJuIGZpeE1lbnVzUmVjZWl2ZWRGcm9tT2xkQ2xpZW50cyhkZWxlZ2F0ZVN1cHBsaWVk SXRlbXMsIHNhdmVkSXRlbXMuZ2V0KCkpLmF1dG9yZWxlYXNlKCk7CiB9Cg==