150423 2015-10-21 16:49:24 -0700 Simplify context menu handling on Windows 2015-10-21 16:55:12 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 1135457 0 andersca 2015-10-21 16:49:24 -0700 Simplify context menu handling on Windows 1135459 1 263761 andersca 2015-10-21 16:51:05 -0700 Created attachment 263761 Patch 1135460 2 andersca 2015-10-21 16:55:12 -0700 Committed r191413: <http://trac.webkit.org/changeset/191413> 263761 2015-10-21 16:51:05 -0700 2015-10-21 16:51:51 -0700 Patch bug-150423-20151021165021.patch text/plain 5900 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTkxNDEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3dp bi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L3dpbi9DaGFuZ2VMb2cKaW5kZXggYmE2YjM2OTFi NGI0MmRlYjhiNTliNzZjNzBjYzY2MWIyMzY0YjkzNS4uNTU2M2UzNDUxYTMwMGNlMmQyNmZjNWFm Yzk1NzQ1YTZlMmVlMmU0NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC93aW4vQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvd2luL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE1 LTEwLTIxICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAg U2ltcGxpZnkgY29udGV4dCBtZW51IGhhbmRsaW5nIG9uIFdpbmRvd3MKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MDQyMworCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEluc3RlYWQgb2YgY29udmVydGluZyBh IENvbnRleHRNZW51IHRvIGEgSE1FTlUsIHRoZW4gYmFjayB0byBhIENvbnRleHRNZW51LCBhbmQg dGhlbiBiYWNrIHRvIGEgSE1FTlUgYWdhaW4KKyAgICAgICAganVzdCBjb252ZXJ0IGl0IG9uY2Ug cmlnaHQgYmVmb3JlIHNob3dpbmcgaXQgYW5kIGxldCB0aGUgVUlEZWxlZ2F0ZSByZXR1cm4gYSBu ZXcgbWVudSBhdCBhdCB0aW1lIHdoZXJlIHdlIGRvbid0CisgICAgICAgIGhhdmUgdG8gY29udmVy dCBpdCBiYWNrLgorCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvV2ViQ29udGV4dE1lbnVDbGll bnQuY3BwOgorICAgICAgICAoV2ViQ29udGV4dE1lbnVDbGllbnQ6OmN1c3RvbWl6ZU1lbnUpOgor ICAgICAgICAqIFdlYlZpZXcuY3BwOgorICAgICAgICAoV2ViVmlldzo6Y3JlYXRlQ29udGV4dE1l bnUpOgorICAgICAgICAoV2ViVmlldzo6aGFuZGxlQ29udGV4dE1lbnVFdmVudCk6CisgICAgICAg ICogV2ViVmlldy5oOgorCiAyMDE1LTEwLTIxICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJj aWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBOZXR3b3JrUHJvY2VzczogRE5TIHByZWZldGNoIGhh cHBlbnMgaW4gdGhlIFdlYiBQcm9jZXNzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3dpbi9X ZWJDb3JlU3VwcG9ydC9XZWJDb250ZXh0TWVudUNsaWVudC5jcHAgYi9Tb3VyY2UvV2ViS2l0L3dp bi9XZWJDb3JlU3VwcG9ydC9XZWJDb250ZXh0TWVudUNsaWVudC5jcHAKaW5kZXggMzc0ZmU2ZTM2 NjZmZTdkZjlkMjM0NTAzOWVkZmZjNGJkMjZjM2VhZS4uNjM1MmZmMjQ2YjUxZjNjN2IyN2JlYTk1 MDY1YWVkNmM1ZGJhNDJjNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC93aW4vV2ViQ29yZVN1 cHBvcnQvV2ViQ29udGV4dE1lbnVDbGllbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvd2luL1dl YkNvcmVTdXBwb3J0L1dlYkNvbnRleHRNZW51Q2xpZW50LmNwcApAQCAtNTIsMjkgKzUyLDkgQEAg dm9pZCBXZWJDb250ZXh0TWVudUNsaWVudDo6Y29udGV4dE1lbnVEZXN0cm95ZWQoKQogICAgIGRl bGV0ZSB0aGlzOwogfQogCi1zdGQ6OnVuaXF1ZV9wdHI8Q29udGV4dE1lbnU+IFdlYkNvbnRleHRN ZW51Q2xpZW50OjpjdXN0b21pemVNZW51KHN0ZDo6dW5pcXVlX3B0cjxDb250ZXh0TWVudT4gcG9w TWVudSkKK3N0ZDo6dW5pcXVlX3B0cjxDb250ZXh0TWVudT4gV2ViQ29udGV4dE1lbnVDbGllbnQ6 OmN1c3RvbWl6ZU1lbnUoc3RkOjp1bmlxdWVfcHRyPENvbnRleHRNZW51PiBtZW51KQogewotICAg IHN0ZDo6dW5pcXVlX3B0cjxDb250ZXh0TWVudT4gbWVudSA9IFdURjo6bW92ZShwb3BNZW51KTsK LQotICAgIENPTVB0cjxJV2ViVUlEZWxlZ2F0ZT4gdWlEZWxlZ2F0ZTsKLSAgICBpZiAoRkFJTEVE KG1fd2ViVmlldy0+dWlEZWxlZ2F0ZSgmdWlEZWxlZ2F0ZSkpKQotICAgICAgICByZXR1cm4gbWVu dTsKLQotICAgIEFTU0VSVCh1aURlbGVnYXRlKTsKLQotICAgIEhNRU5VIG5hdGl2ZU1lbnUgPSBt ZW51LT5wbGF0Zm9ybUNvbnRleHRNZW51KCk7Ci0gICAgQ09NUHRyPFdlYkVsZW1lbnRQcm9wZXJ0 eUJhZz4gcHJvcGVydHlCYWc7Ci0gICAgcHJvcGVydHlCYWcuYWRvcHRSZWYoV2ViRWxlbWVudFBy b3BlcnR5QmFnOjpjcmVhdGVJbnN0YW5jZShtX3dlYlZpZXctPnBhZ2UoKS0+Y29udGV4dE1lbnVD b250cm9sbGVyKCkuaGl0VGVzdFJlc3VsdCgpKSk7Ci0gICAgLy8gRklYTUU6IFdlIG5lZWQgdG8g ZGVjaWRlIHdoZXRoZXIgdG8gZG8gdGhlIGRlZmF1bHQgYmVmb3JlIGNhbGxpbmcgdGhpcyBkZWxl Z2F0ZSBtZXRob2QKLSAgICBpZiAoRkFJTEVEKHVpRGVsZWdhdGUtPmNvbnRleHRNZW51SXRlbXNG b3JFbGVtZW50KG1fd2ViVmlldywgcHJvcGVydHlCYWcuZ2V0KCksIG5hdGl2ZU1lbnUsICZuYXRp dmVNZW51KSkpIHsKLSAgICAgICAgOjpEZXN0cm95TWVudShuYXRpdmVNZW51KTsKLSAgICAgICAg cmV0dXJuIG1lbnU7Ci0gICAgfQotICAgIAotICAgIHN0ZDo6dW5pcXVlX3B0cjxDb250ZXh0TWVu dT4gY3VzdG9taXplZE1lbnUgPSBzdGQ6OnVuaXF1ZV9wdHI8Q29udGV4dE1lbnU+KG5ldyBDb250 ZXh0TWVudShuYXRpdmVNZW51KSk7Ci0gICAgOjpEZXN0cm95TWVudShuYXRpdmVNZW51KTsKLQot ICAgIHJldHVybiBjdXN0b21pemVkTWVudTsKKyAgICByZXR1cm4gV1RGOjptb3ZlKG1lbnUpOwog fQogCiB2b2lkIFdlYkNvbnRleHRNZW51Q2xpZW50Ojpjb250ZXh0TWVudUl0ZW1TZWxlY3RlZChD b250ZXh0TWVudUl0ZW0qIGl0ZW0sIGNvbnN0IENvbnRleHRNZW51KiBwYXJlbnRNZW51KQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC93aW4vV2ViVmlldy5jcHAgYi9Tb3VyY2UvV2ViS2l0L3dp bi9XZWJWaWV3LmNwcAppbmRleCAwMzYyMzYwYjM3NjhkYWExYmUyY2Y2YmM1ZDcwMjZhZjZkY2Ji Mzg5Li5lOGE2ODdjNTZhOGQxYWYxOGIyN2NjOThhOGQ0NTM1ZTc1NGJiZjI3IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJWaWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L3dpbi9X ZWJWaWV3LmNwcApAQCAtMTM5Myw2ICsxMzkzLDM2IEBAIFBhZ2UqIFdlYlZpZXc6OnBhZ2UoKQog ICAgIHJldHVybiBtX3BhZ2U7CiB9CiAKK0hNRU5VIFdlYlZpZXc6OmNyZWF0ZUNvbnRleHRNZW51 KCkKK3sKKyAgICBhdXRvJiBjb250ZXh0TWVudUNvbnRyb2xsZXIgPSBtX3BhZ2UtPmNvbnRleHRN ZW51Q29udHJvbGxlcigpOworCisgICAgQ29udGV4dE1lbnUqIGNvcmVNZW51ID0gY29udGV4dE1l bnVDb250cm9sbGVyLmNvbnRleHRNZW51KCk7CisgICAgaWYgKCFjb3JlTWVudSkKKyAgICAgICAg cmV0dXJuIG51bGxwdHI7CisKKyAgICBITUVOVSBjb250ZXh0TWVudSA9IGNvcmVNZW51LT5wbGF0 Zm9ybUNvbnRleHRNZW51KCk7CisKKyAgICBDT01QdHI8SVdlYlVJRGVsZWdhdGU+IHVpRGVsZWdh dGU7CisgICAgaWYgKFNVQ0NFRURFRCh0aGlzLT51aURlbGVnYXRlKCZ1aURlbGVnYXRlKSkpIHsK KyAgICAgICAgQVNTRVJUKHVpRGVsZWdhdGUpOworCisgICAgICAgIENPTVB0cjxXZWJFbGVtZW50 UHJvcGVydHlCYWc+IHByb3BlcnR5QmFnOworICAgICAgICBwcm9wZXJ0eUJhZy5hZG9wdFJlZihX ZWJFbGVtZW50UHJvcGVydHlCYWc6OmNyZWF0ZUluc3RhbmNlKGNvbnRleHRNZW51Q29udHJvbGxl ci5oaXRUZXN0UmVzdWx0KCkpKTsKKworICAgICAgICBITUVOVSBuZXdNZW51ID0gbnVsbHB0cjsK KyAgICAgICAgaWYgKFNVQ0NFRURFRCh1aURlbGVnYXRlLT5jb250ZXh0TWVudUl0ZW1zRm9yRWxl bWVudCh0aGlzLCBwcm9wZXJ0eUJhZy5nZXQoKSwgY29udGV4dE1lbnUsICZuZXdNZW51KSkpIHsK KyAgICAgICAgICAgIC8vIE1ha2Ugc3VyZSB0byBkZWxldGUgdGhlIG9sZCBtZW51IGlmIHRoZSBk ZWxlZ2F0ZSByZXR1cm5lZCBhIG5ldyBtZW51LgorICAgICAgICAgICAgaWYgKG5ld01lbnUgIT0g Y29udGV4dE1lbnUpIHsKKyAgICAgICAgICAgICAgICA6OkRlc3Ryb3lNZW51KGNvbnRleHRNZW51 KTsKKyAgICAgICAgICAgICAgICBjb250ZXh0TWVudSA9IG5ld01lbnU7CisgICAgICAgICAgICB9 CisgICAgICAgIH0KKyAgICB9CisKKyAgICByZXR1cm4gY29udGV4dE1lbnU7Cit9CisKIGJvb2wg V2ViVmlldzo6aGFuZGxlQ29udGV4dE1lbnVFdmVudChXUEFSQU0gd1BhcmFtLCBMUEFSQU0gbFBh cmFtKQogewogICAgIC8vIFRyYW5zbGF0ZSB0aGUgc2NyZWVuIGNvb3JkaW5hdGVzIGludG8gd2lu ZG93IGNvb3JkaW5hdGVzCkBAIC0xNDU2LDE5ICsxNDg2LDIzIEBAIGJvb2wgV2ViVmlldzo6aGFu ZGxlQ29udGV4dE1lbnVFdmVudChXUEFSQU0gd1BhcmFtLCBMUEFSQU0gbFBhcmFtKQogICAgIGlm ICghOjpDbGllbnRUb1NjcmVlbihtX3ZpZXdXaW5kb3csICZwb2ludCkpCiAgICAgICAgIHJldHVy biBmYWxzZTsKIAorICAgIEhNRU5VIGNvbnRleHRNZW51ID0gY3JlYXRlQ29udGV4dE1lbnUoKTsK KwogICAgIEJPT0wgaGFzQ3VzdG9tTWVudXMgPSBmYWxzZTsKICAgICBpZiAobV91aURlbGVnYXRl KQogICAgICAgICBtX3VpRGVsZWdhdGUtPmhhc0N1c3RvbU1lbnVJbXBsZW1lbnRhdGlvbigmaGFz Q3VzdG9tTWVudXMpOwogCiAgICAgaWYgKGhhc0N1c3RvbU1lbnVzKQotICAgICAgICBtX3VpRGVs ZWdhdGUtPnRyYWNrQ3VzdG9tUG9wdXBNZW51KChJV2ViVmlldyopdGhpcywgY29yZU1lbnUtPnBs YXRmb3JtQ29udGV4dE1lbnUoKSwgJnBvaW50KTsKKyAgICAgICAgbV91aURlbGVnYXRlLT50cmFj a0N1c3RvbVBvcHVwTWVudSgoSVdlYlZpZXcqKXRoaXMsIGNvbnRleHRNZW51LCAmcG9pbnQpOwog ICAgIGVsc2UgewogICAgICAgICAvLyBTdXJwcmlzaW5nbHksIFRQTV9SSUdIVEJVVFRPTiBtZWFu cyB0aGF0IGl0ZW1zIGFyZSBzZWxlY3RhYmxlIHdpdGggZWl0aGVyIHRoZSByaWdodCBPUiBsZWZ0 IG1vdXNlIGJ1dHRvbgogICAgICAgICBVSU5UIGZsYWdzID0gVFBNX1JJR0hUQlVUVE9OIHwgVFBN X1RPUEFMSUdOIHwgVFBNX1ZFUlBPU0FOSU1BVElPTiB8IFRQTV9IT1JJWk9OVEFMCiAgICAgICAg ICAgICB8IFRQTV9MRUZUQUxJR04gfCBUUE1fSE9SUE9TQU5JTUFUSU9OOwotICAgICAgICA6OlRy YWNrUG9wdXBNZW51RXgoY29yZU1lbnUtPnBsYXRmb3JtQ29udGV4dE1lbnUoKSwgZmxhZ3MsIHBv aW50LngsIHBvaW50LnksIG1fdmlld1dpbmRvdywgMCk7CisgICAgICAgIDo6VHJhY2tQb3B1cE1l bnVFeChjb250ZXh0TWVudSwgZmxhZ3MsIHBvaW50LngsIHBvaW50LnksIG1fdmlld1dpbmRvdywg MCk7CiAgICAgfQogCisgICAgOjpEZXN0cm95TWVudShjb250ZXh0TWVudSk7CisKICAgICByZXR1 cm4gdHJ1ZTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC93aW4vV2ViVmlldy5oIGIv U291cmNlL1dlYktpdC93aW4vV2ViVmlldy5oCmluZGV4IDY5NWIwNzU1MjhlMjRiMTA3OTE2YjU0 ZWM2OTc2YmMxYWYxNmY2MWYuLjRiZjAxOTRjNWJjZmY0NmI0NjhiMTk3NmI0Y2I3Y2E4ZDNmY2Q3 MDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvd2luL1dlYlZpZXcuaAorKysgYi9Tb3VyY2Uv V2ViS2l0L3dpbi9XZWJWaWV3LmgKQEAgLTQwMCw2ICs0MDAsNyBAQCBwdWJsaWM6CiAgICAgYm9v bCBoYW5kbGVNb3VzZUV2ZW50KFVJTlQsIFdQQVJBTSwgTFBBUkFNKTsKICAgICB2b2lkIHNldE1v dXNlQWN0aXZhdGVkKGJvb2wgZmxhZykgeyBtX21vdXNlQWN0aXZhdGVkID0gZmxhZzsgfQogICAg IGJvb2wgaGFuZGxlQ29udGV4dE1lbnVFdmVudChXUEFSQU0sIExQQVJBTSk7CisgICAgSE1FTlUg Y3JlYXRlQ29udGV4dE1lbnUoKTsKICAgICBib29sIG9uTWVhc3VyZUl0ZW0oV1BBUkFNLCBMUEFS QU0pOwogICAgIGJvb2wgb25EcmF3SXRlbShXUEFSQU0sIExQQVJBTSk7CiAgICAgYm9vbCBvbklu aXRNZW51UG9wdXAoV1BBUkFNLCBMUEFSQU0pOwo=