110577 2013-02-22 01:54:32 -0800 [BlackBerry] Rename first/second to key/value in HashMap iterators 2013-02-22 09:27:53 -0800 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 cgarcia webkit-unassigned mifenton rwlbuis tonikitoo webkit.review.bot yong.li.webkit oldest_to_newest 839391 0 cgarcia 2013-02-22 01:54:32 -0800 Iterators were renamed to key/value in r130612 but there are still a few places where first/second is used in the BlackBerry port. 839392 1 189720 cgarcia 2013-02-22 01:56:22 -0800 Created attachment 189720 Patch 839394 2 189721 cgarcia 2013-02-22 02:02:17 -0800 Created attachment 189721 Updated patch Forgot to add another case 839606 3 189721 rwlbuis 2013-02-22 08:43:00 -0800 Comment on attachment 189721 Updated patch Ok. 839653 4 189721 webkit.review.bot 2013-02-22 09:27:50 -0800 Comment on attachment 189721 Updated patch Clearing flags on attachment: 189721 Committed r143740: <http://trac.webkit.org/changeset/143740> 839654 5 webkit.review.bot 2013-02-22 09:27:53 -0800 All reviewed patches have been landed. Closing bug. 189720 2013-02-22 01:56:22 -0800 2013-02-22 02:02:17 -0800 Patch iterators.diff text/plain 4305 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAzNWMwNGIzLi5kNjM4Y2E0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUg QEAKKzIwMTMtMDItMjIgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2FyZ2FyY2lhQHJpbS5jb20+ CisKKyAgICAgICAgW0JsYWNrQmVycnldIFJlbmFtZSBmaXJzdC9zZWNvbmQgdG8ga2V5L3ZhbHVl IGluIEhhc2hNYXAgaXRlcmF0b3JzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMTA1NzcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBJdGVyYXRvcnMgd2VyZSByZW5hbWVkIHRvIGtleS92YWx1ZSBpbiByMTMw NjEyLgorCisgICAgICAgICogcGxhdGZvcm0vYmxhY2tiZXJyeS9BdXRoZW50aWNhdGlvbkNoYWxs ZW5nZU1hbmFnZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QXV0aGVudGljYXRpb25DaGFsbGVu Z2VNYW5hZ2VyOjpwYWdlVmlzaWJpbGl0eUNoYW5nZWQpOgorCiAyMDEzLTAyLTIxICBDbGF1ZGlv IFNhYXZlZHJhICA8Y3NhYXZlZHJhQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS10gQ29udHJv bCtTaGlmdCtVcC9Eb3duIHNlbGVjdGlvbiB3b3JrcyBiYWNrd2FyZHMKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2JsYWNrYmVycnkvQXV0aGVudGljYXRpb25DaGFsbGVuZ2VN YW5hZ2VyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2JsYWNrYmVycnkvQXV0aGVudGlj YXRpb25DaGFsbGVuZ2VNYW5hZ2VyLmNwcAppbmRleCA4ZDUyYTRhLi5mMjg5NTk0IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ibGFja2JlcnJ5L0F1dGhlbnRpY2F0aW9uQ2hh bGxlbmdlTWFuYWdlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYmxhY2tiZXJy eS9BdXRoZW50aWNhdGlvbkNoYWxsZW5nZU1hbmFnZXIuY3BwCkBAIC0xNDAsMTAgKzE0MCwxMCBA QCB2b2lkIEF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlTWFuYWdlcjo6cGFnZVZpc2liaWxpdHlDaGFu Z2VkKFBhZ2VDbGllbnRCbGFja0JlcnJ5KgogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAg aWYgKGl0ZXItPnNlY29uZCA9PSB2aXNpYmxlKQorICAgIGlmIChpdGVyLT52YWx1ZSA9PSB2aXNp YmxlKQogICAgICAgICByZXR1cm47CiAKLSAgICBpdGVyLT5zZWNvbmQgPSB2aXNpYmxlOworICAg IGl0ZXItPnZhbHVlID0gdmlzaWJsZTsKICAgICBpZiAoIXZpc2libGUpCiAgICAgICAgIHJldHVy bjsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZyBiL1Nv dXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cKaW5kZXggYTM3Mjk3NS4uOTg4OWExYiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZworKysgYi9Tb3Vy Y2UvV2ViS2l0L2JsYWNrYmVycnkvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTkgQEAKIDIwMTMtMDIt MjIgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2FyZ2FyY2lhQHJpbS5jb20+CiAKKyAgICAgICAg W0JsYWNrQmVycnldIFJlbmFtZSBmaXJzdC9zZWNvbmQgdG8ga2V5L3ZhbHVlIGluIEhhc2hNYXAg aXRlcmF0b3JzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xMTA1NzcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBJdGVyYXRvcnMgd2VyZSByZW5hbWVkIHRvIGtleS92YWx1ZSBpbiByMTMwNjEyLgorCisgICAg ICAgICogV2ViS2l0U3VwcG9ydC9Ob3RpZmljYXRpb25NYW5hZ2VyLmNwcDoKKyAgICAgICAgKEJs YWNrQmVycnk6OldlYktpdDo6Tm90aWZpY2F0aW9uTWFuYWdlcjo6c2hvdyk6CisgICAgICAgIChC bGFja0JlcnJ5OjpXZWJLaXQ6Ok5vdGlmaWNhdGlvbk1hbmFnZXI6OmNsZWFyTm90aWZpY2F0aW9u cyk6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6Ok5vdGlmaWNhdGlvbk1hbmFnZXI6OnJl bW92ZU5vdGlmaWNhdGlvbkZyb21Db250ZXh0TWFwKToKKworMjAxMy0wMi0yMiAgQ2FybG9zIEdh cmNpYSBDYW1wb3MgIDxjYXJnYXJjaWFAcmltLmNvbT4KKwogICAgICAgICBbQmxhY2tCZXJyeV0g UmVtb3ZlIFByb3RvY29sSGFuZGxlciBtZXRob2RzIGZyb20gQ2hyb21lQ2xpZW50QmxhY2tCZXJy eQogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTEwNTY3 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L05v dGlmaWNhdGlvbk1hbmFnZXIuY3BwIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1 cHBvcnQvTm90aWZpY2F0aW9uTWFuYWdlci5jcHAKaW5kZXggMDk4ZDRkMy4uMjRlN2IyYyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvTm90aWZpY2F0 aW9uTWFuYWdlci5jcHAKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBv cnQvTm90aWZpY2F0aW9uTWFuYWdlci5jcHAKQEAgLTU3LDcgKzU3LDcgQEAgYm9vbCBOb3RpZmlj YXRpb25NYW5hZ2VyOjpzaG93KE5vdGlmaWNhdGlvbiogbm90aWZpY2F0aW9uKQogICAgIG1fbm90 aWZpY2F0aW9uSURNYXAuc2V0KG5vdGlmaWNhdGlvbklELCBub3RpZmljYXRpb24pOwogCiAgICAg Tm90aWZpY2F0aW9uQ29udGV4dE1hcDo6aXRlcmF0b3IgaXQgPSBtX25vdGlmaWNhdGlvbkNvbnRl eHRNYXAuYWRkKG5vdGlmaWNhdGlvbi0+c2NyaXB0RXhlY3V0aW9uQ29udGV4dCgpLCBWZWN0b3I8 U3RyaW5nPigpKS5pdGVyYXRvcjsKLSAgICBpdC0+c2Vjb25kLmFwcGVuZChub3RpZmljYXRpb25J RCk7CisgICAgaXQtPnZhbHVlLmFwcGVuZChub3RpZmljYXRpb25JRCk7CiAKICAgICBtX3dlYlBh Z2VQcml2YXRlLT5jbGllbnQoKS0+c2hvd05vdGlmaWNhdGlvbihub3RpZmljYXRpb25JRCwgbm90 aWZpY2F0aW9uLT50aXRsZSgpLCBub3RpZmljYXRpb24tPmJvZHkoKSwgbm90aWZpY2F0aW9uLT5p Y29uVVJMKCkuc3RyaW5nKCksIG5vdGlmaWNhdGlvbi0+dGFnKCksIG5vdGlmaWNhdGlvbi0+c2Ny aXB0RXhlY3V0aW9uQ29udGV4dCgpLT5zZWN1cml0eU9yaWdpbigpLT50b1N0cmluZygpKTsKICAg ICByZXR1cm4gdHJ1ZTsKQEAgLTc4LDcgKzc4LDcgQEAgdm9pZCBOb3RpZmljYXRpb25NYW5hZ2Vy OjpjbGVhck5vdGlmaWNhdGlvbnMoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCogY29udGV4dCkKICAg ICBpZiAoaXQgPT0gbV9ub3RpZmljYXRpb25Db250ZXh0TWFwLmVuZCgpKQogICAgICAgICByZXR1 cm47CiAKLSAgICBWZWN0b3I8U3RyaW5nPiYgbm90aWZpY2F0aW9uSURzID0gaXQtPnNlY29uZDsK KyAgICBWZWN0b3I8U3RyaW5nPiYgbm90aWZpY2F0aW9uSURzID0gaXQtPnZhbHVlOwogICAgIHN0 ZDo6dmVjdG9yPEJsYWNrQmVycnk6OlBsYXRmb3JtOjpTdHJpbmc+IGlkczsKICAgICBzaXplX3Qg Y291bnQgPSBub3RpZmljYXRpb25JRHMuc2l6ZSgpOwogICAgIGZvciAoc2l6ZV90IGkgPSAwOyBp IDwgY291bnQ7ICsraSkgewpAQCAtMjE4LDEwICsyMTgsMTAgQEAgdm9pZCBOb3RpZmljYXRpb25N YW5hZ2VyOjpyZW1vdmVOb3RpZmljYXRpb25Gcm9tQ29udGV4dE1hcChjb25zdCBTdHJpbmcmIG5v dGlmaWMKICAgICAvLyBUaGlzIGlzIGEgaGVscGVyIGZ1bmN0aW9uIGZvciBtYW5hZ2luZyB0aGUg aGFzaCBtYXBzLgogICAgIE5vdGlmaWNhdGlvbkNvbnRleHRNYXA6Oml0ZXJhdG9yIGl0ID0gbV9u b3RpZmljYXRpb25Db250ZXh0TWFwLmZpbmQobm90aWZpY2F0aW9uLT5zY3JpcHRFeGVjdXRpb25D b250ZXh0KCkpOwogICAgIEFTU0VSVChpdCAhPSBtX25vdGlmaWNhdGlvbkNvbnRleHRNYXAuZW5k KCkpOwotICAgIHNpemVfdCBpbmRleCA9IGl0LT5zZWNvbmQuZmluZChub3RpZmljYXRpb25JRCk7 CisgICAgc2l6ZV90IGluZGV4ID0gaXQtPnZhbHVlLmZpbmQobm90aWZpY2F0aW9uSUQpOwogICAg IEFTU0VSVChpbmRleCAhPSBub3RGb3VuZCk7Ci0gICAgaXQtPnNlY29uZC5yZW1vdmUoaW5kZXgp OwotICAgIGlmIChpdC0+c2Vjb25kLmlzRW1wdHkoKSkKKyAgICBpdC0+dmFsdWUucmVtb3ZlKGlu ZGV4KTsKKyAgICBpZiAoaXQtPnZhbHVlLmlzRW1wdHkoKSkKICAgICAgICAgbV9ub3RpZmljYXRp b25Db250ZXh0TWFwLnJlbW92ZShpdCk7CiB9CiAK 189721 2013-02-22 02:02:17 -0800 2013-02-22 09:27:50 -0800 Updated patch iterators2.diff text/plain 5696 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAzNWMwNGIzLi4zMzc2NTk0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcg QEAKKzIwMTMtMDItMjIgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2FyZ2FyY2lhQHJpbS5jb20+ CisKKyAgICAgICAgW0JsYWNrQmVycnldIFJlbmFtZSBmaXJzdC9zZWNvbmQgdG8ga2V5L3ZhbHVl IGluIEhhc2hNYXAgaXRlcmF0b3JzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMTA1NzcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBJdGVyYXRvcnMgd2VyZSByZW5hbWVkIHRvIGtleS92YWx1ZSBpbiByMTMw NjEyLgorCisgICAgICAgICogcGxhdGZvcm0vYmxhY2tiZXJyeS9BdXRoZW50aWNhdGlvbkNoYWxs ZW5nZU1hbmFnZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QXV0aGVudGljYXRpb25DaGFsbGVu Z2VNYW5hZ2VyOjpwYWdlVmlzaWJpbGl0eUNoYW5nZWQpOgorICAgICAgICAqIHBsYXRmb3JtL25l dHdvcmsvYmxhY2tiZXJyeS9OZXR3b3JrSm9iLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok5ldHdv cmtKb2I6OmhhbmRsZU5vdGlmeU11bHRpcGFydEhlYWRlclJlY2VpdmVkKToKKwogMjAxMy0wMi0y MSAgQ2xhdWRpbyBTYWF2ZWRyYSAgPGNzYWF2ZWRyYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtH VEtdIENvbnRyb2wrU2hpZnQrVXAvRG93biBzZWxlY3Rpb24gd29ya3MgYmFja3dhcmRzCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ibGFja2JlcnJ5L0F1dGhlbnRpY2F0aW9u Q2hhbGxlbmdlTWFuYWdlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ibGFja2JlcnJ5 L0F1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlTWFuYWdlci5jcHAKaW5kZXggOGQ1MmE0YS4uZjI4OTU5 NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYmxhY2tiZXJyeS9BdXRoZW50 aWNhdGlvbkNoYWxsZW5nZU1hbmFnZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2JsYWNrYmVycnkvQXV0aGVudGljYXRpb25DaGFsbGVuZ2VNYW5hZ2VyLmNwcApAQCAtMTQwLDEw ICsxNDAsMTAgQEAgdm9pZCBBdXRoZW50aWNhdGlvbkNoYWxsZW5nZU1hbmFnZXI6OnBhZ2VWaXNp YmlsaXR5Q2hhbmdlZChQYWdlQ2xpZW50QmxhY2tCZXJyeSoKICAgICAgICAgcmV0dXJuOwogICAg IH0KIAotICAgIGlmIChpdGVyLT5zZWNvbmQgPT0gdmlzaWJsZSkKKyAgICBpZiAoaXRlci0+dmFs dWUgPT0gdmlzaWJsZSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgaXRlci0+c2Vjb25kID0gdmlz aWJsZTsKKyAgICBpdGVyLT52YWx1ZSA9IHZpc2libGU7CiAgICAgaWYgKCF2aXNpYmxlKQogICAg ICAgICByZXR1cm47CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdv cmsvYmxhY2tiZXJyeS9OZXR3b3JrSm9iLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25l dHdvcmsvYmxhY2tiZXJyeS9OZXR3b3JrSm9iLmNwcAppbmRleCAwMjcxNmRjLi5lOTE4YjRjIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvTmV0 d29ya0pvYi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9ibGFja2Jl cnJ5L05ldHdvcmtKb2IuY3BwCkBAIC00MTgsMTQgKzQxOCwxNCBAQCB2b2lkIE5ldHdvcmtKb2I6 OmhhbmRsZU5vdGlmeU11bHRpcGFydEhlYWRlclJlY2VpdmVkKGNvbnN0IFN0cmluZyYga2V5LCBj b25zdCBTdAogICAgICAgICAgICAgYm9vbCBuZWVkc0NvcHlmcm9tT3JpZ2luYWxSZXNwb25zZSA9 IHRydWU7CiAgICAgICAgICAgICBpbnQgcmVwbGFjZUhlYWRlcnNJbmRleCA9IDA7CiAgICAgICAg ICAgICB3aGlsZSAoQmxhY2tCZXJyeTo6UGxhdGZvcm06Ok11bHRpcGFydFN0cmVhbTo6cmVwbGFj ZUhlYWRlcnNbcmVwbGFjZUhlYWRlcnNJbmRleF0pIHsKLSAgICAgICAgICAgICAgICBpZiAoaXQt PmZpcnN0Lmxvd2VyKCkgPT0gQmxhY2tCZXJyeTo6UGxhdGZvcm06Ok11bHRpcGFydFN0cmVhbTo6 cmVwbGFjZUhlYWRlcnNbcmVwbGFjZUhlYWRlcnNJbmRleF0pIHsKKyAgICAgICAgICAgICAgICBp ZiAoaXQtPmtleS5sb3dlcigpID09IEJsYWNrQmVycnk6OlBsYXRmb3JtOjpNdWx0aXBhcnRTdHJl YW06OnJlcGxhY2VIZWFkZXJzW3JlcGxhY2VIZWFkZXJzSW5kZXhdKSB7CiAgICAgICAgICAgICAg ICAgICAgIG5lZWRzQ29weWZyb21PcmlnaW5hbFJlc3BvbnNlID0gZmFsc2U7CiAgICAgICAgICAg ICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICByZXBs YWNlSGVhZGVyc0luZGV4Kys7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBpZiAobmVlZHND b3B5ZnJvbU9yaWdpbmFsUmVzcG9uc2UpCi0gICAgICAgICAgICAgICAgbV9tdWx0aXBhcnRSZXNw b25zZS0+c2V0SFRUUEhlYWRlckZpZWxkKGl0LT5maXJzdCwgaXQtPnNlY29uZCk7CisgICAgICAg ICAgICAgICAgbV9tdWx0aXBhcnRSZXNwb25zZS0+c2V0SFRUUEhlYWRlckZpZWxkKGl0LT5rZXks IGl0LT52YWx1ZSk7CiAgICAgICAgIH0KIAogICAgICAgICBtX211bHRpcGFydFJlc3BvbnNlLT5z ZXRJc011bHRpcGFydFBheWxvYWQodHJ1ZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpp bmRleCBhMzcyOTc1Li45ODg5YTFiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVy cnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cKQEAg LTEsNSArMSwxOSBAQAogMjAxMy0wMi0yMiAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjYXJnYXJj aWFAcmltLmNvbT4KIAorICAgICAgICBbQmxhY2tCZXJyeV0gUmVuYW1lIGZpcnN0L3NlY29uZCB0 byBrZXkvdmFsdWUgaW4gSGFzaE1hcCBpdGVyYXRvcnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMDU3NworCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIEl0ZXJhdG9ycyB3ZXJlIHJlbmFtZWQgdG8ga2V5L3Zh bHVlIGluIHIxMzA2MTIuCisKKyAgICAgICAgKiBXZWJLaXRTdXBwb3J0L05vdGlmaWNhdGlvbk1h bmFnZXIuY3BwOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpOb3RpZmljYXRpb25NYW5h Z2VyOjpzaG93KToKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6Tm90aWZpY2F0aW9uTWFu YWdlcjo6Y2xlYXJOb3RpZmljYXRpb25zKToKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6 Tm90aWZpY2F0aW9uTWFuYWdlcjo6cmVtb3ZlTm90aWZpY2F0aW9uRnJvbUNvbnRleHRNYXApOgor CisyMDEzLTAyLTIyICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNhcmdhcmNpYUByaW0uY29tPgor CiAgICAgICAgIFtCbGFja0JlcnJ5XSBSZW1vdmUgUHJvdG9jb2xIYW5kbGVyIG1ldGhvZHMgZnJv bSBDaHJvbWVDbGllbnRCbGFja0JlcnJ5CiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xMTA1NjcKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFj a2JlcnJ5L1dlYktpdFN1cHBvcnQvTm90aWZpY2F0aW9uTWFuYWdlci5jcHAgYi9Tb3VyY2UvV2Vi S2l0L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9Ob3RpZmljYXRpb25NYW5hZ2VyLmNwcAppbmRl eCAwOThkNGQzLi4yNGU3YjJjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkv V2ViS2l0U3VwcG9ydC9Ob3RpZmljYXRpb25NYW5hZ2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9Ob3RpZmljYXRpb25NYW5hZ2VyLmNwcApAQCAtNTcs NyArNTcsNyBAQCBib29sIE5vdGlmaWNhdGlvbk1hbmFnZXI6OnNob3coTm90aWZpY2F0aW9uKiBu b3RpZmljYXRpb24pCiAgICAgbV9ub3RpZmljYXRpb25JRE1hcC5zZXQobm90aWZpY2F0aW9uSUQs IG5vdGlmaWNhdGlvbik7CiAKICAgICBOb3RpZmljYXRpb25Db250ZXh0TWFwOjppdGVyYXRvciBp dCA9IG1fbm90aWZpY2F0aW9uQ29udGV4dE1hcC5hZGQobm90aWZpY2F0aW9uLT5zY3JpcHRFeGVj dXRpb25Db250ZXh0KCksIFZlY3RvcjxTdHJpbmc+KCkpLml0ZXJhdG9yOwotICAgIGl0LT5zZWNv bmQuYXBwZW5kKG5vdGlmaWNhdGlvbklEKTsKKyAgICBpdC0+dmFsdWUuYXBwZW5kKG5vdGlmaWNh dGlvbklEKTsKIAogICAgIG1fd2ViUGFnZVByaXZhdGUtPmNsaWVudCgpLT5zaG93Tm90aWZpY2F0 aW9uKG5vdGlmaWNhdGlvbklELCBub3RpZmljYXRpb24tPnRpdGxlKCksIG5vdGlmaWNhdGlvbi0+ Ym9keSgpLCBub3RpZmljYXRpb24tPmljb25VUkwoKS5zdHJpbmcoKSwgbm90aWZpY2F0aW9uLT50 YWcoKSwgbm90aWZpY2F0aW9uLT5zY3JpcHRFeGVjdXRpb25Db250ZXh0KCktPnNlY3VyaXR5T3Jp Z2luKCktPnRvU3RyaW5nKCkpOwogICAgIHJldHVybiB0cnVlOwpAQCAtNzgsNyArNzgsNyBAQCB2 b2lkIE5vdGlmaWNhdGlvbk1hbmFnZXI6OmNsZWFyTm90aWZpY2F0aW9ucyhTY3JpcHRFeGVjdXRp b25Db250ZXh0KiBjb250ZXh0KQogICAgIGlmIChpdCA9PSBtX25vdGlmaWNhdGlvbkNvbnRleHRN YXAuZW5kKCkpCiAgICAgICAgIHJldHVybjsKIAotICAgIFZlY3RvcjxTdHJpbmc+JiBub3RpZmlj YXRpb25JRHMgPSBpdC0+c2Vjb25kOworICAgIFZlY3RvcjxTdHJpbmc+JiBub3RpZmljYXRpb25J RHMgPSBpdC0+dmFsdWU7CiAgICAgc3RkOjp2ZWN0b3I8QmxhY2tCZXJyeTo6UGxhdGZvcm06OlN0 cmluZz4gaWRzOwogICAgIHNpemVfdCBjb3VudCA9IG5vdGlmaWNhdGlvbklEcy5zaXplKCk7CiAg ICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBjb3VudDsgKytpKSB7CkBAIC0yMTgsMTAgKzIxOCwx MCBAQCB2b2lkIE5vdGlmaWNhdGlvbk1hbmFnZXI6OnJlbW92ZU5vdGlmaWNhdGlvbkZyb21Db250 ZXh0TWFwKGNvbnN0IFN0cmluZyYgbm90aWZpYwogICAgIC8vIFRoaXMgaXMgYSBoZWxwZXIgZnVu Y3Rpb24gZm9yIG1hbmFnaW5nIHRoZSBoYXNoIG1hcHMuCiAgICAgTm90aWZpY2F0aW9uQ29udGV4 dE1hcDo6aXRlcmF0b3IgaXQgPSBtX25vdGlmaWNhdGlvbkNvbnRleHRNYXAuZmluZChub3RpZmlj YXRpb24tPnNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKSk7CiAgICAgQVNTRVJUKGl0ICE9IG1fbm90 aWZpY2F0aW9uQ29udGV4dE1hcC5lbmQoKSk7Ci0gICAgc2l6ZV90IGluZGV4ID0gaXQtPnNlY29u ZC5maW5kKG5vdGlmaWNhdGlvbklEKTsKKyAgICBzaXplX3QgaW5kZXggPSBpdC0+dmFsdWUuZmlu ZChub3RpZmljYXRpb25JRCk7CiAgICAgQVNTRVJUKGluZGV4ICE9IG5vdEZvdW5kKTsKLSAgICBp dC0+c2Vjb25kLnJlbW92ZShpbmRleCk7Ci0gICAgaWYgKGl0LT5zZWNvbmQuaXNFbXB0eSgpKQor ICAgIGl0LT52YWx1ZS5yZW1vdmUoaW5kZXgpOworICAgIGlmIChpdC0+dmFsdWUuaXNFbXB0eSgp KQogICAgICAgICBtX25vdGlmaWNhdGlvbkNvbnRleHRNYXAucmVtb3ZlKGl0KTsKIH0KIAo=