150476 2015-10-22 15:19:24 -0700 Simplify menu creation 2015-10-22 15:27:59 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 1135866 0 andersca 2015-10-22 15:19:24 -0700 Simplify menu creation 1135867 1 263872 andersca 2015-10-22 15:20:23 -0700 Created attachment 263872 Patch 1135872 2 andersca 2015-10-22 15:27:59 -0700 Committed r191482: <http://trac.webkit.org/changeset/191482> 263872 2015-10-22 15:20:23 -0700 2015-10-22 15:25:28 -0700 Patch bug-150476-20151022151939.patch text/plain 8460 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTkxNDcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZmUzZmExOGU3ZGQ3MGNj M2NiNDZiMDk2OTg1NjQ1Y2ExZGU4MmFlZS4uODc0MzcwZWQ3NzM3NGJiODgyZTEzMjhhODBkNzJi ZjdkMjYwN2U2MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIzIEBACiAyMDE1LTEwLTIyICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgU2ltcGxpZnkgbWVu dSBjcmVhdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTUwNDc2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgSW5zdGVhZCBvZiBjcmVhdGluZyB2ZWN0b3JzIG9mIE5TTWVudUl0ZW0gb2JqZWN0cywganVz dCBzaW1wbHkgYnVpbGQgdGhlIG1lbnUgcmVjdXJzaXZlbHkuCisKKyAgICAgICAgKiBVSVByb2Nl c3MvbWFjL1dlYkNvbnRleHRNZW51UHJveHlNYWMuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvbWFj L1dlYkNvbnRleHRNZW51UHJveHlNYWMubW06CisgICAgICAgIChXZWJLaXQ6OldlYkNvbnRleHRN ZW51UHJveHlNYWM6OmNyZWF0ZUNvbnRleHRNZW51RnJvbUl0ZW1zKToKKyAgICAgICAgKFdlYktp dDo6V2ViQ29udGV4dE1lbnVQcm94eU1hYzo6Y3JlYXRlQ29udGV4dE1lbnVJdGVtKToKKyAgICAg ICAgKFdlYktpdDo6V2ViQ29udGV4dE1lbnVQcm94eU1hYzo6c2hvd0NvbnRleHRNZW51KToKKyAg ICAgICAgKFdlYktpdDo6cG9wdWxhdGVOU01lbnUpOiBEZWxldGVkLgorICAgICAgICAoV2ViS2l0 Ojpuc01lbnVJdGVtKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYktpdDo6bnNNZW51SXRlbVZlY3Rv cik6IERlbGV0ZWQuCisKKzIwMTUtMTAtMjIgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFw cGxlLmNvbT4KKwogICAgICAgICBOYXRpdmVDb250ZXh0TWVudUl0ZW0gaXNuJ3QgbmVlZGVkIGFu eW1vcmUsIHJlbW92ZSBpdAogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTUwNDczCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9t YWMvV2ViQ29udGV4dE1lbnVQcm94eU1hYy5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21h Yy9XZWJDb250ZXh0TWVudVByb3h5TWFjLmgKaW5kZXggNWIxZDc2MmY1ZmY1MDhjOThkNTQyN2Mz ZGEwNzYzNmY4Mjg1NTNiMi4uYzRlYTE1NGJjZGExNjI5M2IxYmQ2Yjg0YzFiYjI0MzMyNTM5YTdk NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XZWJDb250ZXh0TWVu dVByb3h5TWFjLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XZWJDb250ZXh0 TWVudVByb3h5TWFjLmgKQEAgLTU5LDE1ICs1OSwxNCBAQCBwdWJsaWM6CiBwcml2YXRlOgogICAg IHZpcnR1YWwgdm9pZCBzaG93KCkgb3ZlcnJpZGU7CiAKKyAgICBSZXRhaW5QdHI8TlNNZW51SXRl bT4gY3JlYXRlQ29udGV4dE1lbnVJdGVtKGNvbnN0IFdlYkNvbnRleHRNZW51SXRlbURhdGEmKTsK KyAgICBSZXRhaW5QdHI8TlNNZW51PiBjcmVhdGVDb250ZXh0TWVudUZyb21JdGVtcyhjb25zdCBW ZWN0b3I8V2ViQ29udGV4dE1lbnVJdGVtRGF0YT4mKTsKICAgICB2b2lkIHNob3dDb250ZXh0TWVu dSgpOwogCiAjaWYgRU5BQkxFKFNFUlZJQ0VfQ09OVFJPTFMpCiAgICAgdm9pZCBzaG93U2Vydmlj ZXNNZW51KCk7CiAgICAgdm9pZCBzZXR1cFNlcnZpY2VzTWVudSgpOwotLy8gRklYTUU6IFRoaXMg c2hvdWxkbid0IGJlIHB1YmxpYy4KLXB1YmxpYzoKICAgICBXZWJDb3JlOjpDb250ZXh0TWVudUl0 ZW0gc2hhcmVNZW51SXRlbSgpOwotcHJpdmF0ZToKICNlbmRpZgogCiAgICAgUmV0YWluUHRyPE5T TWVudT4gbV9tZW51OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9X ZWJDb250ZXh0TWVudVByb3h5TWFjLm1tIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9X ZWJDb250ZXh0TWVudVByb3h5TWFjLm1tCmluZGV4IGU5ZDY0OTg4YzllZTc3ZDM5NTNlNzc3YWJl OWUyYmZlY2UxOThjODUuLjZjNDhkNDc3YzA1Yzc3OWRhYTJjOTQxMjAyMzcwZjczNGQzMDJhOGYg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV2ViQ29udGV4dE1lbnVQ cm94eU1hYy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dlYkNvbnRleHRN ZW51UHJveHlNYWMubW0KQEAgLTE3Miw4NCArMTcyLDYgQEAgdm9pZCBXZWJDb250ZXh0TWVudVBy b3h5TWFjOjpjb250ZXh0TWVudUl0ZW1TZWxlY3RlZChjb25zdCBXZWJDb250ZXh0TWVudUl0ZW1E YXQKICAgICBtX3BhZ2UuY29udGV4dE1lbnVJdGVtU2VsZWN0ZWQoaXRlbSk7CiB9CiAKLXN0YXRp YyB2b2lkIHBvcHVsYXRlTlNNZW51KE5TTWVudSogbWVudSwgY29uc3QgVmVjdG9yPFJldGFpblB0 cjxOU01lbnVJdGVtPj4mIG1lbnVJdGVtVmVjdG9yKQotewotICAgIGZvciAodW5zaWduZWQgaSA9 IDA7IGkgPCBtZW51SXRlbVZlY3Rvci5zaXplKCk7ICsraSkgewotICAgICAgICBOU0ludGVnZXIg b2xkU3RhdGUgPSBbbWVudUl0ZW1WZWN0b3JbaV0uZ2V0KCkgc3RhdGVdOwotICAgICAgICBbbWVu dSBhZGRJdGVtOm1lbnVJdGVtVmVjdG9yW2ldLmdldCgpXTsKLSAgICAgICAgW21lbnVJdGVtVmVj dG9yW2ldLmdldCgpIHNldFN0YXRlOm9sZFN0YXRlXTsKLSAgICB9Ci19Ci0KLXRlbXBsYXRlPHR5 cGVuYW1lIEl0ZW1UeXBlPiBzdGF0aWMgVmVjdG9yPFJldGFpblB0cjxOU01lbnVJdGVtPj4gbnNN ZW51SXRlbVZlY3RvcihXZWJDb250ZXh0TWVudVByb3h5TWFjJiwgY29uc3QgVmVjdG9yPEl0ZW1U eXBlPiYpOwotCi1zdGF0aWMgUmV0YWluUHRyPE5TTWVudUl0ZW0+IG5zTWVudUl0ZW0oV2ViQ29u dGV4dE1lbnVQcm94eU1hYyYgY29udGV4dE1lbnVQcm94eSwgY29uc3QgV2ViQ29udGV4dE1lbnVJ dGVtRGF0YSYgaXRlbSkKLXsKLSNpZiBFTkFCTEUoU0VSVklDRV9DT05UUk9MUykKLSAgICBpZiAo aXRlbS5hY3Rpb24oKSA9PSBDb250ZXh0TWVudUl0ZW1UYWdTaGFyZU1lbnUpCi0gICAgICAgIHJl dHVybiBjb250ZXh0TWVudVByb3h5LnNoYXJlTWVudUl0ZW0oKS5wbGF0Zm9ybURlc2NyaXB0aW9u KCk7Ci0jZW5kaWYKLQotICAgIHN3aXRjaCAoaXRlbS50eXBlKCkpIHsKLSAgICBjYXNlIEFjdGlv blR5cGU6Ci0gICAgY2FzZSBDaGVja2FibGVBY3Rpb25UeXBlOiB7Ci0gICAgICAgIE5TTWVudUl0 ZW0qIG1lbnVJdGVtID0gW1tOU01lbnVJdGVtIGFsbG9jXSBpbml0V2l0aFRpdGxlOm5zU3RyaW5n RnJvbVdlYkNvcmVTdHJpbmcoaXRlbS50aXRsZSgpKSBhY3Rpb246QHNlbGVjdG9yKGZvcndhcmRD b250ZXh0TWVudUFjdGlvbjopIGtleUVxdWl2YWxlbnQ6QCIiXTsKLSAgICAgICAgW21lbnVJdGVt IHNldFRhZzppdGVtLmFjdGlvbigpXTsKLSAgICAgICAgW21lbnVJdGVtIHNldEVuYWJsZWQ6aXRl bS5lbmFibGVkKCldOwotICAgICAgICBbbWVudUl0ZW0gc2V0U3RhdGU6aXRlbS5jaGVja2VkKCkg PyBOU09uU3RhdGUgOiBOU09mZlN0YXRlXTsKLQotICAgICAgICBpZiAoaXRlbS51c2VyRGF0YSgp KSB7Ci0gICAgICAgICAgICBXS1VzZXJEYXRhV3JhcHBlciAqd3JhcHBlciA9IFtbV0tVc2VyRGF0 YVdyYXBwZXIgYWxsb2NdIGluaXRXaXRoVXNlckRhdGE6aXRlbS51c2VyRGF0YSgpXTsKLSAgICAg ICAgICAgIFttZW51SXRlbSBzZXRSZXByZXNlbnRlZE9iamVjdDp3cmFwcGVyXTsKLSAgICAgICAg ICAgIFt3cmFwcGVyIHJlbGVhc2VdOwotICAgICAgICB9Ci0KLSAgICAgICAgcmV0dXJuIGFkb3B0 TlMobWVudUl0ZW0pOwotICAgICAgICBicmVhazsKLSAgICB9Ci0gICAgY2FzZSBTZXBhcmF0b3JU eXBlOgotICAgICAgICByZXR1cm4gW05TTWVudUl0ZW0gc2VwYXJhdG9ySXRlbV07Ci0gICAgICAg IGJyZWFrOwotICAgIGNhc2UgU3VibWVudVR5cGU6IHsKLSAgICAgICAgTlNNZW51KiBtZW51ID0g W1tOU01lbnUgYWxsb2NdIGluaXRXaXRoVGl0bGU6bnNTdHJpbmdGcm9tV2ViQ29yZVN0cmluZyhp dGVtLnRpdGxlKCkpXTsKLSAgICAgICAgW21lbnUgc2V0QXV0b2VuYWJsZXNJdGVtczpOT107Ci0g ICAgICAgIHBvcHVsYXRlTlNNZW51KG1lbnUsIG5zTWVudUl0ZW1WZWN0b3IoY29udGV4dE1lbnVQ cm94eSwgaXRlbS5zdWJtZW51KCkpKTsKLSAgICAgICAgICAgIAotICAgICAgICBOU01lbnVJdGVt KiBtZW51SXRlbSA9IFtbTlNNZW51SXRlbSBhbGxvY10gaW5pdFdpdGhUaXRsZTpuc1N0cmluZ0Zy b21XZWJDb3JlU3RyaW5nKGl0ZW0udGl0bGUoKSkgYWN0aW9uOkBzZWxlY3Rvcihmb3J3YXJkQ29u dGV4dE1lbnVBY3Rpb246KSBrZXlFcXVpdmFsZW50OkAiIl07Ci0gICAgICAgIFttZW51SXRlbSBz ZXRFbmFibGVkOml0ZW0uZW5hYmxlZCgpXTsKLSAgICAgICAgW21lbnVJdGVtIHNldFN1Ym1lbnU6 bWVudV07Ci0gICAgICAgIFttZW51IHJlbGVhc2VdOwotCi0gICAgICAgIHJldHVybiBhZG9wdE5T KG1lbnVJdGVtKTsKLSAgICB9Ci0gICAgZGVmYXVsdDoKLSAgICAgICAgQVNTRVJUX05PVF9SRUFD SEVEKCk7Ci0gICAgfQotfQotCi1zdGF0aWMgUmV0YWluUHRyPE5TTWVudUl0ZW0+IG5zTWVudUl0 ZW0oV2ViQ29udGV4dE1lbnVQcm94eU1hYyYgY29udGV4dE1lbnVQcm94eSwgY29uc3QgUmVmUHRy PFdlYkNvbnRleHRNZW51SXRlbT4mIGl0ZW0pCi17Ci0gICAgcmV0dXJuIG5zTWVudUl0ZW0oY29u dGV4dE1lbnVQcm94eSwgaXRlbS0+ZGF0YSgpKTsKLX0KLQotdGVtcGxhdGU8dHlwZW5hbWUgSXRl bVR5cGU+IHN0YXRpYyBWZWN0b3I8UmV0YWluUHRyPE5TTWVudUl0ZW0+PiBuc01lbnVJdGVtVmVj dG9yKFdlYkNvbnRleHRNZW51UHJveHlNYWMmIGNvbnRleHRNZW51UHJveHksIGNvbnN0IFZlY3Rv cjxJdGVtVHlwZT4mIGl0ZW1zKQotewotICAgIFZlY3RvcjxSZXRhaW5QdHI8TlNNZW51SXRlbT4+ IHJlc3VsdDsKLQotICAgIHVuc2lnbmVkIHNpemUgPSBpdGVtcy5zaXplKCk7Ci0gICAgcmVzdWx0 LnJlc2VydmVDYXBhY2l0eShzaXplKTsKLSAgICBmb3IgKGF1dG8mIGl0ZW0gOiBpdGVtcykgewot ICAgICAgICBpZiAoYXV0byBtZW51SXRlbSA9IG5zTWVudUl0ZW0oY29udGV4dE1lbnVQcm94eSwg aXRlbSkpCi0gICAgICAgICAgICByZXN1bHQudW5jaGVja2VkQXBwZW5kKG1lbnVJdGVtKTsKLSAg ICB9Ci0KLSAgICBXS01lbnVUYXJnZXQqIHRhcmdldCA9IFtXS01lbnVUYXJnZXQgc2hhcmVkTWVu dVRhcmdldF07Ci0gICAgZm9yIChhdXRvJiBpdGVtIDogcmVzdWx0KQotICAgICAgICBbaXRlbS5n ZXQoKSBzZXRUYXJnZXQ6dGFyZ2V0XTsKLSAgICAKLSAgICByZXR1cm4gcmVzdWx0OwotfQotCiAj aWYgRU5BQkxFKFNFUlZJQ0VfQ09OVFJPTFMpCiB2b2lkIFdlYkNvbnRleHRNZW51UHJveHlNYWM6 OnNldHVwU2VydmljZXNNZW51KCkKIHsKQEAgLTM4NSw2ICszMDcsNTcgQEAgdm9pZCBXZWJDb250 ZXh0TWVudVByb3h5TWFjOjpzaG93KCkKICAgICBzaG93Q29udGV4dE1lbnUoKTsKIH0KIAorUmV0 YWluUHRyPE5TTWVudT4gV2ViQ29udGV4dE1lbnVQcm94eU1hYzo6Y3JlYXRlQ29udGV4dE1lbnVG cm9tSXRlbXMoY29uc3QgVmVjdG9yPFdlYkNvbnRleHRNZW51SXRlbURhdGE+JiBpdGVtcykKK3sK KyAgICBhdXRvIG1lbnUgPSBhZG9wdE5TKFtbTlNNZW51IGFsbG9jXSBpbml0V2l0aFRpdGxlOkAi Il0pOworICAgIFttZW51IHNldEF1dG9lbmFibGVzSXRlbXM6Tk9dOworCisgICAgZm9yIChhdXRv JiBpdGVtIDogaXRlbXMpIHsKKyAgICAgICAgaWYgKGF1dG8gbWVudUl0ZW0gPSBjcmVhdGVDb250 ZXh0TWVudUl0ZW0oaXRlbSkpCisgICAgICAgICAgICBbbWVudSBhZGRJdGVtOm1lbnVJdGVtLmdl dCgpXTsKKyAgICB9CisKKyAgICByZXR1cm4gbWVudTsKK30KKworUmV0YWluUHRyPE5TTWVudUl0 ZW0+IFdlYkNvbnRleHRNZW51UHJveHlNYWM6OmNyZWF0ZUNvbnRleHRNZW51SXRlbShjb25zdCBX ZWJDb250ZXh0TWVudUl0ZW1EYXRhJiBpdGVtKQoreworI2lmIEVOQUJMRShTRVJWSUNFX0NPTlRS T0xTKQorICAgIGlmIChpdGVtLmFjdGlvbigpID09IENvbnRleHRNZW51SXRlbVRhZ1NoYXJlTWVu dSkKKyAgICAgICAgcmV0dXJuIHNoYXJlTWVudUl0ZW0oKS5wbGF0Zm9ybURlc2NyaXB0aW9uKCk7 CisjZW5kaWYKKworICAgIHN3aXRjaCAoaXRlbS50eXBlKCkpIHsKKyAgICBjYXNlIEFjdGlvblR5 cGU6CisgICAgY2FzZSBDaGVja2FibGVBY3Rpb25UeXBlOiB7CisgICAgICAgIGF1dG8gbWVudUl0 ZW0gPSBhZG9wdE5TKFtbTlNNZW51SXRlbSBhbGxvY10gaW5pdFdpdGhUaXRsZTppdGVtLnRpdGxl KCkgYWN0aW9uOkBzZWxlY3Rvcihmb3J3YXJkQ29udGV4dE1lbnVBY3Rpb246KSBrZXlFcXVpdmFs ZW50OkAiIl0pOworCisgICAgICAgIFttZW51SXRlbSBzZXRUYWc6aXRlbS5hY3Rpb24oKV07Cisg ICAgICAgIFttZW51SXRlbSBzZXRFbmFibGVkOml0ZW0uZW5hYmxlZCgpXTsKKyAgICAgICAgW21l bnVJdGVtIHNldFN0YXRlOml0ZW0uY2hlY2tlZCgpID8gTlNPblN0YXRlIDogTlNPZmZTdGF0ZV07 CisgICAgICAgIFttZW51SXRlbSBzZXRUYXJnZXQ6W1dLTWVudVRhcmdldCBzaGFyZWRNZW51VGFy Z2V0XV07CisKKyAgICAgICAgaWYgKGl0ZW0udXNlckRhdGEoKSkgeworICAgICAgICAgICAgYXV0 byB3cmFwcGVyID0gYWRvcHROUyhbW1dLVXNlckRhdGFXcmFwcGVyIGFsbG9jXSBpbml0V2l0aFVz ZXJEYXRhOml0ZW0udXNlckRhdGEoKV0pOworICAgICAgICAgICAgW21lbnVJdGVtIHNldFJlcHJl c2VudGVkT2JqZWN0OndyYXBwZXIuZ2V0KCldOworICAgICAgICB9CisKKyAgICAgICAgcmV0dXJu IG1lbnVJdGVtOworICAgIH0KKworICAgIGNhc2UgU2VwYXJhdG9yVHlwZToKKyAgICAgICAgcmV0 dXJuIFtOU01lbnVJdGVtIHNlcGFyYXRvckl0ZW1dOworCisgICAgY2FzZSBTdWJtZW51VHlwZTog eworICAgICAgICBhdXRvIG1lbnVJdGVtID0gYWRvcHROUyhbW05TTWVudUl0ZW0gYWxsb2NdIGlu aXRXaXRoVGl0bGU6aXRlbS50aXRsZSgpIGFjdGlvbjpudWxscHRyIGtleUVxdWl2YWxlbnQ6QCIi XSk7CisgICAgICAgIFttZW51SXRlbSBzZXRFbmFibGVkOml0ZW0uZW5hYmxlZCgpXTsKKyAgICAg ICAgW21lbnVJdGVtIHNldFN1Ym1lbnU6Y3JlYXRlQ29udGV4dE1lbnVGcm9tSXRlbXMoaXRlbS5z dWJtZW51KCkpLmdldCgpXTsKKworICAgICAgICByZXR1cm4gbWVudUl0ZW07CisgICAgfQorICAg IH0KK30KKwogdm9pZCBXZWJDb250ZXh0TWVudVByb3h5TWFjOjpzaG93Q29udGV4dE1lbnUoKQog ewogICAgIFZlY3RvcjxSZWZQdHI8V2ViQ29udGV4dE1lbnVJdGVtPj4gcHJvcG9zZWRBUElJdGVt czsKQEAgLTM5NywxNSArMzcwLDE0IEBAIHZvaWQgV2ViQ29udGV4dE1lbnVQcm94eU1hYzo6c2hv d0NvbnRleHRNZW51KCkKICAgICBpZiAobV9wYWdlLmNvbnRleHRNZW51Q2xpZW50KCkuZ2V0Q29u dGV4dE1lbnVGcm9tUHJvcG9zZWRNZW51KG1fcGFnZSwgcHJvcG9zZWRBUElJdGVtcywgY2xpZW50 SXRlbXMsIG1fY29udGV4dC53ZWJIaXRUZXN0UmVzdWx0RGF0YSgpLCBtX3BhZ2UucHJvY2Vzcygp LnRyYW5zZm9ybUhhbmRsZXNUb09iamVjdHMobV91c2VyRGF0YS5vYmplY3QoKSkuZ2V0KCkpKQog ICAgICAgICB1c2VQcm9wb3NlZEl0ZW1zID0gZmFsc2U7CiAKLSAgICBjb25zdCBWZWN0b3I8UmVm UHRyPFdlYkNvbnRleHRNZW51SXRlbT4+JiBpdGVtcyA9IHVzZVByb3Bvc2VkSXRlbXMgPyBwcm9w b3NlZEFQSUl0ZW1zIDogY2xpZW50SXRlbXM7CisgICAgVmVjdG9yPFdlYkNvbnRleHRNZW51SXRl bURhdGE+IGl0ZW1zOworICAgIGZvciAoYXV0byYgaXRlbSA6ICh1c2VQcm9wb3NlZEl0ZW1zID8g cHJvcG9zZWRBUElJdGVtcyA6IGNsaWVudEl0ZW1zKSkKKyAgICAgICAgaXRlbXMuYXBwZW5kKGl0 ZW0tPmRhdGEoKSk7CiAKICAgICBpZiAoaXRlbXMuaXNFbXB0eSgpKQogICAgICAgICByZXR1cm47 CiAKLSAgICBtX21lbnUgPSBbW05TTWVudSBhbGxvY10gaW5pdFdpdGhUaXRsZTpAIiJdOwotICAg IFttX21lbnUgc2V0QXV0b2VuYWJsZXNJdGVtczpOT107Ci0KLSAgICBwb3B1bGF0ZU5TTWVudSht X21lbnUuZ2V0KCksIG5zTWVudUl0ZW1WZWN0b3IoKnRoaXMsIGl0ZW1zKSk7CisgICAgbV9tZW51 ID0gY3JlYXRlQ29udGV4dE1lbnVGcm9tSXRlbXMoaXRlbXMpOwogCiAgICAgW1tXS01lbnVUYXJn ZXQgc2hhcmVkTWVudVRhcmdldF0gc2V0TWVudVByb3h5OnRoaXNdOwogICAgIFttX21lbnUgcG9w VXBNZW51UG9zaXRpb25pbmdJdGVtOm5pbCBhdExvY2F0aW9uOm1fY29udGV4dC5tZW51TG9jYXRp b24oKSBpblZpZXc6bV93ZWJWaWV3XTsK