57715 2011-04-02 18:16:20 -0700 Explicitly use icu namespace for ports building with U_USING_ICU_NAMESPACE=0 2011-04-03 22:12:51 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 thakis thakis abarth commit-queue dbates jamesr oldest_to_newest 378460 0 thakis 2011-04-02 18:16:20 -0700 Expclicitly use icu namespace for ports building with U_USING_ICU_NAMESPACE=0 378461 1 87991 thakis 2011-04-02 18:17:28 -0700 Created attachment 87991 Patch 378464 2 87993 thakis 2011-04-02 18:46:02 -0700 Created attachment 87993 Patch 378467 3 87993 abarth 2011-04-02 20:16:15 -0700 Comment on attachment 87993 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=87993&action=review > Source/WebCore/ChangeLog:12 > + Expclicitly use icu namespace for ports building with U_USING_ICU_NAMESPACE=0 > + https://bugs.webkit.org/show_bug.cgi?id=57715 > + > + * platform/text/LocalizedNumberICU.cpp: > + (WebCore::createFormatterForCurrentLocale): > + (WebCore::numberFormatter): > + (WebCore::parseLocalizedNumber): > + (WebCore::formatLocalizedNumber): This ChangeLog doesn't tell me why you're making this change. I have no idea. 378471 4 87994 thakis 2011-04-02 20:49:06 -0700 Created attachment 87994 Patch 378474 5 87994 commit-queue 2011-04-02 21:55:23 -0700 Comment on attachment 87994 Patch Clearing flags on attachment: 87994 Committed r82787: <http://trac.webkit.org/changeset/82787> 378475 6 commit-queue 2011-04-02 21:55:28 -0700 All reviewed patches have been landed. Closing bug. 378639 7 ap 2011-04-03 21:49:56 -0700 *** Bug 57714 has been marked as a duplicate of this bug. *** 378640 8 ap 2011-04-03 21:52:07 -0700 We don't normally use namespace prefixes in .cpp files, we put using directives in the beginning (e.g. "using namespace std;"). 378647 9 thakis 2011-04-03 22:12:51 -0700 whoopsies: https://bugs.webkit.org/show_bug.cgi?id=57742 87991 2011-04-02 18:17:28 -0700 2011-04-02 18:45:59 -0700 Patch bug-57715-20110402181727.patch text/plain 3369 thakis U3VidmVyc2lvbiBSZXZpc2lvbjogODI3NjUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA4ZjE4YzJlMzM4ZDQ2YmZj YmY3YmE5ZTQ5ZjQyYzcwYjBkYzI1MzY5Li40MzMxYWEzM2I1NzJlYTEyNTgxMDlkMGVmMzE5OTE0 MTFlYTlhY2ZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEtMDQtMDIgIE5pY28g V2ViZXIgIDx0aGFraXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEV4cGNsaWNpdGx5IHVzZSBpY3UgbmFtZXNwYWNlIGZvciBw b3J0cyBidWlsZGluZyB3aXRoIFVfVVNJTkdfSUNVX05BTUVTUEFDRT0wCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01NzcxNQorCisgICAgICAgIE5vIG5l dyB0ZXN0cy4gKE9PUFMhKQorCisgICAgICAgICogcGxhdGZvcm0vdGV4dC9Mb2NhbGl6ZWROdW1i ZXJJQ1UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Y3JlYXRlRm9ybWF0dGVyRm9yQ3VycmVudExv Y2FsZSk6CisgICAgICAgIChXZWJDb3JlOjpudW1iZXJGb3JtYXR0ZXIpOgorICAgICAgICAoV2Vi Q29yZTo6cGFyc2VMb2NhbGl6ZWROdW1iZXIpOgorICAgICAgICAoV2ViQ29yZTo6Zm9ybWF0TG9j YWxpemVkTnVtYmVyKToKKwogMjAxMS0wNC0wMSAgTWljaGFlbCBTYWJvZmYgIDxtc2Fib2ZmQGFw cGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvTG9jYWxpemVkTnVtYmVySUNVLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvTG9jYWxpemVkTnVtYmVySUNVLmNwcAppbmRleCA3 YzRiMWNiNGM0ZDhiZDRlMTI3ZDczNDVmODAxOTRhNDM3NmQ3MDU0Li5hOGM2MmE3OTI3Mjc3NGU1 ZWI3ZTUzMjBmYTc4OGRiY2M3MWU1YzI4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS90ZXh0L0xvY2FsaXplZE51bWJlcklDVS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vdGV4dC9Mb2NhbGl6ZWROdW1iZXJJQ1UuY3BwCkBAIC00MSwxOCArNDEsMTggQEAgdXNp bmcgbmFtZXNwYWNlIHN0ZDsKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi1zdGF0aWMgUGFzc093 blB0cjxOdW1iZXJGb3JtYXQ+IGNyZWF0ZUZvcm1hdHRlckZvckN1cnJlbnRMb2NhbGUoKQorc3Rh dGljIFBhc3NPd25QdHI8aWN1OjpOdW1iZXJGb3JtYXQ+IGNyZWF0ZUZvcm1hdHRlckZvckN1cnJl bnRMb2NhbGUoKQogewogICAgIFVFcnJvckNvZGUgc3RhdHVzID0gVV9aRVJPX0VSUk9SOwotICAg IE93blB0cjxOdW1iZXJGb3JtYXQ+IGZvcm1hdHRlciA9IGFkb3B0UHRyKE51bWJlckZvcm1hdDo6 Y3JlYXRlSW5zdGFuY2Uoc3RhdHVzKSk7CisgICAgT3duUHRyPGljdTo6TnVtYmVyRm9ybWF0PiBm b3JtYXR0ZXIgPSBhZG9wdFB0cihpY3U6Ok51bWJlckZvcm1hdDo6Y3JlYXRlSW5zdGFuY2Uoc3Rh dHVzKSk7CiAgICAgcmV0dXJuIFVfU1VDQ0VTUyhzdGF0dXMpID8gZm9ybWF0dGVyLnJlbGVhc2Uo KSA6IDA7CiB9CiAKIC8vIFRoaXMgbWlnaHQgcmV0dXJuIDAuCi1zdGF0aWMgTnVtYmVyRm9ybWF0 KiBudW1iZXJGb3JtYXR0ZXIoKQorc3RhdGljIGljdTo6TnVtYmVyRm9ybWF0KiBudW1iZXJGb3Jt YXR0ZXIoKQogewogICAgIEFTU0VSVChpc01haW5UaHJlYWQoKSk7Ci0gICAgc3RhdGljIE51bWJl ckZvcm1hdCogZm9ybWF0dGVyID0gY3JlYXRlRm9ybWF0dGVyRm9yQ3VycmVudExvY2FsZSgpLmxl YWtQdHIoKTsKKyAgICBzdGF0aWMgaWN1OjpOdW1iZXJGb3JtYXQqIGZvcm1hdHRlciA9IGNyZWF0 ZUZvcm1hdHRlckZvckN1cnJlbnRMb2NhbGUoKS5sZWFrUHRyKCk7CiAgICAgcmV0dXJuIGZvcm1h dHRlcjsKIH0KIApAQCAtNjAsMTIgKzYwLDEyIEBAIGRvdWJsZSBwYXJzZUxvY2FsaXplZE51bWJl cihjb25zdCBTdHJpbmcmIG51bWJlclN0cmluZykKIHsKICAgICBpZiAobnVtYmVyU3RyaW5nLmlz RW1wdHkoKSkKICAgICAgICAgcmV0dXJuIG51bWVyaWNfbGltaXRzPGRvdWJsZT46OnF1aWV0X05h TigpOwotICAgIE51bWJlckZvcm1hdCogZm9ybWF0dGVyID0gbnVtYmVyRm9ybWF0dGVyKCk7Cisg ICAgaWN1OjpOdW1iZXJGb3JtYXQqIGZvcm1hdHRlciA9IG51bWJlckZvcm1hdHRlcigpOwogICAg IGlmICghZm9ybWF0dGVyKQogICAgICAgICByZXR1cm4gbnVtZXJpY19saW1pdHM8ZG91YmxlPjo6 cXVpZXRfTmFOKCk7Ci0gICAgVW5pY29kZVN0cmluZyBudW1iZXJVbmljb2RlU3RyaW5nKG51bWJl clN0cmluZy5jaGFyYWN0ZXJzKCksIG51bWJlclN0cmluZy5sZW5ndGgoKSk7Ci0gICAgRm9ybWF0 dGFibGUgcmVzdWx0OwotICAgIFBhcnNlUG9zaXRpb24gcG9zaXRpb24oMCk7CisgICAgaWN1OjpV bmljb2RlU3RyaW5nIG51bWJlclVuaWNvZGVTdHJpbmcobnVtYmVyU3RyaW5nLmNoYXJhY3RlcnMo KSwgbnVtYmVyU3RyaW5nLmxlbmd0aCgpKTsKKyAgICBpY3U6OkZvcm1hdHRhYmxlIHJlc3VsdDsK KyAgICBpY3U6OlBhcnNlUG9zaXRpb24gcG9zaXRpb24oMCk7CiAgICAgZm9ybWF0dGVyLT5wYXJz ZShudW1iZXJVbmljb2RlU3RyaW5nLCByZXN1bHQsIHBvc2l0aW9uKTsKICAgICBpZiAocG9zaXRp b24uZ2V0SW5kZXgoKSAhPSBudW1iZXJVbmljb2RlU3RyaW5nLmxlbmd0aCgpKQogICAgICAgICBy ZXR1cm4gbnVtZXJpY19saW1pdHM8ZG91YmxlPjo6cXVpZXRfTmFOKCk7CkBAIC03NiwxMCArNzYs MTAgQEAgZG91YmxlIHBhcnNlTG9jYWxpemVkTnVtYmVyKGNvbnN0IFN0cmluZyYgbnVtYmVyU3Ry aW5nKQogCiBTdHJpbmcgZm9ybWF0TG9jYWxpemVkTnVtYmVyKGRvdWJsZSBudW1iZXIsIHVuc2ln bmVkIGZyYWN0aW9uRGlnaXRzKQogewotICAgIE51bWJlckZvcm1hdCogZm9ybWF0dGVyID0gbnVt YmVyRm9ybWF0dGVyKCk7CisgICAgaWN1OjpOdW1iZXJGb3JtYXQqIGZvcm1hdHRlciA9IG51bWJl ckZvcm1hdHRlcigpOwogICAgIGlmICghZm9ybWF0dGVyKQogICAgICAgICByZXR1cm4gU3RyaW5n KCk7Ci0gICAgVW5pY29kZVN0cmluZyByZXN1bHQ7CisgICAgaWN1OjpVbmljb2RlU3RyaW5nIHJl c3VsdDsKICAgICBmb3JtYXR0ZXItPnNldE1heGltdW1GcmFjdGlvbkRpZ2l0cyhjbGFtcFRvSW50 ZWdlcihmcmFjdGlvbkRpZ2l0cykpOwogICAgIGZvcm1hdHRlci0+Zm9ybWF0KG51bWJlciwgcmVz dWx0KTsKICAgICByZXR1cm4gU3RyaW5nKHJlc3VsdC5nZXRCdWZmZXIoKSwgcmVzdWx0Lmxlbmd0 aCgpKTsK 87993 2011-04-02 18:46:02 -0700 2011-04-02 20:49:03 -0700 Patch bug-57715-20110402184601.patch text/plain 3336 thakis U3VidmVyc2lvbiBSZXZpc2lvbjogODI3NjUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA4ZjE4YzJlMzM4ZDQ2YmZj YmY3YmE5ZTQ5ZjQyYzcwYjBkYzI1MzY5Li41ZDM3MDE2OGEwY2Y5MGIxMTRkMzcyNTg1NzEwMDJl NmQ3ZDAzNjMzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTEtMDQtMDIgIE5pY28g V2ViZXIgIDx0aGFraXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEV4cGNsaWNpdGx5IHVzZSBpY3UgbmFtZXNwYWNlIGZvciBw b3J0cyBidWlsZGluZyB3aXRoIFVfVVNJTkdfSUNVX05BTUVTUEFDRT0wCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01NzcxNQorCisgICAgICAgICogcGxh dGZvcm0vdGV4dC9Mb2NhbGl6ZWROdW1iZXJJQ1UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Y3Jl YXRlRm9ybWF0dGVyRm9yQ3VycmVudExvY2FsZSk6CisgICAgICAgIChXZWJDb3JlOjpudW1iZXJG b3JtYXR0ZXIpOgorICAgICAgICAoV2ViQ29yZTo6cGFyc2VMb2NhbGl6ZWROdW1iZXIpOgorICAg ICAgICAoV2ViQ29yZTo6Zm9ybWF0TG9jYWxpemVkTnVtYmVyKToKKwogMjAxMS0wNC0wMSAgTWlj aGFlbCBTYWJvZmYgIDxtc2Fib2ZmQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBE YXJpbiBBZGxlci4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvTG9j YWxpemVkTnVtYmVySUNVLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvTG9jYWxp emVkTnVtYmVySUNVLmNwcAppbmRleCA3YzRiMWNiNGM0ZDhiZDRlMTI3ZDczNDVmODAxOTRhNDM3 NmQ3MDU0Li5hOGM2MmE3OTI3Mjc3NGU1ZWI3ZTUzMjBmYTc4OGRiY2M3MWU1YzI4IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L0xvY2FsaXplZE51bWJlcklDVS5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vdGV4dC9Mb2NhbGl6ZWROdW1iZXJJQ1UuY3Bw CkBAIC00MSwxOCArNDEsMTggQEAgdXNpbmcgbmFtZXNwYWNlIHN0ZDsKIAogbmFtZXNwYWNlIFdl YkNvcmUgewogCi1zdGF0aWMgUGFzc093blB0cjxOdW1iZXJGb3JtYXQ+IGNyZWF0ZUZvcm1hdHRl ckZvckN1cnJlbnRMb2NhbGUoKQorc3RhdGljIFBhc3NPd25QdHI8aWN1OjpOdW1iZXJGb3JtYXQ+ IGNyZWF0ZUZvcm1hdHRlckZvckN1cnJlbnRMb2NhbGUoKQogewogICAgIFVFcnJvckNvZGUgc3Rh dHVzID0gVV9aRVJPX0VSUk9SOwotICAgIE93blB0cjxOdW1iZXJGb3JtYXQ+IGZvcm1hdHRlciA9 IGFkb3B0UHRyKE51bWJlckZvcm1hdDo6Y3JlYXRlSW5zdGFuY2Uoc3RhdHVzKSk7CisgICAgT3du UHRyPGljdTo6TnVtYmVyRm9ybWF0PiBmb3JtYXR0ZXIgPSBhZG9wdFB0cihpY3U6Ok51bWJlckZv cm1hdDo6Y3JlYXRlSW5zdGFuY2Uoc3RhdHVzKSk7CiAgICAgcmV0dXJuIFVfU1VDQ0VTUyhzdGF0 dXMpID8gZm9ybWF0dGVyLnJlbGVhc2UoKSA6IDA7CiB9CiAKIC8vIFRoaXMgbWlnaHQgcmV0dXJu IDAuCi1zdGF0aWMgTnVtYmVyRm9ybWF0KiBudW1iZXJGb3JtYXR0ZXIoKQorc3RhdGljIGljdTo6 TnVtYmVyRm9ybWF0KiBudW1iZXJGb3JtYXR0ZXIoKQogewogICAgIEFTU0VSVChpc01haW5UaHJl YWQoKSk7Ci0gICAgc3RhdGljIE51bWJlckZvcm1hdCogZm9ybWF0dGVyID0gY3JlYXRlRm9ybWF0 dGVyRm9yQ3VycmVudExvY2FsZSgpLmxlYWtQdHIoKTsKKyAgICBzdGF0aWMgaWN1OjpOdW1iZXJG b3JtYXQqIGZvcm1hdHRlciA9IGNyZWF0ZUZvcm1hdHRlckZvckN1cnJlbnRMb2NhbGUoKS5sZWFr UHRyKCk7CiAgICAgcmV0dXJuIGZvcm1hdHRlcjsKIH0KIApAQCAtNjAsMTIgKzYwLDEyIEBAIGRv dWJsZSBwYXJzZUxvY2FsaXplZE51bWJlcihjb25zdCBTdHJpbmcmIG51bWJlclN0cmluZykKIHsK ICAgICBpZiAobnVtYmVyU3RyaW5nLmlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuIG51bWVyaWNf bGltaXRzPGRvdWJsZT46OnF1aWV0X05hTigpOwotICAgIE51bWJlckZvcm1hdCogZm9ybWF0dGVy ID0gbnVtYmVyRm9ybWF0dGVyKCk7CisgICAgaWN1OjpOdW1iZXJGb3JtYXQqIGZvcm1hdHRlciA9 IG51bWJlckZvcm1hdHRlcigpOwogICAgIGlmICghZm9ybWF0dGVyKQogICAgICAgICByZXR1cm4g bnVtZXJpY19saW1pdHM8ZG91YmxlPjo6cXVpZXRfTmFOKCk7Ci0gICAgVW5pY29kZVN0cmluZyBu dW1iZXJVbmljb2RlU3RyaW5nKG51bWJlclN0cmluZy5jaGFyYWN0ZXJzKCksIG51bWJlclN0cmlu Zy5sZW5ndGgoKSk7Ci0gICAgRm9ybWF0dGFibGUgcmVzdWx0OwotICAgIFBhcnNlUG9zaXRpb24g cG9zaXRpb24oMCk7CisgICAgaWN1OjpVbmljb2RlU3RyaW5nIG51bWJlclVuaWNvZGVTdHJpbmco bnVtYmVyU3RyaW5nLmNoYXJhY3RlcnMoKSwgbnVtYmVyU3RyaW5nLmxlbmd0aCgpKTsKKyAgICBp Y3U6OkZvcm1hdHRhYmxlIHJlc3VsdDsKKyAgICBpY3U6OlBhcnNlUG9zaXRpb24gcG9zaXRpb24o MCk7CiAgICAgZm9ybWF0dGVyLT5wYXJzZShudW1iZXJVbmljb2RlU3RyaW5nLCByZXN1bHQsIHBv c2l0aW9uKTsKICAgICBpZiAocG9zaXRpb24uZ2V0SW5kZXgoKSAhPSBudW1iZXJVbmljb2RlU3Ry aW5nLmxlbmd0aCgpKQogICAgICAgICByZXR1cm4gbnVtZXJpY19saW1pdHM8ZG91YmxlPjo6cXVp ZXRfTmFOKCk7CkBAIC03NiwxMCArNzYsMTAgQEAgZG91YmxlIHBhcnNlTG9jYWxpemVkTnVtYmVy KGNvbnN0IFN0cmluZyYgbnVtYmVyU3RyaW5nKQogCiBTdHJpbmcgZm9ybWF0TG9jYWxpemVkTnVt YmVyKGRvdWJsZSBudW1iZXIsIHVuc2lnbmVkIGZyYWN0aW9uRGlnaXRzKQogewotICAgIE51bWJl ckZvcm1hdCogZm9ybWF0dGVyID0gbnVtYmVyRm9ybWF0dGVyKCk7CisgICAgaWN1OjpOdW1iZXJG b3JtYXQqIGZvcm1hdHRlciA9IG51bWJlckZvcm1hdHRlcigpOwogICAgIGlmICghZm9ybWF0dGVy KQogICAgICAgICByZXR1cm4gU3RyaW5nKCk7Ci0gICAgVW5pY29kZVN0cmluZyByZXN1bHQ7Cisg ICAgaWN1OjpVbmljb2RlU3RyaW5nIHJlc3VsdDsKICAgICBmb3JtYXR0ZXItPnNldE1heGltdW1G cmFjdGlvbkRpZ2l0cyhjbGFtcFRvSW50ZWdlcihmcmFjdGlvbkRpZ2l0cykpOwogICAgIGZvcm1h dHRlci0+Zm9ybWF0KG51bWJlciwgcmVzdWx0KTsKICAgICByZXR1cm4gU3RyaW5nKHJlc3VsdC5n ZXRCdWZmZXIoKSwgcmVzdWx0Lmxlbmd0aCgpKTsK 87994 2011-04-02 20:49:06 -0700 2011-04-02 21:55:23 -0700 Patch bug-57715-20110402204905.patch text/plain 3663 thakis U3VidmVyc2lvbiBSZXZpc2lvbjogODI3NjUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA4ZjE4YzJlMzM4ZDQ2YmZj YmY3YmE5ZTQ5ZjQyYzcwYjBkYzI1MzY5Li41M2ZkZGE1NTIxZDE1OGYzMWFjYTNmYjNjYzI4YmRj Y2VjZDExYjA2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTEtMDQtMDIgIE5pY28g V2ViZXIgIDx0aGFraXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEV4cGxpY2l0bHkgdXNlIGljdSBuYW1lc3BhY2UgZm9yIHBv cnRzIGJ1aWxkaW5nIHdpdGggVV9VU0lOR19JQ1VfTkFNRVNQQUNFPTAKKworICAgICAgICBCeSBk ZWZhdWx0LCBJQ1UgaW5jbHVkZXMgfHVzaW5nIG5hbWVzcGFjZSBpY3U7fCBpbiBpdHMgaGVhZGVy IGZpbGVzCisgICAgICAgIGZvciBiYWNrd2FyZHMgY29tcGF0aWJpbGl0eS4gQ2xpZW50cyBjYW4g ZGVmaW5lCisgICAgICAgIFVfVVNJTkdfSUNVX05BTUVTUEFDRT0wIHRvIHRlbGwgSUNVIHRvIG5v dCBkbyB0aGlzLiBQcmVmaXhpbmcgYWxsIElDVQorICAgICAgICBjbGFzc2VzIHdpdGggfGljdTo6 fCBtYWtlcyB0aGlzIGZpbGUgY29tcGlsZSBubyBtYXR0ZXIgd2hhdAorICAgICAgICBVX1VTSU5H X0lDVV9OQU1FU1BBQ0UgaXMgc2V0IHRvLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD01NzcxNQorCisgICAgICAgICogcGxhdGZvcm0vdGV4dC9Mb2Nh bGl6ZWROdW1iZXJJQ1UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Y3JlYXRlRm9ybWF0dGVyRm9y Q3VycmVudExvY2FsZSk6CisgICAgICAgIChXZWJDb3JlOjpudW1iZXJGb3JtYXR0ZXIpOgorICAg ICAgICAoV2ViQ29yZTo6cGFyc2VMb2NhbGl6ZWROdW1iZXIpOgorICAgICAgICAoV2ViQ29yZTo6 Zm9ybWF0TG9jYWxpemVkTnVtYmVyKToKKwogMjAxMS0wNC0wMSAgTWljaGFlbCBTYWJvZmYgIDxt c2Fib2ZmQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvTG9jYWxpemVkTnVtYmVySUNV LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvTG9jYWxpemVkTnVtYmVySUNVLmNw cAppbmRleCA3YzRiMWNiNGM0ZDhiZDRlMTI3ZDczNDVmODAxOTRhNDM3NmQ3MDU0Li5hOGM2MmE3 OTI3Mjc3NGU1ZWI3ZTUzMjBmYTc4OGRiY2M3MWU1YzI4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS90ZXh0L0xvY2FsaXplZE51bWJlcklDVS5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vdGV4dC9Mb2NhbGl6ZWROdW1iZXJJQ1UuY3BwCkBAIC00MSwxOCArNDEs MTggQEAgdXNpbmcgbmFtZXNwYWNlIHN0ZDsKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi1zdGF0 aWMgUGFzc093blB0cjxOdW1iZXJGb3JtYXQ+IGNyZWF0ZUZvcm1hdHRlckZvckN1cnJlbnRMb2Nh bGUoKQorc3RhdGljIFBhc3NPd25QdHI8aWN1OjpOdW1iZXJGb3JtYXQ+IGNyZWF0ZUZvcm1hdHRl ckZvckN1cnJlbnRMb2NhbGUoKQogewogICAgIFVFcnJvckNvZGUgc3RhdHVzID0gVV9aRVJPX0VS Uk9SOwotICAgIE93blB0cjxOdW1iZXJGb3JtYXQ+IGZvcm1hdHRlciA9IGFkb3B0UHRyKE51bWJl ckZvcm1hdDo6Y3JlYXRlSW5zdGFuY2Uoc3RhdHVzKSk7CisgICAgT3duUHRyPGljdTo6TnVtYmVy Rm9ybWF0PiBmb3JtYXR0ZXIgPSBhZG9wdFB0cihpY3U6Ok51bWJlckZvcm1hdDo6Y3JlYXRlSW5z dGFuY2Uoc3RhdHVzKSk7CiAgICAgcmV0dXJuIFVfU1VDQ0VTUyhzdGF0dXMpID8gZm9ybWF0dGVy LnJlbGVhc2UoKSA6IDA7CiB9CiAKIC8vIFRoaXMgbWlnaHQgcmV0dXJuIDAuCi1zdGF0aWMgTnVt YmVyRm9ybWF0KiBudW1iZXJGb3JtYXR0ZXIoKQorc3RhdGljIGljdTo6TnVtYmVyRm9ybWF0KiBu dW1iZXJGb3JtYXR0ZXIoKQogewogICAgIEFTU0VSVChpc01haW5UaHJlYWQoKSk7Ci0gICAgc3Rh dGljIE51bWJlckZvcm1hdCogZm9ybWF0dGVyID0gY3JlYXRlRm9ybWF0dGVyRm9yQ3VycmVudExv Y2FsZSgpLmxlYWtQdHIoKTsKKyAgICBzdGF0aWMgaWN1OjpOdW1iZXJGb3JtYXQqIGZvcm1hdHRl ciA9IGNyZWF0ZUZvcm1hdHRlckZvckN1cnJlbnRMb2NhbGUoKS5sZWFrUHRyKCk7CiAgICAgcmV0 dXJuIGZvcm1hdHRlcjsKIH0KIApAQCAtNjAsMTIgKzYwLDEyIEBAIGRvdWJsZSBwYXJzZUxvY2Fs aXplZE51bWJlcihjb25zdCBTdHJpbmcmIG51bWJlclN0cmluZykKIHsKICAgICBpZiAobnVtYmVy U3RyaW5nLmlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuIG51bWVyaWNfbGltaXRzPGRvdWJsZT46 OnF1aWV0X05hTigpOwotICAgIE51bWJlckZvcm1hdCogZm9ybWF0dGVyID0gbnVtYmVyRm9ybWF0 dGVyKCk7CisgICAgaWN1OjpOdW1iZXJGb3JtYXQqIGZvcm1hdHRlciA9IG51bWJlckZvcm1hdHRl cigpOwogICAgIGlmICghZm9ybWF0dGVyKQogICAgICAgICByZXR1cm4gbnVtZXJpY19saW1pdHM8 ZG91YmxlPjo6cXVpZXRfTmFOKCk7Ci0gICAgVW5pY29kZVN0cmluZyBudW1iZXJVbmljb2RlU3Ry aW5nKG51bWJlclN0cmluZy5jaGFyYWN0ZXJzKCksIG51bWJlclN0cmluZy5sZW5ndGgoKSk7Ci0g ICAgRm9ybWF0dGFibGUgcmVzdWx0OwotICAgIFBhcnNlUG9zaXRpb24gcG9zaXRpb24oMCk7Cisg ICAgaWN1OjpVbmljb2RlU3RyaW5nIG51bWJlclVuaWNvZGVTdHJpbmcobnVtYmVyU3RyaW5nLmNo YXJhY3RlcnMoKSwgbnVtYmVyU3RyaW5nLmxlbmd0aCgpKTsKKyAgICBpY3U6OkZvcm1hdHRhYmxl IHJlc3VsdDsKKyAgICBpY3U6OlBhcnNlUG9zaXRpb24gcG9zaXRpb24oMCk7CiAgICAgZm9ybWF0 dGVyLT5wYXJzZShudW1iZXJVbmljb2RlU3RyaW5nLCByZXN1bHQsIHBvc2l0aW9uKTsKICAgICBp ZiAocG9zaXRpb24uZ2V0SW5kZXgoKSAhPSBudW1iZXJVbmljb2RlU3RyaW5nLmxlbmd0aCgpKQog ICAgICAgICByZXR1cm4gbnVtZXJpY19saW1pdHM8ZG91YmxlPjo6cXVpZXRfTmFOKCk7CkBAIC03 NiwxMCArNzYsMTAgQEAgZG91YmxlIHBhcnNlTG9jYWxpemVkTnVtYmVyKGNvbnN0IFN0cmluZyYg bnVtYmVyU3RyaW5nKQogCiBTdHJpbmcgZm9ybWF0TG9jYWxpemVkTnVtYmVyKGRvdWJsZSBudW1i ZXIsIHVuc2lnbmVkIGZyYWN0aW9uRGlnaXRzKQogewotICAgIE51bWJlckZvcm1hdCogZm9ybWF0 dGVyID0gbnVtYmVyRm9ybWF0dGVyKCk7CisgICAgaWN1OjpOdW1iZXJGb3JtYXQqIGZvcm1hdHRl ciA9IG51bWJlckZvcm1hdHRlcigpOwogICAgIGlmICghZm9ybWF0dGVyKQogICAgICAgICByZXR1 cm4gU3RyaW5nKCk7Ci0gICAgVW5pY29kZVN0cmluZyByZXN1bHQ7CisgICAgaWN1OjpVbmljb2Rl U3RyaW5nIHJlc3VsdDsKICAgICBmb3JtYXR0ZXItPnNldE1heGltdW1GcmFjdGlvbkRpZ2l0cyhj bGFtcFRvSW50ZWdlcihmcmFjdGlvbkRpZ2l0cykpOwogICAgIGZvcm1hdHRlci0+Zm9ybWF0KG51 bWJlciwgcmVzdWx0KTsKICAgICByZXR1cm4gU3RyaW5nKHJlc3VsdC5nZXRCdWZmZXIoKSwgcmVz dWx0Lmxlbmd0aCgpKTsK