207196 2020-02-04 07:00:37 -0800 [WPE] Add support for rendering menu list buttons 2020-02-05 01:14:25 -0800 1 1 1 Unclassified WebKit WPE WebKit WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 cgarcia webkit-unassigned bugs-noreply zan oldest_to_newest 1614508 0 cgarcia 2020-02-04 07:00:37 -0800 . 1614511 1 389656 cgarcia 2020-02-04 07:02:54 -0800 Created attachment 389656 Patch 1614975 2 cgarcia 2020-02-05 01:14:25 -0800 Committed r255789: <https://trac.webkit.org/changeset/255789> 389656 2020-02-04 07:02:54 -0800 2020-02-04 07:14:06 -0800 Patch wpe-combos.diff text/plain 7433 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAzOWI3ZGIxOGJjMi4uNWZkYjE3MDVjODEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMiBAQAorMjAyMC0wMi0wNCAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGln YWxpYS5jb20+CisKKyAgICAgICAgW1dQRV0gQWRkIHN1cHBvcnQgZm9yIHJlbmRlcmluZyBtZW51 IGxpc3QgYnV0dG9ucworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjA3MTk2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBwbGF0Zm9ybS93cGUvUmVuZGVyVGhlbWVXUEUuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyVGhlbWVXUEU6OnN1cHBvcnRzRm9jdXNSaW5nIGNvbnN0KToKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlclRoZW1lV1BFOjphZGp1c3RUZXh0RmllbGRTdHlsZSBjb25zdCk6CisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZVdQRTo6cGFpbnRUZXh0RmllbGQpOgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyVGhlbWVXUEU6OnBhaW50VGV4dEFyZWEpOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyVGhlbWVXUEU6OmFkanVzdFNlYXJjaEZpZWxkU3R5bGUgY29uc3QpOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVXUEU6OnBhaW50U2VhcmNoRmllbGQpOgorICAgICAgICAo V2ViQ29yZTo6cGFpbnRGb2N1cyk6CisgICAgICAgIChXZWJDb3JlOjpwYWludEFycm93KToKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lV1BFOjpwb3B1cEludGVybmFsUGFkZGluZ0JveCBj b25zdCk6CisgICAgICAgICogcGxhdGZvcm0vd3BlL1JlbmRlclRoZW1lV1BFLmg6CisKIDIwMjAt MDEtMzAgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAg ICAgIFtXUEVdIEFkZCBpbml0aWFsIHN1cHBvcnQgZm9yIHJlbmRlcmluZyBzY3JvbGxiYXJzCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS93cGUvUmVuZGVyVGhlbWVXUEUuY3Bw IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vd3BlL1JlbmRlclRoZW1lV1BFLmNwcAppbmRleCBm YmI4ZWQzODRjMC4uNGQ4YTE0NTExMDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL3dwZS9SZW5kZXJUaGVtZVdQRS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v d3BlL1JlbmRlclRoZW1lV1BFLmNwcApAQCAtMjYsMTkgKzI2LDYxIEBACiAjaW5jbHVkZSAiY29u ZmlnLmgiCiAjaW5jbHVkZSAiUmVuZGVyVGhlbWVXUEUuaCIKIAorI2luY2x1ZGUgIkNvbG9yLmgi CisjaW5jbHVkZSAiRmxvYXRSb3VuZGVkUmVjdC5oIgorI2luY2x1ZGUgIkdyYXBoaWNzQ29udGV4 dC5oIgogI2luY2x1ZGUgIk5vdEltcGxlbWVudGVkLmgiCisjaW5jbHVkZSAiUGFpbnRJbmZvLmgi CisjaW5jbHVkZSAiUmVuZGVyQm94LmgiCisjaW5jbHVkZSAiUmVuZGVyT2JqZWN0LmgiCisjaW5j bHVkZSAiUmVuZGVyU3R5bGUuaCIKICNpbmNsdWRlICJVc2VyQWdlbnRTY3JpcHRzLmgiCiAjaW5j bHVkZSAiVXNlckFnZW50U3R5bGVTaGVldHMuaCIKICNpbmNsdWRlIDx3dGYvdGV4dC9TdHJpbmdC dWlsZGVyLmg+CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAorc3RhdGljIGNvbnN0IGludCBmb2N1 c09mZnNldCA9IDM7CitzdGF0aWMgY29uc3QgdW5zaWduZWQgZm9jdXNMaW5lV2lkdGggPSAxOwor c3RhdGljIGNvbnN0IENvbG9yIGZvY3VzQ29sb3IgPSBtYWtlUkdCQSg0NiwgNTIsIDU0LCAxNTAp Oworc3RhdGljIGNvbnN0IHVuc2lnbmVkIGFycm93U2l6ZSA9IDE2Oworc3RhdGljIGNvbnN0IENv bG9yIGFycm93Q29sb3IgPSBtYWtlUkdCKDQ2LCA1MiwgNTQpOworc3RhdGljIGNvbnN0IHVuc2ln bmVkIG1lbnVMaXN0QnV0dG9uUGFkZGluZyA9IDU7CitzdGF0aWMgY29uc3QgaW50IG1lbnVMaXN0 QnV0dG9uQm9yZGVyU2l6ZSA9IDE7CitzdGF0aWMgY29uc3QgQ29sb3IgbWVudUxpc3RCdXR0b25C YWNrZ3JvdW5kQm9yZGVyQ29sb3IgPSBtYWtlUkdCKDIwNSwgMTk5LCAxOTQpOworc3RhdGljIGNv bnN0IENvbG9yIG1lbnVMaXN0QnV0dG9uQmFja2dyb3VuZENvbG9yID0gbWFrZVJHQigyNDQsIDI0 MiwgMjQxKTsKK3N0YXRpYyBjb25zdCBDb2xvciBtZW51TGlzdEJ1dHRvbkJhY2tncm91bmRQcmVz c2VkQ29sb3IgPSBtYWtlUkdCKDIxNCwgMjA5LCAyMDUpOworc3RhdGljIGNvbnN0IENvbG9yIG1l bnVMaXN0QnV0dG9uQmFja2dyb3VuZEhvdmVyZWRDb2xvciA9IG1ha2VSR0IoMjQ4LCAyNDgsIDI0 Nyk7CisKIFJlbmRlclRoZW1lJiBSZW5kZXJUaGVtZTo6c2luZ2xldG9uKCkKIHsKICAgICBzdGF0 aWMgTmV2ZXJEZXN0cm95ZWQ8UmVuZGVyVGhlbWVXUEU+IHRoZW1lOwogICAgIHJldHVybiB0aGVt ZTsKIH0KIAorYm9vbCBSZW5kZXJUaGVtZVdQRTo6c3VwcG9ydHNGb2N1c1JpbmcoY29uc3QgUmVu ZGVyU3R5bGUmIHN0eWxlKSBjb25zdAoreworICAgIHN3aXRjaCAoc3R5bGUuYXBwZWFyYW5jZSgp KSB7CisgICAgY2FzZSBQdXNoQnV0dG9uUGFydDoKKyAgICBjYXNlIEJ1dHRvblBhcnQ6CisgICAg Y2FzZSBUZXh0RmllbGRQYXJ0OgorICAgIGNhc2UgVGV4dEFyZWFQYXJ0OgorICAgIGNhc2UgU2Vh cmNoRmllbGRQYXJ0OgorICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgY2FzZSBNZW51bGlzdFBh cnQ6CisgICAgICAgIHJldHVybiB0cnVlOworICAgIGNhc2UgUmFkaW9QYXJ0OgorICAgIGNhc2Ug Q2hlY2tib3hQYXJ0OgorICAgIGNhc2UgU2xpZGVySG9yaXpvbnRhbFBhcnQ6CisgICAgY2FzZSBT bGlkZXJWZXJ0aWNhbFBhcnQ6CisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICBkZWZhdWx0Ogor ICAgICAgICBicmVhazsKKyAgICB9CisKKyAgICByZXR1cm4gZmFsc2U7Cit9CisKIHZvaWQgUmVu ZGVyVGhlbWVXUEU6OnVwZGF0ZUNhY2hlZFN5c3RlbUZvbnREZXNjcmlwdGlvbihDU1NWYWx1ZUlE LCBGb250Q2FzY2FkZURlc2NyaXB0aW9uJikgY29uc3QKIHsKICAgICBub3RJbXBsZW1lbnRlZCgp OwpAQCAtNjMsNCArMTA1LDg5IEBAIFN0cmluZyBSZW5kZXJUaGVtZVdQRTo6bWVkaWFDb250cm9s c1NjcmlwdCgpCiAgICAgcmV0dXJuIHNjcmlwdEJ1aWxkZXIudG9TdHJpbmcoKTsKIH0KICNlbmRp ZgorCitzdGF0aWMgdm9pZCBwYWludEZvY3VzKEdyYXBoaWNzQ29udGV4dCYgZ3JhcGhpY3NDb250 ZXh0LCBjb25zdCBGbG9hdFJlY3QmIHJlY3QpCit7CisgICAgRmxvYXRSZWN0IGZvY3VzUmVjdCA9 IHJlY3Q7CisgICAgZm9jdXNSZWN0LmluZmxhdGUoLWZvY3VzT2Zmc2V0KTsKKyAgICBncmFwaGlj c0NvbnRleHQuc2V0U3Ryb2tlVGhpY2tuZXNzKGZvY3VzTGluZVdpZHRoKTsKKyAgICBncmFwaGlj c0NvbnRleHQuc2V0TGluZURhc2goeyBmb2N1c0xpbmVXaWR0aCwgMiAqIGZvY3VzTGluZVdpZHRo IH0sIDApOworICAgIGdyYXBoaWNzQ29udGV4dC5zZXRMaW5lQ2FwKFNxdWFyZUNhcCk7CisgICAg Z3JhcGhpY3NDb250ZXh0LnNldExpbmVKb2luKE1pdGVySm9pbik7CisKKyAgICBQYXRoIHBhdGg7 CisgICAgcGF0aC5hZGRSb3VuZGVkUmVjdChmb2N1c1JlY3QsIHsgNSwgNSB9KTsKKyAgICBncmFw aGljc0NvbnRleHQuc2V0U3Ryb2tlQ29sb3IoZm9jdXNDb2xvcik7CisgICAgZ3JhcGhpY3NDb250 ZXh0LnN0cm9rZVBhdGgocGF0aCk7Cit9CisKK3N0YXRpYyB2b2lkIHBhaW50QXJyb3coR3JhcGhp Y3NDb250ZXh0JiBncmFwaGljc0NvbnRleHQsIGNvbnN0IEZsb2F0UmVjdCYgcmVjdCkKK3sKKyAg ICBQYXRoIHBhdGg7CisgICAgcGF0aC5tb3ZlVG8oeyByZWN0LngoKSArIDMsIHJlY3QueSgpICsg NiB9KTsKKyAgICBwYXRoLmFkZExpbmVUbyh7IHJlY3QueCgpICsgMTMsIHJlY3QueSgpICsgNiB9 KTsKKyAgICBwYXRoLmFkZExpbmVUbyh7IHJlY3QueCgpICsgOCwgcmVjdC55KCkgKyAxMSB9KTsK KyAgICBwYXRoLmNsb3NlU3VicGF0aCgpOworCisgICAgZ3JhcGhpY3NDb250ZXh0LnNldEZpbGxD b2xvcihhcnJvd0NvbG9yKTsKKyAgICBncmFwaGljc0NvbnRleHQuZmlsbFBhdGgocGF0aCk7Cit9 CisKK0xlbmd0aEJveCBSZW5kZXJUaGVtZVdQRTo6cG9wdXBJbnRlcm5hbFBhZGRpbmdCb3goY29u c3QgUmVuZGVyU3R5bGUmIHN0eWxlKSBjb25zdAoreworICAgIGlmIChzdHlsZS5hcHBlYXJhbmNl KCkgPT0gTm9Db250cm9sUGFydCkKKyAgICAgICAgcmV0dXJuIHsgfTsKKworICAgIGludCBsZWZ0 UGFkZGluZyA9IG1lbnVMaXN0QnV0dG9uUGFkZGluZyArIChzdHlsZS5kaXJlY3Rpb24oKSA9PSBU ZXh0RGlyZWN0aW9uOjpSVEwgPyBhcnJvd1NpemUgOiAwKTsKKyAgICBpbnQgcmlnaHRQYWRkaW5n ID0gbWVudUxpc3RCdXR0b25QYWRkaW5nICsgKHN0eWxlLmRpcmVjdGlvbigpID09IFRleHREaXJl Y3Rpb246OkxUUiA/IGFycm93U2l6ZSA6IDApOworCisgICAgcmV0dXJuIHsgbWVudUxpc3RCdXR0 b25QYWRkaW5nLCByaWdodFBhZGRpbmcsIG1lbnVMaXN0QnV0dG9uUGFkZGluZywgbGVmdFBhZGRp bmcgfTsKK30KKworYm9vbCBSZW5kZXJUaGVtZVdQRTo6cGFpbnRNZW51TGlzdChjb25zdCBSZW5k ZXJPYmplY3QmIHJlbmRlck9iamVjdCwgY29uc3QgUGFpbnRJbmZvJiBwYWludEluZm8sIGNvbnN0 IEZsb2F0UmVjdCYgcmVjdCkKK3sKKyAgICBhdXRvJiBncmFwaGljc0NvbnRleHQgPSBwYWludElu Zm8uY29udGV4dCgpOworICAgIEdyYXBoaWNzQ29udGV4dFN0YXRlU2F2ZXIgc3RhdGVTYXZlcihn cmFwaGljc0NvbnRleHQpOworCisgICAgRmxvYXRSZWN0IGZpZWxkUmVjdCA9IHJlY3Q7CisgICAg RmxvYXRTaXplIGNvcm5lcig1LCA1KTsKKyAgICBQYXRoIHBhdGg7CisgICAgcGF0aC5hZGRSb3Vu ZGVkUmVjdChmaWVsZFJlY3QsIGNvcm5lcik7CisgICAgZmllbGRSZWN0LmluZmxhdGUoLW1lbnVM aXN0QnV0dG9uQm9yZGVyU2l6ZSk7CisgICAgcGF0aC5hZGRSb3VuZGVkUmVjdChmaWVsZFJlY3Qs IGNvcm5lcik7CisgICAgZ3JhcGhpY3NDb250ZXh0LnNldEZpbGxSdWxlKFdpbmRSdWxlOjpFdmVu T2RkKTsKKyAgICBncmFwaGljc0NvbnRleHQuc2V0RmlsbENvbG9yKG1lbnVMaXN0QnV0dG9uQmFj a2dyb3VuZEJvcmRlckNvbG9yKTsKKyAgICBncmFwaGljc0NvbnRleHQuZmlsbFBhdGgocGF0aCk7 CisgICAgcGF0aC5jbGVhcigpOworCisgICAgcGF0aC5hZGRSb3VuZGVkUmVjdChmaWVsZFJlY3Qs IGNvcm5lcik7CisgICAgZ3JhcGhpY3NDb250ZXh0LnNldEZpbGxSdWxlKFdpbmRSdWxlOjpOb25a ZXJvKTsKKyAgICBpZiAoaXNQcmVzc2VkKHJlbmRlck9iamVjdCkpCisgICAgICAgIGdyYXBoaWNz Q29udGV4dC5zZXRGaWxsQ29sb3IobWVudUxpc3RCdXR0b25CYWNrZ3JvdW5kUHJlc3NlZENvbG9y KTsKKyAgICBlbHNlIGlmIChpc0hvdmVyZWQocmVuZGVyT2JqZWN0KSkKKyAgICAgICAgZ3JhcGhp Y3NDb250ZXh0LnNldEZpbGxDb2xvcihtZW51TGlzdEJ1dHRvbkJhY2tncm91bmRIb3ZlcmVkQ29s b3IpOworICAgIGVsc2UKKyAgICAgICAgZ3JhcGhpY3NDb250ZXh0LnNldEZpbGxDb2xvcihtZW51 TGlzdEJ1dHRvbkJhY2tncm91bmRDb2xvcik7CisgICAgZ3JhcGhpY3NDb250ZXh0LmZpbGxQYXRo KHBhdGgpOworICAgIHBhdGguY2xlYXIoKTsKKworICAgIGlmIChyZW5kZXJPYmplY3Quc3R5bGUo KS5kaXJlY3Rpb24oKSA9PSBUZXh0RGlyZWN0aW9uOjpMVFIpCisgICAgICAgIGZpZWxkUmVjdC5t b3ZlKGZpZWxkUmVjdC53aWR0aCgpIC0gKGFycm93U2l6ZSArIG1lbnVMaXN0QnV0dG9uUGFkZGlu ZyksIChmaWVsZFJlY3QuaGVpZ2h0KCkgLyAyLikgLSAoYXJyb3dTaXplIC8gMikpOworICAgIGVs c2UKKyAgICAgICAgZmllbGRSZWN0Lm1vdmUobWVudUxpc3RCdXR0b25QYWRkaW5nLCAoZmllbGRS ZWN0LmhlaWdodCgpIC8gMi4pIC0gKGFycm93U2l6ZSAvIDIpKTsKKyAgICBmaWVsZFJlY3Quc2V0 V2lkdGgoYXJyb3dTaXplKTsKKyAgICBmaWVsZFJlY3Quc2V0SGVpZ2h0KGFycm93U2l6ZSk7Cisg ICAgcGFpbnRBcnJvdyhncmFwaGljc0NvbnRleHQsIGZpZWxkUmVjdCk7CisKKyAgICBpZiAoaXNG b2N1c2VkKHJlbmRlck9iamVjdCkpCisgICAgICAgIHBhaW50Rm9jdXMoZ3JhcGhpY3NDb250ZXh0 LCByZWN0KTsKKworICAgIHJldHVybiBmYWxzZTsKK30KKworYm9vbCBSZW5kZXJUaGVtZVdQRTo6 cGFpbnRNZW51TGlzdEJ1dHRvbkRlY29yYXRpb25zKGNvbnN0IFJlbmRlckJveCYgcmVuZGVyT2Jq ZWN0LCBjb25zdCBQYWludEluZm8mIHBhaW50SW5mbywgY29uc3QgRmxvYXRSZWN0JiByZWN0KQor eworICAgIHJldHVybiBwYWludE1lbnVMaXN0KHJlbmRlck9iamVjdCwgcGFpbnRJbmZvLCByZWN0 KTsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vd3BlL1JlbmRlclRoZW1lV1BFLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS93cGUvUmVuZGVyVGhlbWVXUEUuaAppbmRleCBiMjE0NjBiYmI1NC4uYjFjYmE1ZTQxZDIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3dwZS9SZW5kZXJUaGVtZVdQRS5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3dwZS9SZW5kZXJUaGVtZVdQRS5oCkBAIC00Myw3 ICs0MywxNSBAQCBwcml2YXRlOgogICAgIFJlbmRlclRoZW1lV1BFKCkgPSBkZWZhdWx0OwogICAg IHZpcnR1YWwgflJlbmRlclRoZW1lV1BFKCkgPSBkZWZhdWx0OwogCisgICAgYm9vbCBzdXBwb3J0 c0hvdmVyKGNvbnN0IFJlbmRlclN0eWxlJikgY29uc3Qgb3ZlcnJpZGUgeyByZXR1cm4gdHJ1ZTsg fQorICAgIGJvb2wgc3VwcG9ydHNGb2N1c1JpbmcoY29uc3QgUmVuZGVyU3R5bGUmKSBjb25zdCBv dmVycmlkZTsKKwogICAgIHZvaWQgdXBkYXRlQ2FjaGVkU3lzdGVtRm9udERlc2NyaXB0aW9uKENT U1ZhbHVlSUQsIEZvbnRDYXNjYWRlRGVzY3JpcHRpb24mKSBjb25zdCBvdmVycmlkZTsKKworICAg IGJvb2wgcG9wc01lbnVCeVNwYWNlT3JSZXR1cm4oKSBjb25zdCBvdmVycmlkZSB7IHJldHVybiB0 cnVlOyB9CisgICAgTGVuZ3RoQm94IHBvcHVwSW50ZXJuYWxQYWRkaW5nQm94KGNvbnN0IFJlbmRl clN0eWxlJikgY29uc3Qgb3ZlcnJpZGU7CisgICAgYm9vbCBwYWludE1lbnVMaXN0KGNvbnN0IFJl bmRlck9iamVjdCYsIGNvbnN0IFBhaW50SW5mbyYsIGNvbnN0IEZsb2F0UmVjdCYpIG92ZXJyaWRl OworICAgIGJvb2wgcGFpbnRNZW51TGlzdEJ1dHRvbkRlY29yYXRpb25zKGNvbnN0IFJlbmRlckJv eCYsIGNvbnN0IFBhaW50SW5mbyYsIGNvbnN0IEZsb2F0UmVjdCYpIG92ZXJyaWRlOwogfTsKIAog fSAvLyBuYW1lc3BhY2UgV2ViQ29yZQo=