85695 2012-05-04 20:06:48 -0700 Rename ICULocale to LocaleICU, part 2 2012-05-06 15:12:11 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 85688 1 tkent tkent haraken morrita webkit.review.bot oldest_to_newest 616880 0 tkent 2012-05-04 20:06:48 -0700 Rename ICULocale to LocaleICU, part 2 616883 1 140378 tkent 2012-05-04 20:14:01 -0700 Created attachment 140378 Patch 616884 2 140378 haraken 2012-05-04 20:16:31 -0700 Comment on attachment 140378 Patch Looks OK 617188 3 140378 webkit.review.bot 2012-05-06 15:12:06 -0700 Comment on attachment 140378 Patch Clearing flags on attachment: 140378 Committed r116243: <http://trac.webkit.org/changeset/116243> 617189 4 webkit.review.bot 2012-05-06 15:12:11 -0700 All reviewed patches have been landed. Closing bug. 140378 2012-05-04 20:14:01 -0700 2012-05-06 15:12:06 -0700 Patch bug-85695-20120505121359.patch text/plain 14374 tkent U3VidmVyc2lvbiBSZXZpc2lvbjogMTE2MjA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTQwYWFlNjBkNTk4ZTQz ODc2NThkZmNjYjUyODBjOTBkNWZiMzljNi4uZTJlNTUwZDE5YjE3ZTEwYTlmYTA5NzFlMjdhY2Nh ZThmZjU3NjQ1NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI4IEBACiAyMDEyLTA1LTA0ICBLZW50 IFRhbXVyYSAgPHRrZW50QGNocm9taXVtLm9yZz4KIAorICAgICAgICBSZW5hbWUgSUNVTG9jYWxl IHRvIExvY2FsZUlDVSwgcGFydCAyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD04NTY5NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIE5vIGJlaGF2aW9yIGNoYW5nZQorCisgICAgICAgICogcGxhdGZvcm0vdGV4 dC9Mb2NhbGVJQ1UuY3BwOiBSZW5hbWUgSUNVTG9jYWxlIHRvIExvY2FsZUlDVS4KKyAgICAgICAg KiBwbGF0Zm9ybS90ZXh0L0xvY2FsZUlDVS5oOiBkaXR0by4KKyAgICAgICAgQWxzbywgdXBkYXRl IG9ic29sZXRlIGNvbW1lbnRzLgorICAgICAgICAqIHBsYXRmb3JtL3RleHQvTG9jYWxpemVkRGF0 ZUlDVS5jcHA6IFJlbmFtZSBJQ1VMb2NhbGUgdG8gTG9jYWxlSUNVLgorICAgICAgICAoV2ViQ29y ZTo6cGFyc2VMb2NhbGl6ZWREYXRlKToKKyAgICAgICAgKFdlYkNvcmU6OmZvcm1hdExvY2FsaXpl ZERhdGUpOgorICAgICAgICAoV2ViQ29yZTo6bG9jYWxpemVkRGF0ZUZvcm1hdFRleHQpOgorICAg ICAgICAoV2ViQ29yZTo6bW9udGhMYWJlbHMpOgorICAgICAgICAoV2ViQ29yZTo6d2Vla0RheVNo b3J0TGFiZWxzKToKKyAgICAgICAgKFdlYkNvcmU6OmZpcnN0RGF5T2ZXZWVrKToKKyAgICAgICAg KiBwbGF0Zm9ybS90ZXh0L0xvY2FsaXplZE51bWJlcklDVS5jcHA6IGRpdHRvLgorICAgICAgICAo V2ViQ29yZTo6Y29udmVydFRvTG9jYWxpemVkTnVtYmVyKToKKyAgICAgICAgKFdlYkNvcmU6OmNv bnZlcnRGcm9tTG9jYWxpemVkTnVtYmVyKToKKworMjAxMi0wNS0wNCAgS2VudCBUYW11cmEgIDx0 a2VudEBjaHJvbWl1bS5vcmc+CisKICAgICAgICAgUmVuYW1lIElDVUxvY2FsZSB0byBMb2NhbGVJ Q1UsIHBhcnQgMQogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9ODU2ODgKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cg Yi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwppbmRleCBhMTVhZTNjYzJmNzdkNWM2 MDVhYWYxYzU2ZDU4NWZlZmNkYTZmNzAxLi5lZjlhNjkzNTUwMzBlYWJlMzQ2NzI3MmMxNTg1YWRl NzU5NDRjZjdhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwor KysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE1IEBACiAy MDEyLTA1LTA0ICBLZW50IFRhbXVyYSAgPHRrZW50QGNocm9taXVtLm9yZz4KIAorICAgICAgICBS ZW5hbWUgSUNVTG9jYWxlIHRvIExvY2FsZUlDVSwgcGFydCAyCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NTY5NQorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogdGVzdHMvTG9jYWxpemVkTnVtYmVySUNVVGVz dC5jcHA6CisgICAgICAgICh0ZXN0TnVtYmVySXNSZXZlcnNpYmxlKTogUmVuYW1lIElDVUxvY2Fs ZSB0byBMb2NhbGVJQ1UuCisKKzIwMTItMDUtMDQgIEtlbnQgVGFtdXJhICA8dGtlbnRAY2hyb21p dW0ub3JnPgorCiAgICAgICAgIFJlbmFtZSBJQ1VMb2NhbGUgdG8gTG9jYWxlSUNVLCBwYXJ0IDEK ICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg1Njg4CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvTG9jYWxlSUNVLmNwcCBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvTG9jYWxlSUNVLmNwcAppbmRleCAwNWNmNTNl Yzc5NzVmZmE0ZTcyODJmOTQ5ZTc3OWQ3YjJiZWMwOWZlLi5mMjdjNGUwMTRkN2I2ODFjYTFkZWVj ZDQwMWZiYTdlMTIzMThkOWI5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS90 ZXh0L0xvY2FsZUlDVS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vdGV4dC9Mb2Nh bGVJQ1UuY3BwCkBAIC00Miw3ICs0Miw3IEBAIHVzaW5nIG5hbWVzcGFjZSBzdGQ7CiAKIG5hbWVz cGFjZSBXZWJDb3JlIHsKIAotSUNVTG9jYWxlOjpJQ1VMb2NhbGUoY29uc3QgY2hhciogbG9jYWxl KQorTG9jYWxlSUNVOjpMb2NhbGVJQ1UoY29uc3QgY2hhciogbG9jYWxlKQogICAgIDogbV9sb2Nh bGUobG9jYWxlKQogICAgICwgbV9udW1iZXJGb3JtYXQoMCkKICAgICAsIG1fc2hvcnREYXRlRm9y bWF0KDApCkBAIC01NCwyOSArNTQsMjkgQEAgSUNVTG9jYWxlOjpJQ1VMb2NhbGUoY29uc3QgY2hh ciogbG9jYWxlKQogewogfQogCi1JQ1VMb2NhbGU6On5JQ1VMb2NhbGUoKQorTG9jYWxlSUNVOjp+ TG9jYWxlSUNVKCkKIHsKICAgICB1bnVtX2Nsb3NlKG1fbnVtYmVyRm9ybWF0KTsKICAgICB1ZGF0 X2Nsb3NlKG1fc2hvcnREYXRlRm9ybWF0KTsKIH0KIAotUGFzc093blB0cjxJQ1VMb2NhbGU+IElD VUxvY2FsZTo6Y3JlYXRlKGNvbnN0IGNoYXIqIGxvY2FsZVN0cmluZykKK1Bhc3NPd25QdHI8TG9j YWxlSUNVPiBMb2NhbGVJQ1U6OmNyZWF0ZShjb25zdCBjaGFyKiBsb2NhbGVTdHJpbmcpCiB7Ci0g ICAgcmV0dXJuIGFkb3B0UHRyKG5ldyBJQ1VMb2NhbGUobG9jYWxlU3RyaW5nKSk7CisgICAgcmV0 dXJuIGFkb3B0UHRyKG5ldyBMb2NhbGVJQ1UobG9jYWxlU3RyaW5nKSk7CiB9CiAKLVBhc3NPd25Q dHI8SUNVTG9jYWxlPiBJQ1VMb2NhbGU6OmNyZWF0ZUZvckN1cnJlbnRMb2NhbGUoKQorUGFzc093 blB0cjxMb2NhbGVJQ1U+IExvY2FsZUlDVTo6Y3JlYXRlRm9yQ3VycmVudExvY2FsZSgpCiB7Ci0g ICAgcmV0dXJuIGFkb3B0UHRyKG5ldyBJQ1VMb2NhbGUoMCkpOworICAgIHJldHVybiBhZG9wdFB0 cihuZXcgTG9jYWxlSUNVKDApKTsKIH0KIAotSUNVTG9jYWxlKiBJQ1VMb2NhbGU6OmN1cnJlbnRM b2NhbGUoKQorTG9jYWxlSUNVKiBMb2NhbGVJQ1U6OmN1cnJlbnRMb2NhbGUoKQogewotICAgIHN0 YXRpYyBJQ1VMb2NhbGUqIGN1cnJlbnRJQ1VMb2NhbGUgPSBJQ1VMb2NhbGU6OmNyZWF0ZUZvckN1 cnJlbnRMb2NhbGUoKS5sZWFrUHRyKCk7Ci0gICAgcmV0dXJuIGN1cnJlbnRJQ1VMb2NhbGU7Cisg ICAgc3RhdGljIExvY2FsZUlDVSogY3VycmVudExvY2FsZSA9IExvY2FsZUlDVTo6Y3JlYXRlRm9y Q3VycmVudExvY2FsZSgpLmxlYWtQdHIoKTsKKyAgICByZXR1cm4gY3VycmVudExvY2FsZTsKIH0K IAotdm9pZCBJQ1VMb2NhbGU6OnNldERlY2ltYWxTeW1ib2wodW5zaWduZWQgaW5kZXgsIFVOdW1i ZXJGb3JtYXRTeW1ib2wgc3ltYm9sKQordm9pZCBMb2NhbGVJQ1U6OnNldERlY2ltYWxTeW1ib2wo dW5zaWduZWQgaW5kZXgsIFVOdW1iZXJGb3JtYXRTeW1ib2wgc3ltYm9sKQogewogICAgIFVFcnJv ckNvZGUgc3RhdHVzID0gVV9aRVJPX0VSUk9SOwogICAgIGludDMyX3QgYnVmZmVyTGVuZ3RoID0g dW51bV9nZXRTeW1ib2wobV9udW1iZXJGb3JtYXQsIHN5bWJvbCwgMCwgMCwgJnN0YXR1cyk7CkBA IC05MSw3ICs5MSw3IEBAIHZvaWQgSUNVTG9jYWxlOjpzZXREZWNpbWFsU3ltYm9sKHVuc2lnbmVk IGluZGV4LCBVTnVtYmVyRm9ybWF0U3ltYm9sIHN5bWJvbCkKICAgICBtX2RlY2ltYWxTeW1ib2xz W2luZGV4XSA9IFN0cmluZzo6YWRvcHQoYnVmZmVyKTsKIH0KIAotdm9pZCBJQ1VMb2NhbGU6OnNl dERlY2ltYWxUZXh0QXR0cmlidXRlKFN0cmluZyYgZGVzdGluYXRpb24sIFVOdW1iZXJGb3JtYXRU ZXh0QXR0cmlidXRlIHRhZykKK3ZvaWQgTG9jYWxlSUNVOjpzZXREZWNpbWFsVGV4dEF0dHJpYnV0 ZShTdHJpbmcmIGRlc3RpbmF0aW9uLCBVTnVtYmVyRm9ybWF0VGV4dEF0dHJpYnV0ZSB0YWcpCiB7 CiAgICAgVUVycm9yQ29kZSBzdGF0dXMgPSBVX1pFUk9fRVJST1I7CiAgICAgaW50MzJfdCBidWZm ZXJMZW5ndGggPSB1bnVtX2dldFRleHRBdHRyaWJ1dGUobV9udW1iZXJGb3JtYXQsIHRhZywgMCwg MCwgJnN0YXR1cyk7CkBAIC0xMDcsNyArMTA3LDcgQEAgdm9pZCBJQ1VMb2NhbGU6OnNldERlY2lt YWxUZXh0QXR0cmlidXRlKFN0cmluZyYgZGVzdGluYXRpb24sIFVOdW1iZXJGb3JtYXRUZXh0QXQK ICAgICBkZXN0aW5hdGlvbiA9IFN0cmluZzo6YWRvcHQoYnVmZmVyKTsKIH0KIAotdm9pZCBJQ1VM b2NhbGU6OmluaXRpYWxpemVEZWNpbWFsRm9ybWF0KCkKK3ZvaWQgTG9jYWxlSUNVOjppbml0aWFs aXplRGVjaW1hbEZvcm1hdCgpCiB7CiAgICAgaWYgKG1fZGlkQ3JlYXRlRGVjaW1hbEZvcm1hdCkK ICAgICAgICAgcmV0dXJuOwpAQCAtMTM2LDcgKzEzNiw3IEBAIHZvaWQgSUNVTG9jYWxlOjppbml0 aWFsaXplRGVjaW1hbEZvcm1hdCgpCiAgICAgQVNTRVJUKCFtX3Bvc2l0aXZlUHJlZml4LmlzRW1w dHkoKSB8fCAhbV9wb3NpdGl2ZVN1ZmZpeC5pc0VtcHR5KCkgfHwgIW1fbmVnYXRpdmVQcmVmaXgu aXNFbXB0eSgpIHx8ICFtX25lZ2F0aXZlU3VmZml4LmlzRW1wdHkoKSk7CiB9CiAKLVN0cmluZyBJ Q1VMb2NhbGU6OmNvbnZlcnRUb0xvY2FsaXplZE51bWJlcihjb25zdCBTdHJpbmcmIGlucHV0KQor U3RyaW5nIExvY2FsZUlDVTo6Y29udmVydFRvTG9jYWxpemVkTnVtYmVyKGNvbnN0IFN0cmluZyYg aW5wdXQpCiB7CiAgICAgaW5pdGlhbGl6ZURlY2ltYWxGb3JtYXQoKTsKICAgICBpZiAoIW1fbnVt YmVyRm9ybWF0IHx8IGlucHV0LmlzRW1wdHkoKSkKQEAgLTE5NSw3ICsxOTUsNyBAQCBzdGF0aWMg Ym9vbCBtYXRjaGVzKGNvbnN0IFN0cmluZyYgdGV4dCwgdW5zaWduZWQgcG9zaXRpb24sIGNvbnN0 IFN0cmluZyYgcGFydCkKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAotYm9vbCBJQ1VMb2NhbGU6OmRl dGVjdFNpZ25BbmRHZXREaWdpdFJhbmdlKGNvbnN0IFN0cmluZyYgaW5wdXQsIGJvb2wmIGlzTmVn YXRpdmUsIHVuc2lnbmVkJiBzdGFydEluZGV4LCB1bnNpZ25lZCYgZW5kSW5kZXgpCitib29sIExv Y2FsZUlDVTo6ZGV0ZWN0U2lnbkFuZEdldERpZ2l0UmFuZ2UoY29uc3QgU3RyaW5nJiBpbnB1dCwg Ym9vbCYgaXNOZWdhdGl2ZSwgdW5zaWduZWQmIHN0YXJ0SW5kZXgsIHVuc2lnbmVkJiBlbmRJbmRl eCkKIHsKICAgICBzdGFydEluZGV4ID0gMDsKICAgICBlbmRJbmRleCA9IGlucHV0Lmxlbmd0aCgp OwpAQCAtMjIzLDcgKzIyMyw3IEBAIGJvb2wgSUNVTG9jYWxlOjpkZXRlY3RTaWduQW5kR2V0RGln aXRSYW5nZShjb25zdCBTdHJpbmcmIGlucHV0LCBib29sJiBpc05lZ2F0aXZlCiAgICAgcmV0dXJu IHRydWU7CiB9CiAKLXVuc2lnbmVkIElDVUxvY2FsZTo6bWF0Y2hlZERlY2ltYWxTeW1ib2xJbmRl eChjb25zdCBTdHJpbmcmIGlucHV0LCB1bnNpZ25lZCYgcG9zaXRpb24pCit1bnNpZ25lZCBMb2Nh bGVJQ1U6Om1hdGNoZWREZWNpbWFsU3ltYm9sSW5kZXgoY29uc3QgU3RyaW5nJiBpbnB1dCwgdW5z aWduZWQmIHBvc2l0aW9uKQogewogICAgIGZvciAodW5zaWduZWQgc3ltYm9sSW5kZXggPSAwOyBz eW1ib2xJbmRleCA8IERlY2ltYWxTeW1ib2xzU2l6ZTsgKytzeW1ib2xJbmRleCkgewogICAgICAg ICBpZiAobV9kZWNpbWFsU3ltYm9sc1tzeW1ib2xJbmRleF0ubGVuZ3RoKCkgJiYgbWF0Y2hlcyhp bnB1dCwgcG9zaXRpb24sIG1fZGVjaW1hbFN5bWJvbHNbc3ltYm9sSW5kZXhdKSkgewpAQCAtMjM0 LDcgKzIzNCw3IEBAIHVuc2lnbmVkIElDVUxvY2FsZTo6bWF0Y2hlZERlY2ltYWxTeW1ib2xJbmRl eChjb25zdCBTdHJpbmcmIGlucHV0LCB1bnNpZ25lZCYgcG9zCiAgICAgcmV0dXJuIERlY2ltYWxT eW1ib2xzU2l6ZTsKIH0KIAotU3RyaW5nIElDVUxvY2FsZTo6Y29udmVydEZyb21Mb2NhbGl6ZWRO dW1iZXIoY29uc3QgU3RyaW5nJiBsb2NhbGl6ZWQpCitTdHJpbmcgTG9jYWxlSUNVOjpjb252ZXJ0 RnJvbUxvY2FsaXplZE51bWJlcihjb25zdCBTdHJpbmcmIGxvY2FsaXplZCkKIHsKICAgICBpbml0 aWFsaXplRGVjaW1hbEZvcm1hdCgpOwogICAgIFN0cmluZyBpbnB1dCA9IGxvY2FsaXplZC5zdHJp cFdoaXRlU3BhY2UoKTsKQEAgLTI2OCw3ICsyNjgsNyBAQCBTdHJpbmcgSUNVTG9jYWxlOjpjb252 ZXJ0RnJvbUxvY2FsaXplZE51bWJlcihjb25zdCBTdHJpbmcmIGxvY2FsaXplZCkKICAgICByZXR1 cm4gYnVpbGRlci50b1N0cmluZygpOwogfQogCi1ib29sIElDVUxvY2FsZTo6aW5pdGlhbGl6ZVNo b3J0RGF0ZUZvcm1hdCgpCitib29sIExvY2FsZUlDVTo6aW5pdGlhbGl6ZVNob3J0RGF0ZUZvcm1h dCgpCiB7CiAgICAgaWYgKG1fZGlkQ3JlYXRlU2hvcnREYXRlRm9ybWF0KQogICAgICAgICByZXR1 cm4gbV9zaG9ydERhdGVGb3JtYXQ7CkBAIC0yNzksNyArMjc5LDcgQEAgYm9vbCBJQ1VMb2NhbGU6 OmluaXRpYWxpemVTaG9ydERhdGVGb3JtYXQoKQogICAgIHJldHVybiBtX3Nob3J0RGF0ZUZvcm1h dDsKIH0KIAotZG91YmxlIElDVUxvY2FsZTo6cGFyc2VMb2NhbGl6ZWREYXRlKGNvbnN0IFN0cmlu ZyYgaW5wdXQpCitkb3VibGUgTG9jYWxlSUNVOjpwYXJzZUxvY2FsaXplZERhdGUoY29uc3QgU3Ry aW5nJiBpbnB1dCkKIHsKICAgICBpZiAoIWluaXRpYWxpemVTaG9ydERhdGVGb3JtYXQoKSkKICAg ICAgICAgcmV0dXJuIG51bWVyaWNfbGltaXRzPGRvdWJsZT46OnF1aWV0X05hTigpOwpAQCAtMjk1 LDcgKzI5NSw3IEBAIGRvdWJsZSBJQ1VMb2NhbGU6OnBhcnNlTG9jYWxpemVkRGF0ZShjb25zdCBT dHJpbmcmIGlucHV0KQogICAgIHJldHVybiBkYXRlOwogfQogCi1TdHJpbmcgSUNVTG9jYWxlOjpm b3JtYXRMb2NhbGl6ZWREYXRlKGNvbnN0IERhdGVDb21wb25lbnRzJiBkYXRlQ29tcG9uZW50cykK K1N0cmluZyBMb2NhbGVJQ1U6OmZvcm1hdExvY2FsaXplZERhdGUoY29uc3QgRGF0ZUNvbXBvbmVu dHMmIGRhdGVDb21wb25lbnRzKQogewogICAgIGlmICghaW5pdGlhbGl6ZVNob3J0RGF0ZUZvcm1h dCgpKQogICAgICAgICByZXR1cm4gU3RyaW5nKCk7CkBAIC0zNjcsNyArMzY3LDcgQEAgc3RhdGlj IFN0cmluZyBsb2NhbGl6ZUZvcm1hdChjb25zdCBWZWN0b3I8VUNoYXI+JiBidWZmZXIpCiAgICAg cmV0dXJuIGJ1aWxkZXIudG9TdHJpbmcoKTsKIH0KIAotdm9pZCBJQ1VMb2NhbGU6OmluaXRpYWxp emVMb2NhbGl6ZWREYXRlRm9ybWF0VGV4dCgpCit2b2lkIExvY2FsZUlDVTo6aW5pdGlhbGl6ZUxv Y2FsaXplZERhdGVGb3JtYXRUZXh0KCkKIHsKICAgICBpZiAoIW1fbG9jYWxpemVkRGF0ZUZvcm1h dFRleHQuaXNOdWxsKCkpCiAgICAgICAgIHJldHVybjsKQEAgLTM4NiwxMyArMzg2LDEzIEBAIHZv aWQgSUNVTG9jYWxlOjppbml0aWFsaXplTG9jYWxpemVkRGF0ZUZvcm1hdFRleHQoKQogICAgIG1f bG9jYWxpemVkRGF0ZUZvcm1hdFRleHQgPSBsb2NhbGl6ZUZvcm1hdChidWZmZXIpOwogfQogCi1T dHJpbmcgSUNVTG9jYWxlOjpsb2NhbGl6ZWREYXRlRm9ybWF0VGV4dCgpCitTdHJpbmcgTG9jYWxl SUNVOjpsb2NhbGl6ZWREYXRlRm9ybWF0VGV4dCgpCiB7CiAgICAgaW5pdGlhbGl6ZUxvY2FsaXpl ZERhdGVGb3JtYXRUZXh0KCk7CiAgICAgcmV0dXJuIG1fbG9jYWxpemVkRGF0ZUZvcm1hdFRleHQ7 CiB9CiAKLVBhc3NPd25QdHI8VmVjdG9yPFN0cmluZz4gPiBJQ1VMb2NhbGU6OmNyZWF0ZUxhYmVs VmVjdG9yKFVEYXRlRm9ybWF0U3ltYm9sVHlwZSB0eXBlLCBpbnQzMl90IHN0YXJ0SW5kZXgsIGlu dDMyX3Qgc2l6ZSkKK1Bhc3NPd25QdHI8VmVjdG9yPFN0cmluZz4gPiBMb2NhbGVJQ1U6OmNyZWF0 ZUxhYmVsVmVjdG9yKFVEYXRlRm9ybWF0U3ltYm9sVHlwZSB0eXBlLCBpbnQzMl90IHN0YXJ0SW5k ZXgsIGludDMyX3Qgc2l6ZSkKIHsKICAgICBpZiAoIW1fc2hvcnREYXRlRm9ybWF0KQogICAgICAg ICByZXR1cm4gUGFzc093blB0cjxWZWN0b3I8U3RyaW5nPiA+KCk7CkBAIC00MzksNyArNDM5LDcg QEAgc3RhdGljIFBhc3NPd25QdHI8VmVjdG9yPFN0cmluZz4gPiBjcmVhdGVGYWxsYmFja1dlZWtE YXlTaG9ydExhYmVscygpCiAgICAgcmV0dXJuIGxhYmVscy5yZWxlYXNlKCk7CiB9CiAKLXZvaWQg SUNVTG9jYWxlOjppbml0aWFsaXplQ2FsZW5kYXIoKQordm9pZCBMb2NhbGVJQ1U6OmluaXRpYWxp emVDYWxlbmRhcigpCiB7CiAgICAgaWYgKG1fbW9udGhMYWJlbHMgJiYgbV93ZWVrRGF5U2hvcnRM YWJlbHMpCiAgICAgICAgIHJldHVybjsKQEAgLTQ2MSwxOSArNDYxLDE5IEBAIHZvaWQgSUNVTG9j YWxlOjppbml0aWFsaXplQ2FsZW5kYXIoKQogICAgICAgICBtX3dlZWtEYXlTaG9ydExhYmVscyA9 IGNyZWF0ZUZhbGxiYWNrV2Vla0RheVNob3J0TGFiZWxzKCk7CiB9CiAKLWNvbnN0IFZlY3RvcjxT dHJpbmc+JiBJQ1VMb2NhbGU6Om1vbnRoTGFiZWxzKCkKK2NvbnN0IFZlY3RvcjxTdHJpbmc+JiBM b2NhbGVJQ1U6Om1vbnRoTGFiZWxzKCkKIHsKICAgICBpbml0aWFsaXplQ2FsZW5kYXIoKTsKICAg ICByZXR1cm4gKm1fbW9udGhMYWJlbHM7CiB9CiAKLWNvbnN0IFZlY3RvcjxTdHJpbmc+JiBJQ1VM b2NhbGU6OndlZWtEYXlTaG9ydExhYmVscygpCitjb25zdCBWZWN0b3I8U3RyaW5nPiYgTG9jYWxl SUNVOjp3ZWVrRGF5U2hvcnRMYWJlbHMoKQogewogICAgIGluaXRpYWxpemVDYWxlbmRhcigpOwog ICAgIHJldHVybiAqbV93ZWVrRGF5U2hvcnRMYWJlbHM7CiB9CiAKLXVuc2lnbmVkIElDVUxvY2Fs ZTo6Zmlyc3REYXlPZldlZWsoKQordW5zaWduZWQgTG9jYWxlSUNVOjpmaXJzdERheU9mV2Vlaygp CiB7CiAgICAgaW5pdGlhbGl6ZUNhbGVuZGFyKCk7CiAgICAgcmV0dXJuIG1fZmlyc3REYXlPZldl ZWs7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L0xvY2FsZUlDVS5o IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vdGV4dC9Mb2NhbGVJQ1UuaAppbmRleCA3NGZjNzA3 MTk4YjZkNThmNzc1MjA2YjNmMGNiMDEyY2Y5YTk5NzgzLi43NzM2MGEyYWE4M2JkODA1MTUyN2Y0 NDk0ZmQzZDRlOTExNTc4YjVjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS90 ZXh0L0xvY2FsZUlDVS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvTG9jYWxl SUNVLmgKQEAgLTI4LDggKzI4LDggQEAKICAqIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURW SVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAgKi8KIAotI2lmbmRlZiBJ Q1VMb2NhbGVfaAotI2RlZmluZSBJQ1VMb2NhbGVfaAorI2lmbmRlZiBMb2NhbGVJQ1VfaAorI2Rl ZmluZSBMb2NhbGVJQ1VfaAogCiAjaW5jbHVkZSAiRGF0ZUNvbXBvbmVudHMuaCIKICNpbmNsdWRl IDx1bmljb2RlL3VkYXQuaD4KQEAgLTQyLDEyICs0MiwxMiBAQAogbmFtZXNwYWNlIFdlYkNvcmUg ewogCiAvLyBXZSBzaG91bGQgdXNlIHRoaXMgY2xhc3Mgb25seSBmb3IgTG9jYWxpemVkTnVtYmVy SUNVLmNwcCwgTG9jYWxpemVkRGF0ZUlDVS5jcHAsCi0vLyBMb2NhbGl6ZWRDYWxlbmRhcklDVS5j cHAsIGFuZCBMb2NhbGl6ZWROdW1iZXJJQ1VUZXN0LmNwcC4KLWNsYXNzIElDVUxvY2FsZSB7Cisv LyBhbmQgTG9jYWxpemVkTnVtYmVySUNVVGVzdC5jcHAuCitjbGFzcyBMb2NhbGVJQ1UgewogcHVi bGljOgotICAgIHN0YXRpYyBQYXNzT3duUHRyPElDVUxvY2FsZT4gY3JlYXRlKGNvbnN0IGNoYXIq IGxvY2FsZVN0cmluZyk7Ci0gICAgc3RhdGljIElDVUxvY2FsZSogY3VycmVudExvY2FsZSgpOwot ICAgIH5JQ1VMb2NhbGUoKTsKKyAgICBzdGF0aWMgUGFzc093blB0cjxMb2NhbGVJQ1U+IGNyZWF0 ZShjb25zdCBjaGFyKiBsb2NhbGVTdHJpbmcpOworICAgIHN0YXRpYyBMb2NhbGVJQ1UqIGN1cnJl bnRMb2NhbGUoKTsKKyAgICB+TG9jYWxlSUNVKCk7CiAKICAgICAvLyBGb3IgTG9jYWxpemVkTnVt YmVyCiAgICAgU3RyaW5nIGNvbnZlcnRUb0xvY2FsaXplZE51bWJlcihjb25zdCBTdHJpbmcmKTsK QEAgLTU5LDE1ICs1OSwxNCBAQCBwdWJsaWM6CiAjaWYgRU5BQkxFKENBTEVOREFSX1BJQ0tFUikK ICAgICBTdHJpbmcgbG9jYWxpemVkRGF0ZUZvcm1hdFRleHQoKTsKIAotICAgIC8vIEZvciBMb2Nh bGl6ZWRDYWxlbmRhcgogICAgIGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBtb250aExhYmVscygpOwog ICAgIGNvbnN0IFZlY3RvcjxTdHJpbmc+JiB3ZWVrRGF5U2hvcnRMYWJlbHMoKTsKICAgICB1bnNp Z25lZCBmaXJzdERheU9mV2VlaygpOwogI2VuZGlmCiAKIHByaXZhdGU6Ci0gICAgc3RhdGljIFBh c3NPd25QdHI8SUNVTG9jYWxlPiBjcmVhdGVGb3JDdXJyZW50TG9jYWxlKCk7Ci0gICAgZXhwbGlj aXQgSUNVTG9jYWxlKGNvbnN0IGNoYXIqKTsKKyAgICBzdGF0aWMgUGFzc093blB0cjxMb2NhbGVJ Q1U+IGNyZWF0ZUZvckN1cnJlbnRMb2NhbGUoKTsKKyAgICBleHBsaWNpdCBMb2NhbGVJQ1UoY29u c3QgY2hhciopOwogICAgIHZvaWQgc2V0RGVjaW1hbFN5bWJvbCh1bnNpZ25lZCBpbmRleCwgVU51 bWJlckZvcm1hdFN5bWJvbCk7CiAgICAgdm9pZCBzZXREZWNpbWFsVGV4dEF0dHJpYnV0ZShTdHJp bmcmLCBVTnVtYmVyRm9ybWF0VGV4dEF0dHJpYnV0ZSk7CiAgICAgdm9pZCBpbml0aWFsaXplRGVj aW1hbEZvcm1hdCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vdGV4dC9M b2NhbGl6ZWREYXRlSUNVLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvTG9jYWxp emVkRGF0ZUlDVS5jcHAKaW5kZXggNTdhNGY2M2QxNTcyNmRiNGVmZTgwMzc4MjE4YTIyZjJkNTE5 MWI1Yy4uMTBjYjZmMTMyY2UzOTNlZmU5YmRhNGYwZDc3MGMwYzhmOWVjYjdmOCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vdGV4dC9Mb2NhbGl6ZWREYXRlSUNVLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L0xvY2FsaXplZERhdGVJQ1UuY3BwCkBAIC00 Miw3ICs0Miw3IEBAIGRvdWJsZSBwYXJzZUxvY2FsaXplZERhdGUoY29uc3QgU3RyaW5nJiBpbnB1 dCwgRGF0ZUNvbXBvbmVudHM6OlR5cGUgdHlwZSkKIHsKICAgICBzd2l0Y2ggKHR5cGUpIHsKICAg ICBjYXNlIERhdGVDb21wb25lbnRzOjpEYXRlOgotICAgICAgICByZXR1cm4gSUNVTG9jYWxlOjpj dXJyZW50TG9jYWxlKCktPnBhcnNlTG9jYWxpemVkRGF0ZShpbnB1dCk7CisgICAgICAgIHJldHVy biBMb2NhbGVJQ1U6OmN1cnJlbnRMb2NhbGUoKS0+cGFyc2VMb2NhbGl6ZWREYXRlKGlucHV0KTsK ICAgICBjYXNlIERhdGVDb21wb25lbnRzOjpEYXRlVGltZToKICAgICBjYXNlIERhdGVDb21wb25l bnRzOjpEYXRlVGltZUxvY2FsOgogICAgIGNhc2UgRGF0ZUNvbXBvbmVudHM6Ok1vbnRoOgpAQCAt NTgsNyArNTgsNyBAQCBTdHJpbmcgZm9ybWF0TG9jYWxpemVkRGF0ZShjb25zdCBEYXRlQ29tcG9u ZW50cyYgZGF0ZUNvbXBvbmVudHMpCiB7CiAgICAgc3dpdGNoIChkYXRlQ29tcG9uZW50cy50eXBl KCkpIHsKICAgICBjYXNlIERhdGVDb21wb25lbnRzOjpEYXRlOgotICAgICAgICByZXR1cm4gSUNV TG9jYWxlOjpjdXJyZW50TG9jYWxlKCktPmZvcm1hdExvY2FsaXplZERhdGUoZGF0ZUNvbXBvbmVu dHMpOworICAgICAgICByZXR1cm4gTG9jYWxlSUNVOjpjdXJyZW50TG9jYWxlKCktPmZvcm1hdExv Y2FsaXplZERhdGUoZGF0ZUNvbXBvbmVudHMpOwogICAgIGNhc2UgRGF0ZUNvbXBvbmVudHM6OkRh dGVUaW1lOgogICAgIGNhc2UgRGF0ZUNvbXBvbmVudHM6OkRhdGVUaW1lTG9jYWw6CiAgICAgY2Fz ZSBEYXRlQ29tcG9uZW50czo6TW9udGg6CkBAIC03MywyMiArNzMsMjIgQEAgU3RyaW5nIGZvcm1h dExvY2FsaXplZERhdGUoY29uc3QgRGF0ZUNvbXBvbmVudHMmIGRhdGVDb21wb25lbnRzKQogI2lm IEVOQUJMRShDQUxFTkRBUl9QSUNLRVIpCiBTdHJpbmcgbG9jYWxpemVkRGF0ZUZvcm1hdFRleHQo KQogewotICAgIHJldHVybiBJQ1VMb2NhbGU6OmN1cnJlbnRMb2NhbGUoKS0+bG9jYWxpemVkRGF0 ZUZvcm1hdFRleHQoKTsKKyAgICByZXR1cm4gTG9jYWxlSUNVOjpjdXJyZW50TG9jYWxlKCktPmxv Y2FsaXplZERhdGVGb3JtYXRUZXh0KCk7CiB9CiAKIGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBtb250 aExhYmVscygpCiB7Ci0gICAgcmV0dXJuIElDVUxvY2FsZTo6Y3VycmVudExvY2FsZSgpLT5tb250 aExhYmVscygpOworICAgIHJldHVybiBMb2NhbGVJQ1U6OmN1cnJlbnRMb2NhbGUoKS0+bW9udGhM YWJlbHMoKTsKIH0KIAogY29uc3QgVmVjdG9yPFN0cmluZz4mIHdlZWtEYXlTaG9ydExhYmVscygp CiB7Ci0gICAgcmV0dXJuIElDVUxvY2FsZTo6Y3VycmVudExvY2FsZSgpLT53ZWVrRGF5U2hvcnRM YWJlbHMoKTsKKyAgICByZXR1cm4gTG9jYWxlSUNVOjpjdXJyZW50TG9jYWxlKCktPndlZWtEYXlT aG9ydExhYmVscygpOwogfQogCiB1bnNpZ25lZCBmaXJzdERheU9mV2VlaygpCiB7Ci0gICAgcmV0 dXJuIElDVUxvY2FsZTo6Y3VycmVudExvY2FsZSgpLT5maXJzdERheU9mV2VlaygpOworICAgIHJl dHVybiBMb2NhbGVJQ1U6OmN1cnJlbnRMb2NhbGUoKS0+Zmlyc3REYXlPZldlZWsoKTsKIH0KICNl bmRpZgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L0xvY2FsaXpl ZE51bWJlcklDVS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L0xvY2FsaXplZE51 bWJlcklDVS5jcHAKaW5kZXggNDc2NDFhMTQzNTVlY2EyMmY2NjhmZDU2MGY0MDk2OGYyZTU2ODE1 Ny4uZDhhM2Y5OGJmMDE1Y2FlOGNkZTBmZDI0YWE1YTI3MzRmNjFiZjdmMiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vdGV4dC9Mb2NhbGl6ZWROdW1iZXJJQ1UuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvTG9jYWxpemVkTnVtYmVySUNVLmNwcApAQCAt MzcsMTIgKzM3LDEyIEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogU3RyaW5nIGNvbnZlcnRUb0xv Y2FsaXplZE51bWJlcihjb25zdCBTdHJpbmcmIGNhbm9uaWNhbE51bWJlclN0cmluZywgdW5zaWdu ZWQgZnJhY3Rpb25EaWdpdHMpCiB7Ci0gICAgcmV0dXJuIElDVUxvY2FsZTo6Y3VycmVudExvY2Fs ZSgpLT5jb252ZXJ0VG9Mb2NhbGl6ZWROdW1iZXIoY2Fub25pY2FsTnVtYmVyU3RyaW5nKTsKKyAg ICByZXR1cm4gTG9jYWxlSUNVOjpjdXJyZW50TG9jYWxlKCktPmNvbnZlcnRUb0xvY2FsaXplZE51 bWJlcihjYW5vbmljYWxOdW1iZXJTdHJpbmcpOwogfQogCiBTdHJpbmcgY29udmVydEZyb21Mb2Nh bGl6ZWROdW1iZXIoY29uc3QgU3RyaW5nJiBsb2NhbGl6ZWROdW1iZXJTdHJpbmcpCiB7Ci0gICAg cmV0dXJuIElDVUxvY2FsZTo6Y3VycmVudExvY2FsZSgpLT5jb252ZXJ0RnJvbUxvY2FsaXplZE51 bWJlcihsb2NhbGl6ZWROdW1iZXJTdHJpbmcpOworICAgIHJldHVybiBMb2NhbGVJQ1U6OmN1cnJl bnRMb2NhbGUoKS0+Y29udmVydEZyb21Mb2NhbGl6ZWROdW1iZXIobG9jYWxpemVkTnVtYmVyU3Ry aW5nKTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9jaHJvbWl1bS90ZXN0cy9Mb2NhbGl6ZWROdW1iZXJJQ1VUZXN0LmNwcCBiL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vdGVzdHMvTG9jYWxpemVkTnVtYmVySUNVVGVzdC5jcHAKaW5kZXggNGY0 ZTZhZjY4YWM4YjBkOTM4MGMxZDRlNjRmZGE0ZGY4OGJjMDAxOC4uOTJmODVjNmJiOGM3MWRkZDZk YTU2ZWQxYjg1MmE3YWFiYzY2ZDRmOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1 bS90ZXN0cy9Mb2NhbGl6ZWROdW1iZXJJQ1VUZXN0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL3Rlc3RzL0xvY2FsaXplZE51bWJlcklDVVRlc3QuY3BwCkBAIC0zOCw3ICszOCw3IEBA IHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCiB2b2lkIHRlc3ROdW1iZXJJc1JldmVyc2libGUo Y29uc3QgY2hhciogbG9jYWxlU3RyaW5nLCBjb25zdCBjaGFyKiBvcmlnaW5hbCwgY29uc3QgY2hh ciogc2hvdWxkSGF2ZSA9IDApCiB7Ci0gICAgT3duUHRyPElDVUxvY2FsZT4gbG9jYWxlID0gSUNV TG9jYWxlOjpjcmVhdGUobG9jYWxlU3RyaW5nKTsKKyAgICBPd25QdHI8TG9jYWxlSUNVPiBsb2Nh bGUgPSBMb2NhbGVJQ1U6OmNyZWF0ZShsb2NhbGVTdHJpbmcpOwogICAgIFN0cmluZyBsb2NhbGl6 ZWQgPSBsb2NhbGUtPmNvbnZlcnRUb0xvY2FsaXplZE51bWJlcihvcmlnaW5hbCk7CiAgICAgaWYg KHNob3VsZEhhdmUpCiAgICAgICAgIEVYUEVDVF9UUlVFKGxvY2FsaXplZC5jb250YWlucyhzaG91 bGRIYXZlKSk7Cg==