76613 2012-01-19 01:59:40 -0800 Change LocalizedNumber interface 2012-01-20 00:47:43 -0800 1 1 1 Unclassified WebKit Forms 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 62939 1 tkent tkent dglazkov joepeck morrita oldest_to_newest 538562 0 tkent 2012-01-19 01:59:40 -0800 We need to change LocalizedNumber functions for the preparation to solve the number reformatting issue, Bug 62939. 539259 1 123246 tkent 2012-01-19 20:16:58 -0800 Created attachment 123246 Patch 539333 2 tkent 2012-01-20 00:47:43 -0800 Committed r105490: <http://trac.webkit.org/changeset/105490> 123246 2012-01-19 20:16:58 -0800 2012-01-19 23:54:47 -0800 Patch bug-76613-20120120131657.patch text/plain 12258 tkent U3VidmVyc2lvbiBSZXZpc2lvbjogMTA1MzM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWM3NjBjYmIwMzhmZjM5 ZjlkZjhkZmVlZWQzMGYwZWIwZjAzZDFkYi4uN2UxYjA4MTYxNzlhMTZiNDQ5ZmQzZDFlYzAzNDk1 OWQyZGE1ZDM1NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ5IEBACisyMDEyLTAxLTE5ICBLZW50 IFRhbXVyYSAgPHRrZW50QGNocm9taXVtLm9yZz4KKworICAgICAgICBDaGFuZ2UgTG9jYWxpemVk TnVtYmVyIGludGVyZmFjZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9NzY2MTMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBDaGFuZ2UgdGhlIGZ1bmN0aW9ucyBvZiBMb2NhbGl6ZWROdW1iZXIgZnJvbToKKyAg ICAgICAgICBkb3VibGUgcGFyc2VMb2NhbGl6ZWROdW1iZXIoY29uc3QgU3RyaW5nJik7CisgICAg ICAgICAgU3RyaW5nIGZvcm1hdExvY2FsaXplZE51bWJlcihkb3VibGUsIHVuc2lnbmVkIGZyYWN0 aW9uRGlnaXRzKTsKKyAgICAgICAgVG86CisgICAgICAgICAgU3RyaW5nIGNvbnZlcnRUb0xvY2Fs aXplZE51bWJlcihjb25zdCBTdHJpbmcmLCB1c25pZ25lZCBmcmFjdGlvbkRpZ2l0cyk7CisgICAg ICAgICAgU3RyaW5nIGNvbnZlcnRGcm9tTG9jYWxpemVkTnVtYmVyKGNvbnN0IFN0cmluZyYpOwor ICAgICAgICBpbiBvcmRlciB0aGF0IHdlIGNhbiBhdm9pZCBjb252ZXJzaW9uIGZyb20vdG8gYSBk b3VibGUgdmFsdWUuCisKKyAgICAgICAgVGhlIGZyYWN0aW9uRGlnaXRzIGFyZ3VtZXRuIG9mIGNv bnZlcnRUb0xvY2FsaXplZE51bWJlcigpIHdpbGwgYmUKKyAgICAgICAgcmVtb3ZlZCBpbiB0aGUg ZnV0dXJlLiAgV2UgbmVlZCBpdCBiZWNhdXNlIHdlJ2QgbGlrZSB0byByZWN5Y2xlIHRoZSBvbGQK KyAgICAgICAgZnVuY3Rpb25zIHRvIGltcGVsZW50IG5ldyBmdW5jdGlvbnMgZm9yIG5vdyBhbmQg ZnVuY3Rpb25zIGluCisgICAgICAgIExvY2FsaXplZE51bWJlciBjYW4ndCBjYWxsIGZ1bmN0aW9u cyBpbiBIVE1MUGFyc2VySWRpb21zLmNwcC4KKworICAgICAgICBObyBuZXcgdGVzdHMgYmVjYXVz ZSB0aGUgY2hhbmdlIGRvZXNuJ3QgbWFrZSBhbnkgYmVoYXZpb3IgY2hhbmdlLgorCisgICAgICAg ICogaHRtbC9OdW1iZXJJbnB1dFR5cGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TnVtYmVySW5w dXRUeXBlOjp2aXNpYmxlVmFsdWUpOgorICAgICAgICBVc2UgY29udmVydFRvTG9jYWxpemVkTnVt YmVyLgorICAgICAgICAoV2ViQ29yZTo6TnVtYmVySW5wdXRUeXBlOjpjb252ZXJ0RnJvbVZpc2li bGVWYWx1ZSk6CisgICAgICAgIFVzZSBjb252ZXJ0RnJvbUxvY2FsaXplZE51bWJlci4KKyAgICAg ICAgKFdlYkNvcmU6Ok51bWJlcklucHV0VHlwZTo6aXNBY2NlcHRhYmxlVmFsdWUpOiBkaXR0by4K KyAgICAgICAgKiBwbGF0Zm9ybS90ZXh0L0xvY2FsaXplZE51bWJlci5oOgorICAgICAgICBSZW1v dmUgcGFyc2VMb2NhbGl6ZWROdW1iZXIgYW5kIGZvcm1hdExvY2FsaXplZE51bWJlciwgYW5kCisg ICAgICAgIGludHJvZHVjZSBjb252ZXJ0VG9Mb2NhbGl6ZWROdW1iZXIgYW5kIGNvbnZlcnRGcm9t TG9jYWxpemVkTnVtYmVyLgorICAgICAgICAqIHBsYXRmb3JtL3RleHQvTG9jYWxpemVkTnVtYmVy SUNVLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnBhcnNlTG9jYWxpemVkTnVtYmVyKTogTWFrZSB0 aGlzIHN0YXRpYy4KKyAgICAgICAgKFdlYkNvcmU6OmZvcm1hdExvY2FsaXplZE51bWJlcik6IE1h a2UgdGhpcyBzdGF0aWMuCisgICAgICAgIChXZWJDb3JlOjpjb252ZXJ0VG9Mb2NhbGl6ZWROdW1i ZXIpOiBJbXBsZW1lbnQgdGhpcyB3aXRoIGZvcm1hdExvY2FsaXplZE51bWJlci4KKyAgICAgICAg KFdlYkNvcmU6OmNvbnZlcnRGcm9tTG9jYWxpemVkTnVtYmVyKTogSW1wbGVtZW50IHRoaXMgd2l0 aCBwYXJzZUxvY2FsaXplZE51bWJlci4KKyAgICAgICAgKiBwbGF0Zm9ybS90ZXh0L0xvY2FsaXpl ZE51bWJlck5vbmUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Y29udmVydFRvTG9jYWxpemVkTnVt YmVyKToKKyAgICAgICAgSW1wbGVtZW50IHRoaXMgYXMgYSBmdW5jdGlvbiByZXR1cm5pbmcgdGhl IGlucHV0IHN0cmluZy4KKyAgICAgICAgKFdlYkNvcmU6OmNvbnZlcnRGcm9tTG9jYWxpemVkTnVt YmVyKTogZGl0dG8uCisgICAgICAgICogcGxhdGZvcm0vdGV4dC9tYWMvTG9jYWxpemVkTnVtYmVy TWFjLm1tOgorICAgICAgICAoV2ViQ29yZTo6cGFyc2VMb2NhbGl6ZWROdW1iZXIpOiBNYWtlIHRo aXMgc3RhdGljLgorICAgICAgICAoV2ViQ29yZTo6Zm9ybWF0TG9jYWxpemVkTnVtYmVyKTogTWFr ZSB0aGlzIHN0YXRpYy4KKyAgICAgICAgKFdlYkNvcmU6OmNvbnZlcnRUb0xvY2FsaXplZE51bWJl cik6IEltcGxlbWVudCB0aGlzIHdpdGggZm9ybWF0TG9jYWxpemVkTnVtYmVyLgorICAgICAgICAo V2ViQ29yZTo6Y29udmVydEZyb21Mb2NhbGl6ZWROdW1iZXIpOiBJbXBsZW1lbnQgdGhpcyB3aXRo IHBhcnNlTG9jYWxpemVkTnVtYmVyLgorCiAyMDEyLTAxLTE4ICBFcmljIENhcmxzb24gIDxlcmlj LmNhcmxzb25AYXBwbGUuY29tPgogCiAgICAgICAgIFByb3ZpZGUgYWNjZXNzIHRvIHVzZXIncyBs aXN0IG9mIHByZWZlcnJlZCBsYW5ndWFnZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0 bWwvTnVtYmVySW5wdXRUeXBlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvTnVtYmVySW5wdXRU eXBlLmNwcAppbmRleCA2ZDBlOTcyYjMwZmY1ZGFkOGNlYjliMGE5ZTlmMjI1ZjE1M2FmMDI2Li40 NGZiMzVhNzNmZGM0ZGJkYmRkZDE1OTg1OGQwODMwNjIwNWQyYzg2IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9odG1sL051bWJlcklucHV0VHlwZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv aHRtbC9OdW1iZXJJbnB1dFR5cGUuY3BwCkBAIC0yODgsMjQgKzI4OCwyNCBAQCBTdHJpbmcgTnVt YmVySW5wdXRUeXBlOjp2aXNpYmxlVmFsdWUoKSBjb25zdAogICAgIFN0cmluZyBjdXJyZW50VmFs dWUgPSBlbGVtZW50KCktPnZhbHVlKCk7CiAgICAgaWYgKGN1cnJlbnRWYWx1ZS5pc0VtcHR5KCkp CiAgICAgICAgIHJldHVybiBjdXJyZW50VmFsdWU7CisgICAgLy8gRklYTUU6IFRoZSBmb2xsb3dp bmcgdGhyZWUgbGluZXMgc2hvdWxkIGJlIHJlbW92ZWQgd2hlbiB3ZQorICAgIC8vIHJlbW92ZSB0 aGUgc2Vjb25kIGFyZ3VtZW50IG9mIGNvbnZlcnRUb0xvY2FsaXplZE51bWJlcigpLgogICAgIGRv dWJsZSBkb3VibGVWYWx1ZSA9IG51bWVyaWNfbGltaXRzPGRvdWJsZT46OnF1aWV0X05hTigpOwog ICAgIHVuc2lnbmVkIGRlY2ltYWxQbGFjZTsKICAgICBwYXJzZVRvRG91YmxlRm9yTnVtYmVyVHlw ZVdpdGhEZWNpbWFsUGxhY2VzKGN1cnJlbnRWYWx1ZSwgJmRvdWJsZVZhbHVlLCAmZGVjaW1hbFBs YWNlKTsKLSAgICBTdHJpbmcgbG9jYWxpemVkID0gZm9ybWF0TG9jYWxpemVkTnVtYmVyKGRvdWJs ZVZhbHVlLCBkZWNpbWFsUGxhY2UpOwotICAgIHJldHVybiBsb2NhbGl6ZWQuaXNFbXB0eSgpID8g Y3VycmVudFZhbHVlIDogbG9jYWxpemVkOworICAgIHJldHVybiBjb252ZXJ0VG9Mb2NhbGl6ZWRO dW1iZXIoY3VycmVudFZhbHVlLCBkZWNpbWFsUGxhY2UpOwogfQogCiBTdHJpbmcgTnVtYmVySW5w dXRUeXBlOjpjb252ZXJ0RnJvbVZpc2libGVWYWx1ZShjb25zdCBTdHJpbmcmIHZpc2libGVWYWx1 ZSkgY29uc3QKIHsKICAgICBpZiAodmlzaWJsZVZhbHVlLmlzRW1wdHkoKSkKICAgICAgICAgcmV0 dXJuIHZpc2libGVWYWx1ZTsKLSAgICBkb3VibGUgcGFyc2VkTnVtYmVyID0gcGFyc2VMb2NhbGl6 ZWROdW1iZXIodmlzaWJsZVZhbHVlKTsKLSAgICByZXR1cm4gaXNmaW5pdGUocGFyc2VkTnVtYmVy KSA/IHNlcmlhbGl6ZUZvck51bWJlclR5cGUocGFyc2VkTnVtYmVyKSA6IHZpc2libGVWYWx1ZTsK KyAgICByZXR1cm4gY29udmVydEZyb21Mb2NhbGl6ZWROdW1iZXIodmlzaWJsZVZhbHVlKTsKIH0K IAogYm9vbCBOdW1iZXJJbnB1dFR5cGU6OmlzQWNjZXB0YWJsZVZhbHVlKGNvbnN0IFN0cmluZyYg cHJvcG9zZWRWYWx1ZSkKIHsKLSAgICByZXR1cm4gcHJvcG9zZWRWYWx1ZS5pc0VtcHR5KCkgfHwg aXNmaW5pdGUocGFyc2VMb2NhbGl6ZWROdW1iZXIocHJvcG9zZWRWYWx1ZSkpIHx8IHBhcnNlVG9E b3VibGVGb3JOdW1iZXJUeXBlKHByb3Bvc2VkVmFsdWUsIDApOworICAgIHJldHVybiBwcm9wb3Nl ZFZhbHVlLmlzRW1wdHkoKSB8fCBwYXJzZVRvRG91YmxlRm9yTnVtYmVyVHlwZShjb252ZXJ0RnJv bUxvY2FsaXplZE51bWJlcihwcm9wb3NlZFZhbHVlKSwgMCkgfHwgcGFyc2VUb0RvdWJsZUZvck51 bWJlclR5cGUocHJvcG9zZWRWYWx1ZSwgMCk7CiB9CiAKIFN0cmluZyBOdW1iZXJJbnB1dFR5cGU6 OnNhbml0aXplVmFsdWUoY29uc3QgU3RyaW5nJiBwcm9wb3NlZFZhbHVlKSBjb25zdApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vdGV4dC9Mb2NhbGl6ZWROdW1iZXIuaCBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvTG9jYWxpemVkTnVtYmVyLmgKaW5kZXggMDFkMjU1 M2VmMjY1ZGQ0YTJmMWRiYmY1Y2QxYzVmMTViZjBkMGFmMy4uMzUwZGFjMGRiMDQ1ZDc1ZTcwMDNk MzAxZWY3NzVjYTVhYjRjZTMyYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v dGV4dC9Mb2NhbGl6ZWROdW1iZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS90ZXh0 L0xvY2FsaXplZE51bWJlci5oCkBAIC0zNSwyMSArMzUsMjAgQEAKIAogbmFtZXNwYWNlIFdlYkNv cmUgewogCi0vLyBQYXJzZXMgYSBzdHJpbmcgcmVwcmVzZW50YXRpb24gb2YgYSBmbG9hdGluZyBw b2ludCBudW1iZXIgbG9jYWxpemVkCi0vLyBmb3IgdGhlIGJyb3dzZXIncyBjdXJyZW50IGxvY2Fs ZS4gSWYgdGhlIGlucHV0IHN0cmluZyBpcyBub3QgdmFsaWQKLS8vIG9yIGFuIGltcGxlbWVudGF0 aW9uIGRvZXNuJ3Qgc3VwcG9ydCBsb2NhbGl6ZWQgbnVtYmVycywgdGhpcwotLy8gZnVuY3Rpb24g cmV0dXJucyBOYU4uIFRoaXMgZnVuY3Rpb24gZG9lc24ndCBuZWVkIHRvIHN1cHBvcnQKLS8vIHNj aWVudGlmaWMgbm90YXRpb24sIE5hTiwgK0luZmluaXR5IGFuZCAtSW5maW5pdHksIGFuZCBkb2Vz bid0IG5lZWQKLS8vIHRvIHN1cHBvcnQgdGhlIHN0YW5kYXJkIHJlcHJlc2VudGF0aW9ucyBvZiBF Q01BU2NyaXB0IGFuZCBIVE1MNS4KLWRvdWJsZSBwYXJzZUxvY2FsaXplZE51bWJlcihjb25zdCBT dHJpbmcmKTsKKy8vIENvbnZlcnRzIHRoZSBzcGVjaWZpZWQgbnVtYmVyIHN0cmluZyB0byBhbm90 aGVyIG51bWJlciBzdHJpbmcKKy8vIGxvY2FsaXplZCBmb3IgdGhlIGJyb3dzZXIncyBjdXJyZW50 IGxvY2FsZS4gVGhlIGlucHV0IHN0cmluZyBtdXN0CisvLyBjb25mb3JtIHRvIEhUTUwgZmxvYXRp bmctcG9pbnQgbnVtYmVycywgYW5kIGlzIG5vdCBlbXB0eS4gVGhlCisvLyBmcmFjdGlvbkRpZ2l0 cyBhcmd1bWVudCBpcyBkZXByZWNhdGVkLiBUaGUgZnVuY3Rpb24gaW1wbGVtZW50YWlvbgorLy8g c2hvdWxkIG5vdCB1c2UgdGhlIGFyZ3VtZW50LgorU3RyaW5nIGNvbnZlcnRUb0xvY2FsaXplZE51 bWJlcihjb25zdCBTdHJpbmcmLCB1bnNpZ25lZCBmcmFjdGlvbkRpZ2l0cyk7CiAKLS8vIFNlcmlh bGl6ZXMgdGhlIHNwZWNpZmllZCBmbG9hdGluZyBwb2ludCBudW1iZXIgZm9yIHRoZSBicm93c2Vy J3MKLS8vIGN1cnJlbnQgbG9jYWxlLiAgSWYgYW4gaW1wbGVtZW50YXRpb24gZG9lc24ndCBzdXBw b3J0IGxvY2FsaXplZAotLy8gbnVtYmVycyBvciB0aGUgaW5wdXQgdmFsdWUgaXMgTmFOIG9yIElu ZmluaXRpeSwgdGhlIGZ1bmN0aW9uIHNob3VsZAotLy8gcmV0dXJuIGFuIGVtcHR5IHN0cmluZy4K LS8vIGZyYWN0aW9uRGlnaXRzIGlzIHRoZSBtYXhpbXVtIGxlbmd0aCBvZiB0aGUgZnJhY3Rpb25h bCBwYXJ0cyBvZiB0aGUKLS8vIHJlc3VsdGFudCBzdHJpbmcuCi1TdHJpbmcgZm9ybWF0TG9jYWxp emVkTnVtYmVyKGRvdWJsZSwgdW5zaWduZWQgZnJhY3Rpb25EaWdpdHMpOworLy8gQ29udmVydHMg dGhlIHNwZWNpZmllZCBsb2NhbGl6ZWQgbnVtYmVyIHN0cmluZyB0byBhIG51bWJlciBzdHJpbmcK Ky8vIGluIHRoZSBIVE1MIGZsb2F0aW5nLXBvaW50IG51bWJlciBmb3JtYXQuIFRoZSBpbnB1dCBz dHJpbmcgaXMKKy8vIHByb3ZpZGVkIGJ5IGEgZW5kIHVzZXIsIGFuZCBtaWdodCBub3QgYmUgYSBu dW1iZXIgc3RyaW5nLiBJdCdzIG9rCisvLyB0aGF0IHRoZSBmdW5jdGlvbiByZXR1cm5zIGEgc3Ry aW5nIHdoaWNoIGlzIG5vdCBjb25mb3JtcyB0byB0aGUKKy8vIEhUTUwgZmxvYXRpbmctcG9pbnQg bnVtYmVyIGZvcm1hdCwgY2FsbGVycyBvZiB0aGlzIGZ1bmN0aW9uIGFyZQorLy8gcmVzcG9uc2li bGUgdG8gY2hlY2sgdGhlIGZvcm1hdCBvZiB0aGUgcmVzdWx0YW50IHN0cmluZy4KK1N0cmluZyBj b252ZXJ0RnJvbUxvY2FsaXplZE51bWJlcihjb25zdCBTdHJpbmcmKTsKIAogfSAvLyBuYW1lc3Bh Y2UgV2ViQ29yZQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L0xv Y2FsaXplZE51bWJlcklDVS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L0xvY2Fs aXplZE51bWJlcklDVS5jcHAKaW5kZXggZGMyMjZkZjEyYTBhYmZhOWVkYzY4OTk1MDVjZmZiMDMx MDM1ZGMxYS4uMDNkYjRkNTQ2Mjg5ZjE0N2Q4Zjk1NzhjMTVmZTlkM2FhNzljMDk3NSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vdGV4dC9Mb2NhbGl6ZWROdW1iZXJJQ1UuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvTG9jYWxpemVkTnVtYmVySUNVLmNw cApAQCAtMzcsNiArMzcsNyBAQAogI2luY2x1ZGUgPHd0Zi9NYWluVGhyZWFkLmg+CiAjaW5jbHVk ZSA8d3RmL01hdGhFeHRyYXMuaD4KICNpbmNsdWRlIDx3dGYvUGFzc093blB0ci5oPgorI2luY2x1 ZGUgPHd0Zi9kdG9hLmg+CiAKIHVzaW5nIG5hbWVzcGFjZSBpY3U7CiB1c2luZyBuYW1lc3BhY2Ug c3RkOwpAQCAtNzYsNyArNzcsNyBAQCBzdGF0aWMgTnVtYmVyRm9ybWF0KiBudW1iZXJGb3JtYXR0 ZXJGb3JEaXNwbGF5KCkKICAgICByZXR1cm4gZm9ybWF0dGVyOwogfQogCi1kb3VibGUgcGFyc2VM b2NhbGl6ZWROdW1iZXIoY29uc3QgU3RyaW5nJiBudW1iZXJTdHJpbmcpCitzdGF0aWMgZG91Ymxl IHBhcnNlTG9jYWxpemVkTnVtYmVyKGNvbnN0IFN0cmluZyYgbnVtYmVyU3RyaW5nKQogewogICAg IGlmIChudW1iZXJTdHJpbmcuaXNFbXB0eSgpKQogICAgICAgICByZXR1cm4gbnVtZXJpY19saW1p dHM8ZG91YmxlPjo6cXVpZXRfTmFOKCk7CkBAIC05NCw3ICs5NSw3IEBAIGRvdWJsZSBwYXJzZUxv Y2FsaXplZE51bWJlcihjb25zdCBTdHJpbmcmIG51bWJlclN0cmluZykKICAgICByZXR1cm4gVV9T VUNDRVNTKHN0YXR1cykgPyBudW1lcmljUmVzdWx0IDogbnVtZXJpY19saW1pdHM8ZG91YmxlPjo6 cXVpZXRfTmFOKCk7CiB9CiAKLVN0cmluZyBmb3JtYXRMb2NhbGl6ZWROdW1iZXIoZG91YmxlIG51 bWJlciwgdW5zaWduZWQgZnJhY3Rpb25EaWdpdHMpCitzdGF0aWMgU3RyaW5nIGZvcm1hdExvY2Fs aXplZE51bWJlcihkb3VibGUgbnVtYmVyLCB1bnNpZ25lZCBmcmFjdGlvbkRpZ2l0cykKIHsKICAg ICBOdW1iZXJGb3JtYXQqIGZvcm1hdHRlciA9IG51bWJlckZvcm1hdHRlckZvckRpc3BsYXkoKTsK ICAgICBpZiAoIWZvcm1hdHRlcikKQEAgLTEwNSw0ICsxMDYsMzAgQEAgU3RyaW5nIGZvcm1hdExv Y2FsaXplZE51bWJlcihkb3VibGUgbnVtYmVyLCB1bnNpZ25lZCBmcmFjdGlvbkRpZ2l0cykKICAg ICByZXR1cm4gU3RyaW5nKHJlc3VsdC5nZXRCdWZmZXIoKSwgcmVzdWx0Lmxlbmd0aCgpKTsKIH0K IAorU3RyaW5nIGNvbnZlcnRUb0xvY2FsaXplZE51bWJlcihjb25zdCBTdHJpbmcmIGNhbm9uaWNh bE51bWJlclN0cmluZywgdW5zaWduZWQgZnJhY3Rpb25EaWdpdHMpCit7CisgICAgLy8gRklYTUU6 IFdlIHNob3VsZCBub3QgZG8gcGFyc2UtdGhlbi1mb3JtYXQuIEl0IG1ha2VzIHNvbWUKKyAgICAv LyBwcm9ibGVtcyBzdWNoIGFzIHJlbW92aW5nIGxlYWRpbmcgemVyb3MsIGNoYW5naW5nIHRyYWls aW5nCisgICAgLy8gZGlnaXRzIHRvIHplcm9zLgorICAgIC8vIEZJWE1FOiBXZSBzaG91bGQgbm90 IHVzZSB0aGUgZnJhY3Rpb25EaWdpdHMgYXJndW1lbnQuCisKKyAgICBkb3VibGUgZG91YmxlVmFs dWUgPSBjYW5vbmljYWxOdW1iZXJTdHJpbmcudG9Eb3VibGUoKTsKKyAgICAvLyBUaGUgaW5wdXQg c3RyaW5nIG11c3QgYmUgdmFsaWQuCisgICAgcmV0dXJuIGZvcm1hdExvY2FsaXplZE51bWJlcihk b3VibGVWYWx1ZSwgZnJhY3Rpb25EaWdpdHMpOworCit9CisKK1N0cmluZyBjb252ZXJ0RnJvbUxv Y2FsaXplZE51bWJlcihjb25zdCBTdHJpbmcmIGxvY2FsaXplZE51bWJlclN0cmluZykKK3sKKyAg ICAvLyBGSVhNRTogV2Ugc2hvdWxkIG5vdCBkbyBwYXJzZS10aGVuLWZvcm1hdC4gSXQgbWFrZXMg c29tZQorICAgIC8vIHByb2JsZW1zIHN1Y2ggYXMgcmVtb3ZpbmcgbGVhZGluZyB6ZXJvcywgY2hh bmdpbmcgdHJhaWxpbmcKKyAgICAvLyBkaWdpdHMgdG8gemVyb3MuCisKKyAgICBkb3VibGUgZG91 YmxlVmFsdWUgPSBwYXJzZUxvY2FsaXplZE51bWJlcihsb2NhbGl6ZWROdW1iZXJTdHJpbmcpOwor ICAgIGlmICghaXNmaW5pdGUoZG91YmxlVmFsdWUpKQorICAgICAgICByZXR1cm4gbG9jYWxpemVk TnVtYmVyU3RyaW5nOworICAgIE51bWJlclRvU3RyaW5nQnVmZmVyIGJ1ZmZlcjsKKyAgICByZXR1 cm4gU3RyaW5nKG51bWJlclRvU3RyaW5nKGRvdWJsZVZhbHVlLCBidWZmZXIpKTsKK30KKwogfSAv LyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v dGV4dC9Mb2NhbGl6ZWROdW1iZXJOb25lLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3Rl eHQvTG9jYWxpemVkTnVtYmVyTm9uZS5jcHAKaW5kZXggYzdhOGVkMjc0OTJlNjZkYmI0MzhlNTRi MTBiY2JkMWRiMGQ0OGEzMC4uYTE0MDA4NTVkOWRiYmFjMTkxZTI4NzhlOTg4ZWE1ZjZkNjQzNDEz YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vdGV4dC9Mb2NhbGl6ZWROdW1i ZXJOb25lLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L0xvY2FsaXplZE51 bWJlck5vbmUuY3BwCkBAIC0zNywxNCArMzcsMTQgQEAgdXNpbmcgbmFtZXNwYWNlIHN0ZDsKIAog bmFtZXNwYWNlIFdlYkNvcmUgewogCi1kb3VibGUgcGFyc2VMb2NhbGl6ZWROdW1iZXIoY29uc3Qg U3RyaW5nJikKK1N0cmluZyBjb252ZXJ0VG9Mb2NhbGl6ZWROdW1iZXIoY29uc3QgU3RyaW5nJiBj YW5vbmljYWxOdW1iZXJTdHJpbmcsIHVuc2lnbmVkKQogewotICAgIHJldHVybiBudW1lcmljX2xp bWl0czxkb3VibGU+OjpxdWlldF9OYU4oKTsKKyAgICByZXR1cm4gY2Fub25pY2FsTnVtYmVyU3Ry aW5nOwogfQogCi1TdHJpbmcgZm9ybWF0TG9jYWxpemVkTnVtYmVyKGRvdWJsZSwgdW5zaWduZWQp CitTdHJpbmcgY29udmVydEZyb21Mb2NhbGl6ZWROdW1iZXIoY29uc3QgU3RyaW5nJiBsb2NhbGl6 ZWROdW1iZXJTdHJpbmcpCiB7Ci0gICAgcmV0dXJuIFN0cmluZygpOworICAgIHJldHVybiBsb2Nh bGl6ZWROdW1iZXJTdHJpbmc7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvbWFjL0xvY2FsaXplZE51bWJlck1hYy5t bSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvbWFjL0xvY2FsaXplZE51bWJlck1hYy5t bQppbmRleCBhYzZlNzA5OTBhNThlMjJiNWJhOTM2ZGFhMzYyMTVmOGY3NDU3OWE0Li5jMmE3ZWEw MTNhNDE2ODdmMjhhYmQ2NjBlNTMzZjdhYjlmMjlmNjQyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS90ZXh0L21hYy9Mb2NhbGl6ZWROdW1iZXJNYWMubW0KKysrIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vdGV4dC9tYWMvTG9jYWxpemVkTnVtYmVyTWFjLm1tCkBAIC0zMyw3 ICszMyw5IEBACiAKICNpbXBvcnQgPEZvdW5kYXRpb24vTlNOdW1iZXJGb3JtYXR0ZXIuaD4KICNp bXBvcnQgPGxpbWl0cz4KKyNpbXBvcnQgPHd0Zi9kdG9hLmg+CiAjaW1wb3J0IDx3dGYvTWFpblRo cmVhZC5oPgorI2ltcG9ydCA8d3RmL01hdGhFeHRyYXMuaD4KICNpbXBvcnQgPHd0Zi9SZXRhaW5Q dHIuaD4KICNpbXBvcnQgPHd0Zi90ZXh0L0NTdHJpbmcuaD4KIApAQCAtNzAsNyArNzIsNyBAQCBz dGF0aWMgTlNOdW1iZXJGb3JtYXR0ZXIgKm51bWJlckZvcm1hdHRlckZvckRpc3BsYXkoKQogICAg IHJldHVybiBmb3JtYXR0ZXI7CiB9CiAKLWRvdWJsZSBwYXJzZUxvY2FsaXplZE51bWJlcihjb25z dCBTdHJpbmcmIG51bWJlclN0cmluZykKK3N0YXRpYyBkb3VibGUgcGFyc2VMb2NhbGl6ZWROdW1i ZXIoY29uc3QgU3RyaW5nJiBudW1iZXJTdHJpbmcpCiB7CiAgICAgaWYgKG51bWJlclN0cmluZy5p c0VtcHR5KCkpCiAgICAgICAgIHJldHVybiBudW1lcmljX2xpbWl0czxkb3VibGU+OjpxdWlldF9O YU4oKTsKQEAgLTgwLDcgKzgyLDcgQEAgZG91YmxlIHBhcnNlTG9jYWxpemVkTnVtYmVyKGNvbnN0 IFN0cmluZyYgbnVtYmVyU3RyaW5nKQogICAgIHJldHVybiBbbnVtYmVyIGRvdWJsZVZhbHVlXTsK IH0KIAotU3RyaW5nIGZvcm1hdExvY2FsaXplZE51bWJlcihkb3VibGUgaW5wdXROdW1iZXIsIHVu c2lnbmVkIGZyYWN0aW9uRGlnaXRzKQorc3RhdGljIFN0cmluZyBmb3JtYXRMb2NhbGl6ZWROdW1i ZXIoZG91YmxlIGlucHV0TnVtYmVyLCB1bnNpZ25lZCBmcmFjdGlvbkRpZ2l0cykKIHsKICAgICBS ZXRhaW5QdHI8TlNOdW1iZXI+IG51bWJlcihBZG9wdE5TLCBbW05TTnVtYmVyIGFsbG9jXSBpbml0 V2l0aERvdWJsZTppbnB1dE51bWJlcl0pOwogICAgIFJldGFpblB0cjxOU051bWJlckZvcm1hdHRl cj4gZm9ybWF0dGVyID0gbnVtYmVyRm9ybWF0dGVyRm9yRGlzcGxheSgpOwpAQCAtODgsNSArOTAs MzEgQEAgU3RyaW5nIGZvcm1hdExvY2FsaXplZE51bWJlcihkb3VibGUgaW5wdXROdW1iZXIsIHVu c2lnbmVkIGZyYWN0aW9uRGlnaXRzKQogICAgIHJldHVybiBTdHJpbmcoW2Zvcm1hdHRlci5nZXQo KSBzdHJpbmdGcm9tTnVtYmVyOm51bWJlci5nZXQoKV0pOwogfQogCitTdHJpbmcgY29udmVydFRv TG9jYWxpemVkTnVtYmVyKGNvbnN0IFN0cmluZyYgY2Fub25pY2FsTnVtYmVyU3RyaW5nLCB1bnNp Z25lZCBmcmFjdGlvbkRpZ2l0cykKK3sKKyAgICAvLyBGSVhNRTogV2Ugc2hvdWxkIG5vdCBkbyBw YXJzZS10aGVuLWZvcm1hdC4gSXQgbWFrZXMgc29tZQorICAgIC8vIHByb2JsZW1zIHN1Y2ggYXMg cmVtb3ZpbmcgbGVhZGluZyB6ZXJvcywgY2hhbmdpbmcgdHJhaWxpbmcKKyAgICAvLyBkaWdpdHMg dG8gemVyb3MuCisgICAgLy8gRklYTUU6IFdlIHNob3VsZCBub3QgdXNlIHRoZSBmcmFjdGlvbkRp Z2l0cyBhcmd1bWVudC4KKworICAgIGRvdWJsZSBkb3VibGVWYWx1ZSA9IGNhbm9uaWNhbE51bWJl clN0cmluZy50b0RvdWJsZSgpOworICAgIC8vIFRoZSBpbnB1dCBzdHJpbmcgbXVzdCBiZSB2YWxp ZC4KKyAgICByZXR1cm4gZm9ybWF0TG9jYWxpemVkTnVtYmVyKGRvdWJsZVZhbHVlLCBmcmFjdGlv bkRpZ2l0cyk7CisKK30KKworU3RyaW5nIGNvbnZlcnRGcm9tTG9jYWxpemVkTnVtYmVyKGNvbnN0 IFN0cmluZyYgbG9jYWxpemVkTnVtYmVyU3RyaW5nKQoreworICAgIC8vIEZJWE1FOiBXZSBzaG91 bGQgbm90IGRvIHBhcnNlLXRoZW4tZm9ybWF0LiBJdCBtYWtlcyBzb21lCisgICAgLy8gcHJvYmxl bXMgc3VjaCBhcyByZW1vdmluZyBsZWFkaW5nIHplcm9zLCBjaGFuZ2luZyB0cmFpbGluZworICAg IC8vIGRpZ2l0cyB0byB6ZXJvcy4KKworICAgIGRvdWJsZSBkb3VibGVWYWx1ZSA9IHBhcnNlTG9j YWxpemVkTnVtYmVyKGxvY2FsaXplZE51bWJlclN0cmluZyk7CisgICAgaWYgKCFpc2Zpbml0ZShk b3VibGVWYWx1ZSkpCisgICAgICAgIHJldHVybiBsb2NhbGl6ZWROdW1iZXJTdHJpbmc7CisgICAg TnVtYmVyVG9TdHJpbmdCdWZmZXIgYnVmZmVyOworICAgIHJldHVybiBTdHJpbmcobnVtYmVyVG9T dHJpbmcoZG91YmxlVmFsdWUsIGJ1ZmZlcikpOworfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3Jl CiAK