89020 2012-06-13 10:44:11 -0700 [BlackBerry] Apply New Style and JS for Select Popup 2012-06-13 19:36:53 -0700 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 89005 0 haizhang webkit-unassigned rakuco tonikitoo webkit.review.bot oldest_to_newest 648239 0 haizhang 2012-06-13 10:44:11 -0700 Use new styled CSS files for select popup, also remove most JS functions to a separate JS file, only pass the parameters to JS, and use new python script for data generating, as the old one is too simple and problematic. 648282 1 147371 haizhang 2012-06-13 11:29:25 -0700 Created attachment 147371 patch 648340 2 147371 rwlbuis 2012-06-13 12:14:29 -0700 Comment on attachment 147371 patch View in context: https://bugs.webkit.org/attachment.cgi?id=147371&action=review Looks good. > Source/WebKit/blackberry/WebCoreSupport/SelectPopupClient.cpp:31 > +#include "PopupPicker.h" The name is slightly generic, I hope we do not have a name clash later.... 648703 3 147371 webkit.review.bot 2012-06-13 19:36:49 -0700 Comment on attachment 147371 patch Clearing flags on attachment: 147371 Committed r120267: <http://trac.webkit.org/changeset/120267> 648704 4 webkit.review.bot 2012-06-13 19:36:53 -0700 All reviewed patches have been landed. Closing bug. 147371 2012-06-13 11:29:25 -0700 2012-06-13 19:36:49 -0700 patch 0001-2012-06-13-Crystal-Zhang-haizhang-rim.com.patch text/plain 10507 haizhang RnJvbSAyNjc1Yzk2MDUyYzhlMjQ3NzQ1YWM2ZTQ5MGMxZjBjOGVlZTc3ZDI4IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBDcnlzdGFsIFpoYW5nIDxoYWl6aGFuZ0ByaW0uY29tPgpEYXRl OiBXZWQsIDEzIEp1biAyMDEyIDE0OjE3OjQ2IC0wNDAwClN1YmplY3Q6IFtQQVRDSF0gMjAxMi0w Ni0xMyAgQ3J5c3RhbCBaaGFuZyAgPGhhaXpoYW5nQHJpbS5jb20+CgogICAgICAgIFtCbGFja0Jl cnJ5XSBBcHBseSBOZXcgU3R5bGUgYW5kIEpTIGZvciBTZWxlY3QgUG9wdXAKICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODkwMjAKCiAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCgogICAgICAgIFBSIDE2Mjg1NAoKICAgICAgICBVc2UgbmV3 IHN0eWxlZCBDU1MgZmlsZXMgZm9yIHNlbGVjdCBwb3B1cCwgYWxzbyByZW1vdmUgbW9zdCBKUyBm dW5jdGlvbnMKICAgICAgICB0byBhIHNlcGFyYXRlIEpTIGZpbGUsIG9ubHkgcGFzcyB0aGUgcGFy YW1ldGVycyB0byBKUywgYW5kIHVzZSBuZXcgcHl0aG9uCiAgICAgICAgc2NyaXB0IGZvciBkYXRh IGdlbmVyYXRpbmcsIGFzIHRoZSBvbGQgb25lIGlzIHRvbyBzaW1wbGUgYW5kIHByb2JsZW1hdGlj LgoKICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L1NlbGVjdFBvcHVwQ2xpZW50LmNwcDoKICAgICAg ICAoV2ViQ29yZTo6U2VsZWN0UG9wdXBDbGllbnQ6OmdlbmVyYXRlSFRNTCk6Ci0tLQogU291cmNl L1dlYkNvcmUvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDEzICsrKwog U291cmNlL1dlYkNvcmUvUGxhdGZvcm1CbGFja0JlcnJ5LmNtYWtlICAgICAgICAgICAgfCAgIDE2 ICsrKy0KIFNvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cgICAgICAgICAgICAgICAg IHwgICAxNiArKysrCiAuLi4vV2ViQ29yZVN1cHBvcnQvU2VsZWN0UG9wdXBDbGllbnQuY3BwICAg ICAgICAgICB8ICAgOTYgKysrKysrKysrKystLS0tLS0tLS0KIDQgZmlsZXMgY2hhbmdlZCwgOTYg aW5zZXJ0aW9ucygrKSwgNDUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IGJmYmE5NzEuLmM0 NTIwYmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2Uv V2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxMi0wNi0xMyAgQ3J5c3RhbCBa aGFuZyAgPGhhaXpoYW5nQHJpbS5jb20+CisKKyAgICAgICAgW0JsYWNrQmVycnldIEFwcGx5IE5l dyBTdHlsZSBhbmQgSlMgZm9yIFNlbGVjdCBQb3B1cAorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODkwMjAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBQUiAxNjI4NTQKKworICAgICAgICBVc2UgbmV3IHB5dGhv biBzY3JpcHQgZm9yIGRhdGEgZ2VuZXJhdGluZywgYXMgdGhlIG9sZCBvbmUgaXMgdG9vIHNpbXBs ZSBhbmQgcHJvYmxlbWF0aWMuCisKKyAgICAgICAgKiBQbGF0Zm9ybUJsYWNrQmVycnkuY21ha2U6 CisKIDIwMTItMDYtMDkgIFZzZXZvbG9kIFZsYXNvdiAgPHZzZXZpa0BjaHJvbWl1bS5vcmc+CiAK ICAgICAgICAgV2ViIEluc3BlY3RvcjogRXJyb3JzIHdoZW4gcGVuZGluZyBjb25zb2xlIG1lc3Nh Z2VzIGFyZSBhdHRhY2hlZCB0byBKYXZhU2NyaXB0U291cmNlRnJhbWUuCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9QbGF0Zm9ybUJsYWNrQmVycnkuY21ha2UgYi9Tb3VyY2UvV2ViQ29yZS9Q bGF0Zm9ybUJsYWNrQmVycnkuY21ha2UKaW5kZXggZDk4MjNjOS4uMjk0MDk1OCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvUGxhdGZvcm1CbGFja0JlcnJ5LmNtYWtlCisrKyBiL1NvdXJjZS9X ZWJDb3JlL1BsYXRmb3JtQmxhY2tCZXJyeS5jbWFrZQpAQCAtMTA2LDcgKzEwNiw2IEBAIExJU1Qo QVBQRU5EIFdlYkNvcmVfU09VUkNFUwogTElTVChBUFBFTkQgV2ViQ29yZV9VU0VSX0FHRU5UX1NU WUxFX1NIRUVUUwogICAgICR7V0VCQ09SRV9ESVJ9L2Nzcy9tZWRpYUNvbnRyb2xzQmxhY2tCZXJy eS5jc3MKICAgICAke1dFQkNPUkVfRElSfS9jc3MvdGhlbWVCbGFja0JlcnJ5LmNzcwotICAgICR7 V0VCQ09SRV9ESVJ9L1Jlc291cmNlcy9ibGFja2JlcnJ5L3BvcHVwQ29udHJvbEJsYWNrQmVycnku Y3NzCiApCiAKIExJU1QoQVBQRU5EIFdlYkNvcmVfSU5DTFVERV9ESVJFQ1RPUklFUwpAQCAtMzUw LDMgKzM0OSwxOCBAQCBGT1JFQUNIIChfZmlsZSAke1dlYkNvcmVfQ1BQX0lETF9GSUxFU30pCiAg ICAgICAgIFZFUkJBVElNKQogICAgIExJU1QoQVBQRU5EIFdlYkNvcmVfU09VUkNFUyAke0RFUklW RURfU09VUkNFU19XRUJDT1JFX0RJUn0vV2ViRE9NJHtfbmFtZX0uY3BwKQogRU5ERk9SRUFDSCAo KQorCisjIEdlbmVyYXRlIGNvbnRlbnRzIGZvciBQb3B1cFBpY2tlci5jcHAKK1NFVChXZWJDb3Jl X1BPUFVQX0NTU19BTkRfSlMKKyAgICAke1dFQkNPUkVfRElSfS9SZXNvdXJjZXMvYmxhY2tiZXJy eS9wb3B1cENvbnRyb2xCbGFja0JlcnJ5LmNzcworICAgICR7V0VCQ09SRV9ESVJ9L1Jlc291cmNl cy9ibGFja2JlcnJ5L3NlbGVjdENvbnRyb2xCbGFja0JlcnJ5LmNzcworICAgICR7V0VCQ09SRV9E SVJ9L1Jlc291cmNlcy9ibGFja2JlcnJ5L3NlbGVjdENvbnRyb2xCbGFja0JlcnJ5LmpzCispCisK K0FERF9DVVNUT01fQ09NTUFORCgKKyAgICBPVVRQVVQgJHtERVJJVkVEX1NPVVJDRVNfV0VCQ09S RV9ESVJ9L1BvcHVwUGlja2VyLmggJHtERVJJVkVEX1NPVVJDRVNfV0VCQ09SRV9ESVJ9L1BvcHVw UGlja2VyLmNwcAorICAgIE1BSU5fREVQRU5ERU5DWSAke1dFQkNPUkVfRElSfS9tYWtlLWZpbGUt YXJyYXlzLnB5CisgICAgREVQRU5EUyAke1dlYkNvcmVfUE9QVVBfQ1NTX0FORF9KU30KKyAgICBD T01NQU5EICR7UFlUSE9OX0VYRUNVVEFCTEV9ICR7V0VCQ09SRV9ESVJ9L21ha2UtZmlsZS1hcnJh eXMucHkgLS1vdXQtaD0ke0RFUklWRURfU09VUkNFU19XRUJDT1JFX0RJUn0vUG9wdXBQaWNrZXIu aCAtLW91dC1jcHA9JHtERVJJVkVEX1NPVVJDRVNfV0VCQ09SRV9ESVJ9L1BvcHVwUGlja2VyLmNw cCAke1dlYkNvcmVfUE9QVVBfQ1NTX0FORF9KU30KKykKK0xJU1QoQVBQRU5EIFdlYkNvcmVfU09V UkNFUyAke0RFUklWRURfU09VUkNFU19XRUJDT1JFX0RJUn0vUG9wdXBQaWNrZXIuY3BwKQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJL aXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cKaW5kZXggMmYwZDBkZS4uZDRhYzdhMSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTItMDYtMTMgIENyeXN0 YWwgWmhhbmcgIDxoYWl6aGFuZ0ByaW0uY29tPgorCisgICAgICAgIFtCbGFja0JlcnJ5XSBBcHBs eSBOZXcgU3R5bGUgYW5kIEpTIGZvciBTZWxlY3QgUG9wdXAKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg5MDIwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUFIgMTYyODU0CisKKyAgICAgICAgVXNlIG5ldyBz dHlsZWQgQ1NTIGZpbGVzIGZvciBzZWxlY3QgcG9wdXAsIGFsc28gcmVtb3ZlIG1vc3QgSlMgZnVu Y3Rpb25zCisgICAgICAgIHRvIGEgc2VwYXJhdGUgSlMgZmlsZSwgb25seSBwYXNzIHRoZSBwYXJh bWV0ZXJzIHRvIEpTLCBhbmQgdXNlIG5ldyBweXRob24KKyAgICAgICAgc2NyaXB0IGZvciBkYXRh IGdlbmVyYXRpbmcsIGFzIHRoZSBvbGQgb25lIGlzIHRvbyBzaW1wbGUgYW5kIHByb2JsZW1hdGlj LgorCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvU2VsZWN0UG9wdXBDbGllbnQuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6U2VsZWN0UG9wdXBDbGllbnQ6OmdlbmVyYXRlSFRNTCk6CisKIDIwMTIt MDYtMTMgIFJvYmluIENhbyAgPHJvYmluLmNhb0B0b3JjaG1vYmlsZS5jb20uY24+CiAKICAgICAg ICAgW0JsYWNrQmVycnldIEVuYWJsZSBNRURJQV9TVFJFQU0gYnkgZGVmYXVsdApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYkNvcmVTdXBwb3J0L1NlbGVjdFBvcHVwQ2xp ZW50LmNwcCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJDb3JlU3VwcG9ydC9TZWxlY3RQ b3B1cENsaWVudC5jcHAKaW5kZXggZDM4OGI2Zi4uZjMwZDAxZSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9ibGFja2JlcnJ5L1dlYkNvcmVTdXBwb3J0L1NlbGVjdFBvcHVwQ2xpZW50LmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViQ29yZVN1cHBvcnQvU2VsZWN0UG9wdXBD bGllbnQuY3BwCkBAIC0yOCw4ICsyOCw4IEBACiAjaW5jbHVkZSAiSFRNTFNlbGVjdEVsZW1lbnQu aCIKICNpbmNsdWRlICJQYWdlLmgiCiAjaW5jbHVkZSAiUGFnZVBvcHVwLmgiCisjaW5jbHVkZSAi UG9wdXBQaWNrZXIuaCIKICNpbmNsdWRlICJSZW5kZXJPYmplY3QuaCIKLSNpbmNsdWRlICJVc2Vy QWdlbnRTdHlsZVNoZWV0cy5oIgogI2luY2x1ZGUgIldlYlBhZ2VfcC5oIgogCiAjaW5jbHVkZSA8 d3RmL3RleHQvU3RyaW5nQnVpbGRlci5oPgpAQCAtNjUsNTUgKzY1LDYzIEBAIHZvaWQgU2VsZWN0 UG9wdXBDbGllbnQ6OmdlbmVyYXRlSFRNTChib29sIG11bHRpcGxlLCBpbnQgc2l6ZSwgY29uc3Qg U2NvcGVBcnJheTxCCiAgICAgY29uc3QgaW50KiBpdGVtVHlwZSwgYm9vbCogc2VsZWN0ZWRzKQog ewogICAgIFN0cmluZ0J1aWxkZXIgc291cmNlOwotICAgIFN0cmluZyBmdWxsUGF0aChSRVNPVVJD RV9QQVRIKTsKLSAgICBTdHJpbmcgc2luZ2xlU2VsZWN0SW1hZ2UoInNpbmdsZVNlbGVjdC5wbmci KTsKLSAgICBTdHJpbmcgbXVsdGlTZWxlY3RJbWFnZSgibXVsdGlTZWxlY3QucG5nIik7Ci0gICAg c291cmNlLmFwcGVuZCgiPGhlYWQ+PHN0eWxlPlxuIik7CisgICAgc291cmNlLmFwcGVuZCgiPGh0 bWw+PGhlYWQ+PHN0eWxlPlxuIik7CiAgICAgLy8gSW5jbHVkZSBDU1MgZmlsZS4KLSAgICBzb3Vy Y2UuYXBwZW5kKHBvcHVwQ29udHJvbEJsYWNrQmVycnlVc2VyQWdlbnRTdHlsZVNoZWV0LAotICAg ICAgICAgICAgc2l6ZW9mKHBvcHVwQ29udHJvbEJsYWNrQmVycnlVc2VyQWdlbnRTdHlsZVNoZWV0 KSk7CisgICAgc291cmNlLmFwcGVuZChwb3B1cENvbnRyb2xCbGFja0JlcnJ5Q3NzLAorICAgICAg ICAgICAgc2l6ZW9mKHBvcHVwQ29udHJvbEJsYWNrQmVycnlDc3MpKTsKKyAgICBzb3VyY2UuYXBw ZW5kKCI8L3N0eWxlPlxuPHN0eWxlPiIpOworICAgIHNvdXJjZS5hcHBlbmQoc2VsZWN0Q29udHJv bEJsYWNrQmVycnlDc3MsCisgICAgICAgICAgICBzaXplb2Yoc2VsZWN0Q29udHJvbEJsYWNrQmVy cnlDc3MpKTsKICAgICBzb3VyY2UuYXBwZW5kKCI8L3N0eWxlPjwvaGVhZD48Ym9keT5cbiIpOwog ICAgIHNvdXJjZS5hcHBlbmQoIjxzY3JpcHQ+XG4iKTsKLSAgICBzb3VyY2UuYXBwZW5kKCJ2YXIg b3B0aW9ucz1uZXcgQXJyYXkoIiArIFN0cmluZzo6bnVtYmVyKHNpemUpICsgIik7Iik7Ci0gICAg c291cmNlLmFwcGVuZCgiZm9yICh2YXIgaSA9IDA7IGkgPCAiICsgU3RyaW5nOjpudW1iZXIoc2l6 ZSkgKyAiOyBpKysgKSIpOwotICAgIHNvdXJjZS5hcHBlbmQoInsgb3B0aW9uc1tpXSA9IGZhbHNl IDsiKTsKLSAgICBzb3VyY2UuYXBwZW5kKCJ2YXIgaW1hZ2VpZCA9IGRvY3VtZW50LmdldEVsZW1l bnRCeUlkKFwiaW1hZ2VcIiArIHBhcnNlSW50KGkpKTsgaW1hZ2VpZC5zdHlsZS52aXNpYmlsaXR5 ID0gZmFsc2U7IH0iKTsKLSAgICBzb3VyY2UuYXBwZW5kKCJmdW5jdGlvbiBPaygpIHsgdmFyIHNl bGVjdGVkcyA9IFwiXCI7Iik7Ci0gICAgc291cmNlLmFwcGVuZCgiZm9yICh2YXIgaSA9IDA7IGkg PCAiICsgU3RyaW5nOjpudW1iZXIoc2l6ZSkgKyAiOyBpKysgKSIpOwotICAgIHNvdXJjZS5hcHBl bmQoInsgIGlmIChvcHRpb25zW2ldKSBzZWxlY3RlZHMgKz0gJzEnOyBlbHNlIHNlbGVjdGVkcyAr PSAnMCc7fSIpOwotICAgIHNvdXJjZS5hcHBlbmQoIndpbmRvdy5zZXRWYWx1ZUFuZENsb3NlUG9w dXAoc2VsZWN0ZWRzLCB3aW5kb3cucG9wVXApOyB3aW5kb3cuY2xvc2UoKTt9Iik7Ci0gICAgc291 cmNlLmFwcGVuZCgiZnVuY3Rpb24gQ2FuY2VsKCkgeyB2YXIgc2VsZWN0ZWRzID0gXCJcIjsiKTsK LSAgICBzb3VyY2UuYXBwZW5kKCJmb3IgKHZhciBpID0gMDsgaSA8ICIgKyBTdHJpbmc6Om51bWJl cihzaXplKSArICI7IGkrKyApIik7Ci0gICAgc291cmNlLmFwcGVuZCgic2VsZWN0ZWRzICs9ICcw JzsiKTsKLSAgICBzb3VyY2UuYXBwZW5kKCJ3aW5kb3cuc2V0VmFsdWVBbmRDbG9zZVBvcHVwKHNl bGVjdGVkcywgd2luZG93LnBvcFVwKTsgd2luZG93LmNsb3NlKCk7fSIpOworICAgIHNvdXJjZS5h cHBlbmQoIndpbmRvdy5hZGRFdmVudExpc3RlbmVyKCdsb2FkJywgZnVuY3Rpb24gKCkgeyIpOwog ICAgIGlmIChtX211bHRpcGxlKQotICAgICAgICBzb3VyY2UuYXBwZW5kKCJmdW5jdGlvbiBTZWxl Y3QoaSkgeyBvcHRpb25zW2ldID0gIW9wdGlvbnNbaV07IHZhciBpbWFnZWlkID0gZG9jdW1lbnQu Z2V0RWxlbWVudEJ5SWQoXCJpbWFnZVwiICsgcGFyc2VJbnQoaSkpOyBpbWFnZWlkLnN0eWxlLnZp c2liaWxpdHkgPSBvcHRpb25zW2ldOyB9Iik7Ci0gICAgZWxzZSB7Ci0gICAgICAgIHNvdXJjZS5h cHBlbmQoImZ1bmN0aW9uIFNlbGVjdChpKSB7IGZvciAodmFyIGogPSAwOyBqIDwgIiArIFN0cmlu Zzo6bnVtYmVyKHNpemUpICsgIjsgaisrICkiKTsKLSAgICAgICAgc291cmNlLmFwcGVuZCgieyBv cHRpb25zW2pdID0gZmFsc2U7ICIpOwotICAgICAgICBzb3VyY2UuYXBwZW5kKCJ2YXIgaW1hZ2Vp ZCA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKFwiaW1hZ2VcIiArIHBhcnNlSW50KGopKTsgaW1h Z2VpZC5zdHlsZS52aXNpYmlsaXR5ID0gZmFsc2U7IH0iKTsKLSAgICAgICAgc291cmNlLmFwcGVu ZCgib3B0aW9uc1tpXSA9IHRydWU7ICIpOwotICAgICAgICBzb3VyY2UuYXBwZW5kKCJ2YXIgaW1h Z2VpZCA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKFwiaW1hZ2VcIiArIHBhcnNlSW50KGkpKTsg aW1hZ2VpZC5zdHlsZS52aXNpYmlsaXR5ID0gdHJ1ZTsgfSIpOworICAgICAgICBzb3VyY2UuYXBw ZW5kKCJ3aW5kb3cuc2VsZWN0LnNob3codHJ1ZSwgIik7CisgICAgZWxzZQorICAgICAgICBzb3Vy Y2UuYXBwZW5kKCJ3aW5kb3cuc2VsZWN0LnNob3coZmFsc2UsICIpOworICAgIC8vIEFkZCBsYWJl bHMuCisgICAgc291cmNlLmFwcGVuZCgiWyIpOworICAgIGZvciAoaW50IGkgPSAwOyBpIDwgc2l6 ZTsgaSsrKSB7CisgICAgICAgIHNvdXJjZS5hcHBlbmQoIiciICsgU3RyaW5nKGxhYmVsc1tpXS5p bXBsKCkpICsgIiciKTsKKyAgICAgICAgLy8gRG9uJ3QgYXBwZW5kICcsJyB0byBsYXN0IGVsZW1l bnQuCisgICAgICAgIGlmIChpICE9IHNpemUgLSAxKQorICAgICAgICAgICAgc291cmNlLmFwcGVu ZCgiLCAiKTsKICAgICB9Ci0gICAgc291cmNlLmFwcGVuZCgiPC9zY3JpcHQ+XG4iKTsKLQotICAg IGludCB0YWJsZVdpZHRoID0gY29udGVudFNpemUoKS53aWR0aCgpOwotICAgIGludCB0YWJsZUhl aWdodCA9IENFTExfSEVJR0hUICogc2l6ZTsKLSAgICBzb3VyY2UuYXBwZW5kKCI8dGFibGUgd2lk dGg9XCIiICsgU3RyaW5nOjpudW1iZXIodGFibGVXaWR0aCkgKyAiXCIgaGVpZ2h0PVwiIiArIFN0 cmluZzo6bnVtYmVyKHRhYmxlSGVpZ2h0KQotICAgICAgICArICJcIiBib3JkZXI9XCIwXCIgZnJh bWU9XCJ2b2lkXCIgcnVsZXM9XCJyb3dzXCI+ICIpOworICAgIHNvdXJjZS5hcHBlbmQoIl0sICIp OworICAgIC8vIEFkZCBlbmFibGVzLgorICAgIHNvdXJjZS5hcHBlbmQoIlsiKTsKKyAgICBmb3Ig KGludCBpID0gMDsgaSA8IHNpemU7IGkrKykgeworICAgICAgICBzb3VyY2UuYXBwZW5kKGVuYWJs ZWRzW2ldPyAidHJ1ZSIgOiAiZmFsc2UiKTsKKyAgICAgICAgLy8gRG9uJ3QgYXBwZW5kICcsJyB0 byBsYXN0IGVsZW1lbnQuCisgICAgICAgIGlmIChpICE9IHNpemUgLSAxKQorICAgICAgICAgICAg c291cmNlLmFwcGVuZCgiLCAiKTsKKyAgICB9CisgICAgc291cmNlLmFwcGVuZCgiXSwgIik7Cisg ICAgLy8gQWRkIGl0ZW1UeXBlLgorICAgIHNvdXJjZS5hcHBlbmQoIlsiKTsKICAgICBmb3IgKGlu dCBpID0gMDsgaSA8IHNpemU7IGkrKykgewotICAgICAgICBzb3VyY2UuYXBwZW5kKCIgPHRyPiA8 dGQgYmdjb2xvcj1cIiNFMkU0RTNcIiB3aWR0aD1cIjgwJVwiPjxpbnB1dCBjbGFzcz1cInRhYmxl YnV0dG9uXCIgaWQ9XCJidXR0b24iICsgU3RyaW5nOjpudW1iZXIoaSkKLSAgICAgICAgICAgICsg IlwiIHR5cGU9XCJidXR0b25cIiB2YWx1ZT1cIiIgKyBTdHJpbmcobGFiZWxzW2ldLmltcGwoKSkg KyAiXCIgb25jbGljaz1cIlNlbGVjdCgiICsgU3RyaW5nOjpudW1iZXIoaSkgKyAiKTtcIiAvPiIp OwotICAgICAgICBzb3VyY2UuYXBwZW5kKCI8L3RkPiIpOwotICAgICAgICBzb3VyY2UuYXBwZW5k KCI8dGQgYmdjb2xvcj1cIiNFMkU0RTNcIiB3aWR0aD1cIjIwJVwiPjxpbnB1dCB0eXBlPVwiaW1h Z2VcIiBpZD1cImltYWdlIiArIFN0cmluZzo6bnVtYmVyKGkpICsgIlwiIHNyYz1cIiAiICsgZnVs bFBhdGgKLSAgICAgICAgICAgICsgc2luZ2xlU2VsZWN0SW1hZ2UgKyAiIFwiIC8+PC90ZD4gPC90 cj4iKTsKKyAgICAgICAgc291cmNlLmFwcGVuZChTdHJpbmc6Om51bWJlcihpdGVtVHlwZVtpXSkp OworICAgICAgICAvLyBEb24ndCBhcHBlbmQgJywnIHRvIGxhc3QgZWxlbWVudC4KKyAgICAgICAg aWYgKGkgIT0gc2l6ZSAtIDEpCisgICAgICAgICAgICBzb3VyY2UuYXBwZW5kKCIsICIpOwogICAg IH0KLSAgICBzb3VyY2UuYXBwZW5kKCI8L3RhYmxlPiIpOwotICAgIHNvdXJjZS5hcHBlbmQoIjx0 YWJsZSBib3JkZXI9XCIwXCIgY2VsbHBhZGRpbmc9XCIwXCIgY2VsbHNwYWNpbmc9XCIwXCI+IDx0 cj4gPHRkPiIpOwotICAgIHNvdXJjZS5hcHBlbmQoIjxpbnB1dCBjbGFzcz1cImJvdHRvbWJ1dHRv bk9LXCIgbmFtZT1cImJ0bk9rXCIgdHlwZT1cImJ1dHRvblwiIHZhbHVlPVwiT2tcIiAiKTsKLSAg ICBzb3VyY2UuYXBwZW5kKCJvbmNsaWNrPVwiT2soKTtcIiAvPjwvdGQ+IDx0ZCBub3dyYXA9XCJu b3dyYXBcIj4gPGlucHV0IGNsYXNzPVwiYm90dG9tYnV0dG9uQ2FuY2VsXCIgdHlwZT1cImJ1dHRv blwiIHZhbHVlPVwiQ2FuY2VsXCIgb25jbGljaz1cIkNhbmNlbCgpO1wiIC8+Iik7Ci0gICAgc291 cmNlLmFwcGVuZCgiPC90ZD4gPC90cj48L3RhYmxlPiIpOwotICAgIHNvdXJjZS5hcHBlbmQoIjwv Ym9keT5cbiIpOworICAgIHNvdXJjZS5hcHBlbmQoIl0sICIpOworICAgIC8vIEFkZCBzZWxlY3Rl ZHMKKyAgICBzb3VyY2UuYXBwZW5kKCJbIik7CisgICAgZm9yIChpbnQgaSA9IDA7IGkgPCBzaXpl OyBpKyspIHsKKyAgICAgICAgc291cmNlLmFwcGVuZChzZWxlY3RlZHNbaV0/ICJ0cnVlIiA6ICJm YWxzZSIpOworICAgICAgICAvLyBEb24ndCBhcHBlbmQgJywnIHRvIGxhc3QgZWxlbWVudC4KKyAg ICAgICAgaWYgKGkgIT0gc2l6ZSAtIDEpCisgICAgICAgICAgICBzb3VyY2UuYXBwZW5kKCIsICIp OworICAgIH0KKyAgICBzb3VyY2UuYXBwZW5kKCJdICIpOworICAgIC8vIElmIG11bHRpLXNlbGVj dCwgYWRkIE9LIGJ1dHRvbiBmb3IgY29uZmlybS4KKyAgICBpZiAobV9tdWx0aXBsZSkKKyAgICAg ICAgc291cmNlLmFwcGVuZCgiLCAnT0snIik7CisgICAgc291cmNlLmFwcGVuZCgiKTsgXG4gfSk7 IFxuIik7CisgICAgc291cmNlLmFwcGVuZChzZWxlY3RDb250cm9sQmxhY2tCZXJyeUpzLCBzaXpl b2Yoc2VsZWN0Q29udHJvbEJsYWNrQmVycnlKcykpOworICAgIHNvdXJjZS5hcHBlbmQoIjwvc2Ny aXB0PlxuIik7CisgICAgc291cmNlLmFwcGVuZCgiPC9ib2R5PiA8L2h0bWw+XG4iKTsKICAgICBt X3NvdXJjZSA9IHNvdXJjZS50b1N0cmluZygpOwogfQogCkBAIC0xNDQsNyArMTUyLDcgQEAgdm9p ZCBTZWxlY3RQb3B1cENsaWVudDo6c2V0VmFsdWVBbmRDbG9zZVBvcHVwKGludCwgY29uc3QgU3Ry aW5nJiBzdHJpbmdWYWx1ZSkKICAgICAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IG1fc2l6 ZTsgaSsrKQogICAgICAgICAgICAgc2VsZWN0ZWRzW2ldID0gc3RyaW5nVmFsdWVbaV0gLSAnMCc7 CiAKLSAgICAgICAgY29uc3QgV1RGOjpWZWN0b3I8SFRNTEVsZW1lbnQqPiYgaXRlbXMgPSBtX2Vs ZW1lbnQtPmxpc3RJdGVtcygpOworICAgICAgICBjb25zdCBWZWN0b3I8SFRNTEVsZW1lbnQqPiYg aXRlbXMgPSBtX2VsZW1lbnQtPmxpc3RJdGVtcygpOwogCiAgICAgICAgIGlmIChpdGVtcy5zaXpl KCkgIT0gc3RhdGljX2Nhc3Q8dW5zaWduZWQgaW50PihtX3NpemUpKQogICAgICAgICAgICAgcmV0 dXJuOwotLSAKMS43LjEwLjEKCg==