101329 2012-11-06 02:49:45 -0800 [Chromium-win] Refactor date/time format conversion code in LocaleWin 2012-11-07 20:12:46 -0800 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 101461 1 tkent tkent haraken webkit.review.bot oldest_to_newest 759464 0 tkent 2012-11-06 02:49:45 -0800 [Chromium-win] Refactor date/time format parsing code in LocaleWin 759471 1 172535 tkent 2012-11-06 03:02:15 -0800 Created attachment 172535 Patch 759498 2 172535 haraken 2012-11-06 03:48:38 -0800 Comment on attachment 172535 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=172535&action=review > Source/WebCore/platform/text/win/LocaleWin.cpp:242 > + else > + converted.append("EEEE"); 'ddddd' is converted to 'EEEE'. Is it expected? > Source/WebCore/platform/text/win/LocaleWin.cpp:251 > + } else if (ch == 't') > + converted.append('a'); 't' and 'tt' are converted to 'a', which looks ok. 'ttt' is also converted to 'a', is it expected? 759549 3 172535 tkent 2012-11-06 05:00:14 -0800 Comment on attachment 172535 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=172535&action=review >> Source/WebCore/platform/text/win/LocaleWin.cpp:242 >> + converted.append("EEEE"); > > 'ddddd' is converted to 'EEEE'. Is it expected? Yes. ddddd is invalid according to MSDN, and users can't set arbitrary format in Control Panel. ddddd should not appear unless OS is corrupted, and any behavior would be ok here. >> Source/WebCore/platform/text/win/LocaleWin.cpp:251 >> + converted.append('a'); > > 't' and 'tt' are converted to 'a', which looks ok. 'ttt' is also converted to 'a', is it expected? Ditto. 759551 4 172535 haraken 2012-11-06 05:00:57 -0800 Comment on attachment 172535 Patch Makes sense. Thanks for the clarification. 760312 5 172535 webkit.review.bot 2012-11-06 19:34:06 -0800 Comment on attachment 172535 Patch Clearing flags on attachment: 172535 Committed r133712: <http://trac.webkit.org/changeset/133712> 760313 6 webkit.review.bot 2012-11-06 19:34:10 -0800 All reviewed patches have been landed. Closing bug. 760614 7 webkit.review.bot 2012-11-07 06:04:22 -0800 Re-opened since this is blocked by bug 101461 761198 8 tkent 2012-11-07 17:20:45 -0800 (In reply to comment #7) > Re-opened since this is blocked by bug 101461 Oh, XP-only failures. I found my change unveiled a bug in the XP/Vista-only path of LocaleWin::shortTimeFormat, which converts a format twice. 761304 9 tkent 2012-11-07 20:12:46 -0800 Committed r133842: <http://trac.webkit.org/changeset/133842> 172535 2012-11-06 03:02:15 -0800 2012-11-06 19:34:06 -0800 Patch bug-101329-20121106200028.patch text/plain 14194 tkent U3VidmVyc2lvbiBSZXZpc2lvbjogMTMzNTY3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDcxMGRlODQ5N2Q5YTYz MTNjYTRlYWM0YWIzNmFmNDk0MzhkNTQ4ZS4uYjE3OWE4NDlhZTAwNTY4ODRlYjgzZmE1NjJlZmUw NjI4ZmY5YTY4MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDEyLTExLTA2ICBLZW50 IFRhbXVyYSAgPHRrZW50QGNocm9taXVtLm9yZz4KKworICAgICAgICBbQ2hyb21pdW0td2luXSBS ZWZhY3RvciBkYXRlL3RpbWUgZm9ybWF0IGNvbnZlcnNpb24gY29kZSBpbiBMb2NhbGVXaW4KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMTMyOQorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGNvbnZlcnRXaW5k b3dzRGF0ZUZvcm1hdFRvTERNTCBhbmQgY29udmVydFdpbmRvd3NUaW1lRm9ybWF0VG9MRE1MIGRp ZAorICAgICAgICBzaW1pbGFyIGpvYnMgd2l0aCBkaWZmZXJlbnQgY29kZS4gV2UgY2FuIG1lcmdl IHRoZW0gaW50byBvbmUgZnVuY3Rpb24uCisKKyAgICAgICAgQXMgZm9yIHRoZSBkYXRlIGZvcm1h dCBjb252ZXJzaW9uLCB3ZSBoYXZlIHRva2VuaXplZCBhIGZvcm1hdCBzdHJpbmcgYW5kCisgICAg ICAgIHN0b3JlZCB0b2tlbiBvYmplY3RzIGludG8gYSB2ZWN0b3IuIFdlIHNraXAgdG9rZW4gb2Jq ZWN0IGdlbmVyYXRpb24gYW5kCisgICAgICAgIGdlbmVyYXRlIGEgTERNTC1jb21wbGlhbnQgcGF0 dGVybiBzdHJpbmcgZHVyaW5nIHBhcnNpbmcuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLiBUaGlz IHNob3VsZCBtYWtlIG5vIGJlaGF2aW9yIGNoYW5nZXMgYW5kCisgICAgICAgIFdlYktpdC9jaHJv bWl1bS90ZXN0cy9Mb2NhbGVXaW5UZXN0LmNwcCBoYXMgdGVzdCBjYXNlcy4KKworICAgICAgICAq IHBsYXRmb3JtL3RleHQvd2luL0xvY2FsZVdpbi5jcHA6CisgICAgICAgIChXZWJDb3JlKTogUmVt b3ZlIERhdGVGb3JtYXRUb2tlbiwgaXNGb29TeW1ib2wsIGVuc3VyZVNob3J0RGF0ZVRva2VucywK KyAgICAgICAgY29udmVydFdpbmRvd3NEYXRlRm9ybWF0VG9MRE1MLCBtYXBDaGFyYWN0ZXJUb0Rh dGVUaW1lRmllbGRUeXBlLCBhbmQKKyAgICAgICAgY29udmVydFdpbmRvd3NUaW1lRm9ybWF0VG9M RE1MLgorICAgICAgICAoV2ViQ29yZTo6Y29tbWl0TGl0ZXJhbFRva2VuKTogU3RvcmUgdGhlIHJl c3VsdCB0byB0aGUgc3BlY2lmaWVkIFN0cmluZ0J1aWxkZXIuCisgICAgICAgIChXZWJDb3JlOjpj b252ZXJ0V2luZG93c0RhdGVUaW1lRm9ybWF0KToKKyAgICAgICAgUmVuYW1lZCBmcm9tIHBhcnNl RGF0ZUZvcm1hdCwgYW5kIHN1cHBvcnRzIHRpbWUgZm9ybWF0IHN5bWJvbHMuCisgICAgICAgIChX ZWJDb3JlOjpMb2NhbGVXaW46OmRhdGVGb3JtYXQpOiBVc2UgY29udmVydFdpbmRvd3NEYXRlVGlt ZUZvcm1hdC4KKyAgICAgICAgKFdlYkNvcmU6OkxvY2FsZVdpbjo6bW9udGhGb3JtYXQpOiBEaXR0 by4KKyAgICAgICAgKFdlYkNvcmU6OkxvY2FsZVdpbjo6dGltZUZvcm1hdCk6IERpdHRvLgorICAg ICAgICAoV2ViQ29yZTo6TG9jYWxlV2luOjpzaG9ydFRpbWVGb3JtYXQpOiBEaXR0by4KKyAgICAg ICAgKiBwbGF0Zm9ybS90ZXh0L3dpbi9Mb2NhbGVXaW4uaDoKKyAgICAgICAgKExvY2FsZVdpbik6 IFJlbW92ZSBlbnN1cmVTaG9ydERhdGVUb2tlbnMgYW5kIG1fc2hvcnREYXRlVG9rZW5zLgorCiAy MDEyLTExLTA1ICBLZWlzaGkgSGF0dG9yaSAgPGtlaXNoaUB3ZWJraXQub3JnPgogCiAgICAgICAg IEludHJvZHVjZSBEYXkgY2xhc3MgdG8gY2FsZW5kYXIgcGlja2VyCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L3dpbi9Mb2NhbGVXaW4uY3BwIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vdGV4dC93aW4vTG9jYWxlV2luLmNwcAppbmRleCBmNzhiMzgzNWMyMGIxYjYw NmQ1NzYzMzM2MGUyNDNhZmNjODdlMjljLi45MjRiN2QzZGQzNDk2MmE2MDY0NzU2ODNlZjgxYjdh MTQ0NjU0YjNjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L3dpbi9M b2NhbGVXaW4uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvd2luL0xvY2Fs ZVdpbi5jcHAKQEAgLTE2MCw0MiArMTYwLDYgQEAgdm9pZCBMb2NhbGVXaW46OmVuc3VyZVNob3J0 TW9udGhMYWJlbHMoKQogCiAvLyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLSBUb2tl bml6ZWQgZGF0ZSBmb3JtYXQKIAotc3RydWN0IERhdGVGb3JtYXRUb2tlbiB7Ci0gICAgZW51bSBU eXBlIHsKLSAgICAgICAgTGl0ZXJhbCwKLSAgICAgICAgRGF5MSwKLSAgICAgICAgRGF5MiwKLSAg ICAgICAgTW9udGgxLAotICAgICAgICBNb250aDIsCi0gICAgICAgIE1vbnRoMywKLSAgICAgICAg TW9udGg0LAotICAgICAgICBZZWFyMSwKLSAgICAgICAgWWVhcjIsCi0gICAgICAgIFllYXI0LAot ICAgIH07Ci0gICAgVHlwZSB0eXBlOwotICAgIFN0cmluZyBkYXRhOyAvLyBUaGlzIGlzIHZhbGlk IG9ubHkgaWYgdHlwZT09TGl0ZXJhbC4KLQotICAgIERhdGVGb3JtYXRUb2tlbihUeXBlIHR5cGUp Ci0gICAgICAgIDogdHlwZSh0eXBlKQotICAgIHsgfQotCi0gICAgRGF0ZUZvcm1hdFRva2VuKGNv bnN0IFN0cmluZyYgZGF0YSkKLSAgICAgICAgOiB0eXBlKExpdGVyYWwpCi0gICAgICAgICwgZGF0 YShkYXRhKQotICAgIHsgfQotCi0gICAgRGF0ZUZvcm1hdFRva2VuKGNvbnN0IERhdGVGb3JtYXRU b2tlbiYgdG9rZW4pCi0gICAgICAgIDogdHlwZSh0b2tlbi50eXBlKQotICAgICAgICAsIGRhdGEo dG9rZW4uZGF0YSkKLSAgICB7IH0KLX07Ci0KLXN0YXRpYyBpbmxpbmUgYm9vbCBpc0VyYVN5bWJv bChVQ2hhciBsZXR0ZXIpIHsgcmV0dXJuIGxldHRlciA9PSAnZyc7IH0KLXN0YXRpYyBpbmxpbmUg Ym9vbCBpc1llYXJTeW1ib2woVUNoYXIgbGV0dGVyKSB7IHJldHVybiBsZXR0ZXIgPT0gJ3knOyB9 Ci1zdGF0aWMgaW5saW5lIGJvb2wgaXNNb250aFN5bWJvbChVQ2hhciBsZXR0ZXIpIHsgcmV0dXJu IGxldHRlciA9PSAnTSc7IH0KLXN0YXRpYyBpbmxpbmUgYm9vbCBpc0RheVN5bWJvbChVQ2hhciBs ZXR0ZXIpIHsgcmV0dXJuIGxldHRlciA9PSAnZCc7IH0KLQogc3RhdGljIHVuc2lnbmVkIGNvdW50 Q29udGludW91c0xldHRlcnMoY29uc3QgU3RyaW5nJiBmb3JtYXQsIHVuc2lnbmVkIGluZGV4KQog ewogICAgIHVuc2lnbmVkIGNvdW50ID0gMTsKQEAgLTIwOCwxOCArMTcyLDM0IEBAIHN0YXRpYyB1 bnNpZ25lZCBjb3VudENvbnRpbnVvdXNMZXR0ZXJzKGNvbnN0IFN0cmluZyYgZm9ybWF0LCB1bnNp Z25lZCBpbmRleCkKICAgICByZXR1cm4gY291bnQ7CiB9CiAKLXN0YXRpYyB2b2lkIGNvbW1pdExp dGVyYWxUb2tlbihTdHJpbmdCdWlsZGVyJiBsaXRlcmFsQnVmZmVyLCBWZWN0b3I8RGF0ZUZvcm1h dFRva2VuPiYgdG9rZW5zKQorc3RhdGljIHZvaWQgY29tbWl0TGl0ZXJhbFRva2VuKFN0cmluZ0J1 aWxkZXImIGxpdGVyYWxCdWZmZXIsIFN0cmluZ0J1aWxkZXImIGNvbnZlcnRlZCkKIHsKICAgICBp ZiAobGl0ZXJhbEJ1ZmZlci5sZW5ndGgoKSA8PSAwKQogICAgICAgICByZXR1cm47Ci0gICAgdG9r ZW5zLmFwcGVuZChEYXRlRm9ybWF0VG9rZW4obGl0ZXJhbEJ1ZmZlci50b1N0cmluZygpKSk7Cisg ICAgRGF0ZVRpbWVGb3JtYXQ6OnF1b3RlQW5kQXBwZW5kTGl0ZXJhbChsaXRlcmFsQnVmZmVyLnRv U3RyaW5nKCksIGNvbnZlcnRlZCk7CiAgICAgbGl0ZXJhbEJ1ZmZlci5jbGVhcigpOwogfQogCi0v LyBTZWUgaHR0cDovL21zZG4ubWljcm9zb2Z0LmNvbS9lbi11cy9saWJyYXJ5L2RkMzE3Nzg3KHY9 dnMuODUpLmFzcHgKLXN0YXRpYyBWZWN0b3I8RGF0ZUZvcm1hdFRva2VuPiBwYXJzZURhdGVGb3Jt YXQoY29uc3QgU3RyaW5nIGZvcm1hdCkKLXsKLSAgICBWZWN0b3I8RGF0ZUZvcm1hdFRva2VuPiB0 b2tlbnM7CisvLyBUaGlzIGZ1bmN0aW9uIGNvbnZlcnRzIFdpbmRvd3MgZGF0ZS90aW1lIHBhdHRl cm4gZm9ybWF0IFsxXVsyXSBpbnRvIExETUwgZGF0ZQorLy8gZm9ybWF0IHBhdHRlcm4gWzNdLgor Ly8KKy8vIGkuZS4KKy8vICAgV2Ugc2V0IGgsIEgsIG0sIHMsIGQsIGRkLCBNLCBvciB5IGFzIGlz LiBUaGV5IGhhdmUgc2FtZSBtZWFuaW5nIGluIGJvdGggb2YKKy8vICAgV2luZG93cyBhbmQgTERN TC4KKy8vICAgV2UgbmVlZCB0byBjb252ZXJ0IHRoZSBmb2xsb3dpbmcgcGF0dGVybnM6CisvLyAg ICAgdCAtPiBhCisvLyAgICAgdHQgLT4gYQorLy8gICAgIGRkZCAtPiBFRUUKKy8vICAgICBkZGRk IC0+IEVFRUUKKy8vICAgICBnIC0+IEcKKy8vICAgICBnZyAtPiBpZ25vcmUKKy8vCisvLyBbMV0g aHR0cDovL21zZG4ubWljcm9zb2Z0LmNvbS9lbi11cy9saWJyYXJ5L2RkMzE3Nzg3KHY9dnMuODUp LmFzcHgKKy8vIFsyXSBodHRwOi8vbXNkbi5taWNyb3NvZnQuY29tL2VuLXVzL2xpYnJhcnkvZGQz MTgxNDgodj12cy44NSkuYXNweAorLy8gWzNdIExETUwgaHR0cDovL3VuaWNvZGUub3JnL3JlcG9y dHMvdHIzNS90cjM1LTYuaHRtbCNEYXRlX0Zvcm1hdF9QYXR0ZXJucworc3RhdGljIFN0cmluZyBj b252ZXJ0V2luZG93c0RhdGVUaW1lRm9ybWF0KGNvbnN0IFN0cmluZyYgZm9ybWF0KQoreworICAg IFN0cmluZ0J1aWxkZXIgY29udmVydGVkOwogICAgIFN0cmluZ0J1aWxkZXIgbGl0ZXJhbEJ1ZmZl cjsKICAgICBib29sIGluUXVvdGUgPSBmYWxzZTsKICAgICBib29sIGxhc3RRdW90ZUNhbkJlTGl0 ZXJhbCA9IGZhbHNlOwpAQCAtMjQ2LDUxICsyMjYsMzYgQEAgc3RhdGljIFZlY3RvcjxEYXRlRm9y bWF0VG9rZW4+IHBhcnNlRGF0ZUZvcm1hdChjb25zdCBTdHJpbmcgZm9ybWF0KQogICAgICAgICAg ICAgICAgIGxhc3RRdW90ZUNhbkJlTGl0ZXJhbCA9IGZhbHNlOwogICAgICAgICAgICAgfSBlbHNl CiAgICAgICAgICAgICAgICAgbGFzdFF1b3RlQ2FuQmVMaXRlcmFsID0gdHJ1ZTsKLSAgICAgICAg fSBlbHNlIGlmIChpc1llYXJTeW1ib2woY2gpKSB7Ci0gICAgICAgICAgICBjb21taXRMaXRlcmFs VG9rZW4obGl0ZXJhbEJ1ZmZlciwgdG9rZW5zKTsKLSAgICAgICAgICAgIHVuc2lnbmVkIGNvdW50 ID0gY291bnRDb250aW51b3VzTGV0dGVycyhmb3JtYXQsIGkpOwotICAgICAgICAgICAgaSArPSBj b3VudCAtIDE7Ci0gICAgICAgICAgICBpZiAoY291bnQgPT0gMSkKLSAgICAgICAgICAgICAgICB0 b2tlbnMuYXBwZW5kKERhdGVGb3JtYXRUb2tlbihEYXRlRm9ybWF0VG9rZW46OlllYXIxKSk7Ci0g ICAgICAgICAgICBlbHNlIGlmIChjb3VudCA9PSAyKQotICAgICAgICAgICAgICAgIHRva2Vucy5h cHBlbmQoRGF0ZUZvcm1hdFRva2VuKERhdGVGb3JtYXRUb2tlbjo6WWVhcjIpKTsKLSAgICAgICAg ICAgIGVsc2UKLSAgICAgICAgICAgICAgICB0b2tlbnMuYXBwZW5kKERhdGVGb3JtYXRUb2tlbihE YXRlRm9ybWF0VG9rZW46OlllYXI0KSk7Ci0gICAgICAgIH0gZWxzZSBpZiAoaXNNb250aFN5bWJv bChjaCkpIHsKLSAgICAgICAgICAgIGNvbW1pdExpdGVyYWxUb2tlbihsaXRlcmFsQnVmZmVyLCB0 b2tlbnMpOwotICAgICAgICAgICAgdW5zaWduZWQgY291bnQgPSBjb3VudENvbnRpbnVvdXNMZXR0 ZXJzKGZvcm1hdCwgaSk7Ci0gICAgICAgICAgICBpICs9IGNvdW50IC0gMTsKLSAgICAgICAgICAg IGlmIChjb3VudCA9PSAxKQotICAgICAgICAgICAgICAgIHRva2Vucy5hcHBlbmQoRGF0ZUZvcm1h dFRva2VuKERhdGVGb3JtYXRUb2tlbjo6TW9udGgxKSk7Ci0gICAgICAgICAgICBlbHNlIGlmIChj b3VudCA9PSAyKQotICAgICAgICAgICAgICAgIHRva2Vucy5hcHBlbmQoRGF0ZUZvcm1hdFRva2Vu KERhdGVGb3JtYXRUb2tlbjo6TW9udGgyKSk7Ci0gICAgICAgICAgICBlbHNlIGlmIChjb3VudCA9 PSAzKQotICAgICAgICAgICAgICAgIHRva2Vucy5hcHBlbmQoRGF0ZUZvcm1hdFRva2VuKERhdGVG b3JtYXRUb2tlbjo6TW9udGgzKSk7Ci0gICAgICAgICAgICBlbHNlCi0gICAgICAgICAgICAgICAg dG9rZW5zLmFwcGVuZChEYXRlRm9ybWF0VG9rZW4oRGF0ZUZvcm1hdFRva2VuOjpNb250aDQpKTsK LSAgICAgICAgfSBlbHNlIGlmIChpc0RheVN5bWJvbChjaCkpIHsKLSAgICAgICAgICAgIGNvbW1p dExpdGVyYWxUb2tlbihsaXRlcmFsQnVmZmVyLCB0b2tlbnMpOworICAgICAgICB9IGVsc2UgaWYg KGlzQVNDSUlBbHBoYShjaCkpIHsKKyAgICAgICAgICAgIGNvbW1pdExpdGVyYWxUb2tlbihsaXRl cmFsQnVmZmVyLCBjb252ZXJ0ZWQpOworICAgICAgICAgICAgdW5zaWduZWQgc3ltYm9sU3RhcnQg PSBpOwogICAgICAgICAgICAgdW5zaWduZWQgY291bnQgPSBjb3VudENvbnRpbnVvdXNMZXR0ZXJz KGZvcm1hdCwgaSk7CiAgICAgICAgICAgICBpICs9IGNvdW50IC0gMTsKLSAgICAgICAgICAgIGlm IChjb3VudCA9PSAxKQotICAgICAgICAgICAgICAgIHRva2Vucy5hcHBlbmQoRGF0ZUZvcm1hdFRv a2VuKERhdGVGb3JtYXRUb2tlbjo6RGF5MSkpOworICAgICAgICAgICAgaWYgKGNoID09ICdoJyB8 fCBjaCA9PSAnSCcgfHwgY2ggPT0gJ20nIHx8IGNoID09ICdzJyB8fCBjaCA9PSAnTScgfHwgY2gg PT0gJ3knKQorICAgICAgICAgICAgICAgIGNvbnZlcnRlZC5hcHBlbmQoZm9ybWF0LCBzeW1ib2xT dGFydCwgY291bnQpOworICAgICAgICAgICAgZWxzZSBpZiAoY2ggPT0gJ2QnKSB7CisgICAgICAg ICAgICAgICAgaWYgKGNvdW50IDw9IDIpCisgICAgICAgICAgICAgICAgICAgIGNvbnZlcnRlZC5h cHBlbmQoZm9ybWF0LCBzeW1ib2xTdGFydCwgY291bnQpOworICAgICAgICAgICAgICAgIGVsc2Ug aWYgKGNvdW50ID09IDMpCisgICAgICAgICAgICAgICAgICAgIGNvbnZlcnRlZC5hcHBlbmQoIkVF RSIpOworICAgICAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgICAgICAgICAgY29udmVydGVk LmFwcGVuZCgiRUVFRSIpOworICAgICAgICAgICAgfSBlbHNlIGlmIChjaCA9PSAnZycpIHsKKyAg ICAgICAgICAgICAgICBpZiAoY291bnQgPT0gMSkKKyAgICAgICAgICAgICAgICAgICAgY29udmVy dGVkLmFwcGVuZCgnRycpOworICAgICAgICAgICAgICAgIGVsc2UgeworICAgICAgICAgICAgICAg ICAgICAvLyBnZyBtZWFucyBpbXBlcmlhbCBlcmEgaW4gV2luZG93cy4KKyAgICAgICAgICAgICAg ICAgICAgLy8gSnVzdCBpZ25vcmUgaXQuCisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAg fSBlbHNlIGlmIChjaCA9PSAndCcpCisgICAgICAgICAgICAgICAgY29udmVydGVkLmFwcGVuZCgn YScpOwogICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAgICAgIHRva2Vucy5hcHBlbmQoRGF0 ZUZvcm1hdFRva2VuKERhdGVGb3JtYXRUb2tlbjo6RGF5MikpOwotICAgICAgICB9IGVsc2UgaWYg KGlzRXJhU3ltYm9sKGNoKSkgewotICAgICAgICAgICAgLy8gSnVzdCBpZ25vcmUgZXJhLgotICAg ICAgICAgICAgLy8gSFRNTDUgZGF0ZSBzdXBwb3J0cyBvbmx5IEEuRC4KKyAgICAgICAgICAgICAg ICBsaXRlcmFsQnVmZmVyLmFwcGVuZChmb3JtYXQsIHN5bWJvbFN0YXJ0LCBjb3VudCk7CiAgICAg ICAgIH0gZWxzZQogICAgICAgICAgICAgbGl0ZXJhbEJ1ZmZlci5hcHBlbmQoY2gpOwogICAgIH0K LSAgICBjb21taXRMaXRlcmFsVG9rZW4obGl0ZXJhbEJ1ZmZlciwgdG9rZW5zKTsKLSAgICByZXR1 cm4gdG9rZW5zOwotfQotCi12b2lkIExvY2FsZVdpbjo6ZW5zdXJlU2hvcnREYXRlVG9rZW5zKCkK LXsKLSAgICBpZiAoIW1fc2hvcnREYXRlVG9rZW5zLmlzRW1wdHkoKSkKLSAgICAgICAgcmV0dXJu OwotICAgIG1fc2hvcnREYXRlVG9rZW5zID0gcGFyc2VEYXRlRm9ybWF0KGdldExvY2FsZUluZm9T dHJpbmcoTE9DQUxFX1NTSE9SVERBVEUpKTsKKyAgICBjb21taXRMaXRlcmFsVG9rZW4obGl0ZXJh bEJ1ZmZlciwgY29udmVydGVkKTsKKyAgICByZXR1cm4gY29udmVydGVkLnRvU3RyaW5nKCk7CiB9 CiAKIHZvaWQgTG9jYWxlV2luOjplbnN1cmVNb250aExhYmVscygpCkBAIC0zODAsMTI4ICszNDUs MjkgQEAgYm9vbCBMb2NhbGVXaW46OmlzUlRMKCkKICNlbmRpZgogCiAjaWYgRU5BQkxFKERBVEVf QU5EX1RJTUVfSU5QVVRfVFlQRVMpCi1zdGF0aWMgU3RyaW5nIGNvbnZlcnRXaW5kb3dzRGF0ZUZv cm1hdFRvTERNTChjb25zdCBWZWN0b3I8RGF0ZUZvcm1hdFRva2VuPiYgdG9rZW5zKQotewotICAg IFN0cmluZ0J1aWxkZXIgYnVmZmVyOwotICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCB0b2tl bnMuc2l6ZSgpOyArK2kpIHsKLSAgICAgICAgc3dpdGNoICh0b2tlbnNbaV0udHlwZSkgewotICAg ICAgICBjYXNlIERhdGVGb3JtYXRUb2tlbjo6TGl0ZXJhbDoKLSAgICAgICAgICAgIERhdGVUaW1l Rm9ybWF0OjpxdW90ZUFuZEFwcGVuZExpdGVyYWwodG9rZW5zW2ldLmRhdGEsIGJ1ZmZlcik7Ci0g ICAgICAgICAgICBicmVhazsKLQotICAgICAgICBjYXNlIERhdGVGb3JtYXRUb2tlbjo6RGF5MjoK LSAgICAgICAgICAgIGJ1ZmZlci5hcHBlbmQoc3RhdGljX2Nhc3Q8Y2hhcj4oRGF0ZVRpbWVGb3Jt YXQ6OkZpZWxkVHlwZURheU9mTW9udGgpKTsKLSAgICAgICAgICAgIC8vIEZhbGx0aHJvdWdoLgot ICAgICAgICBjYXNlIERhdGVGb3JtYXRUb2tlbjo6RGF5MToKLSAgICAgICAgICAgIGJ1ZmZlci5h cHBlbmQoc3RhdGljX2Nhc3Q8Y2hhcj4oRGF0ZVRpbWVGb3JtYXQ6OkZpZWxkVHlwZURheU9mTW9u dGgpKTsKLSAgICAgICAgICAgIGJyZWFrOwotCi0gICAgICAgIGNhc2UgRGF0ZUZvcm1hdFRva2Vu OjpNb250aDQ6Ci0gICAgICAgICAgICBidWZmZXIuYXBwZW5kKHN0YXRpY19jYXN0PGNoYXI+KERh dGVUaW1lRm9ybWF0OjpGaWVsZFR5cGVNb250aCkpOwotICAgICAgICAgICAgLy8gRmFsbHRocm91 Z2guCi0gICAgICAgIGNhc2UgRGF0ZUZvcm1hdFRva2VuOjpNb250aDM6Ci0gICAgICAgICAgICBi dWZmZXIuYXBwZW5kKHN0YXRpY19jYXN0PGNoYXI+KERhdGVUaW1lRm9ybWF0OjpGaWVsZFR5cGVN b250aCkpOwotICAgICAgICAgICAgLy8gRmFsbHRocm91Z2guCi0gICAgICAgIGNhc2UgRGF0ZUZv cm1hdFRva2VuOjpNb250aDI6Ci0gICAgICAgICAgICBidWZmZXIuYXBwZW5kKHN0YXRpY19jYXN0 PGNoYXI+KERhdGVUaW1lRm9ybWF0OjpGaWVsZFR5cGVNb250aCkpOwotICAgICAgICAgICAgLy8g RmFsbHRocm91Z2guCi0gICAgICAgIGNhc2UgRGF0ZUZvcm1hdFRva2VuOjpNb250aDE6Ci0gICAg ICAgICAgICBidWZmZXIuYXBwZW5kKHN0YXRpY19jYXN0PGNoYXI+KERhdGVUaW1lRm9ybWF0OjpG aWVsZFR5cGVNb250aCkpOwotICAgICAgICAgICAgYnJlYWs7Ci0KLSAgICAgICAgY2FzZSBEYXRl Rm9ybWF0VG9rZW46OlllYXI0OgotICAgICAgICAgICAgYnVmZmVyLmFwcGVuZChzdGF0aWNfY2Fz dDxjaGFyPihEYXRlVGltZUZvcm1hdDo6RmllbGRUeXBlWWVhcikpOwotICAgICAgICAgICAgYnVm ZmVyLmFwcGVuZChzdGF0aWNfY2FzdDxjaGFyPihEYXRlVGltZUZvcm1hdDo6RmllbGRUeXBlWWVh cikpOwotICAgICAgICAgICAgLy8gRmFsbHRocm91Z2guCi0gICAgICAgIGNhc2UgRGF0ZUZvcm1h dFRva2VuOjpZZWFyMjoKLSAgICAgICAgICAgIGJ1ZmZlci5hcHBlbmQoc3RhdGljX2Nhc3Q8Y2hh cj4oRGF0ZVRpbWVGb3JtYXQ6OkZpZWxkVHlwZVllYXIpKTsKLSAgICAgICAgICAgIC8vIEZhbGx0 aHJvdWdoLgotICAgICAgICBjYXNlIERhdGVGb3JtYXRUb2tlbjo6WWVhcjE6Ci0gICAgICAgICAg ICBidWZmZXIuYXBwZW5kKHN0YXRpY19jYXN0PGNoYXI+KERhdGVUaW1lRm9ybWF0OjpGaWVsZFR5 cGVZZWFyKSk7Ci0gICAgICAgICAgICBicmVhazsKLSAgICAgICAgfQotICAgIH0KLSAgICByZXR1 cm4gYnVmZmVyLnRvU3RyaW5nKCk7Ci19Ci0KLXN0YXRpYyBEYXRlVGltZUZvcm1hdDo6RmllbGRU eXBlIG1hcENoYXJhY3RlclRvRGF0ZVRpbWVGaWVsZFR5cGUoVUNoYXIgY2gpCi17Ci0gICAgc3dp dGNoIChjaCkgewotICAgIGNhc2UgJ2gnOgotICAgICAgICByZXR1cm4gRGF0ZVRpbWVGb3JtYXQ6 OkZpZWxkVHlwZUhvdXIxMjsKLQotICAgIGNhc2UgJ0gnOgotICAgICAgICByZXR1cm4gRGF0ZVRp bWVGb3JtYXQ6OkZpZWxkVHlwZUhvdXIyMzsKLQotICAgIGNhc2UgJ20nOgotICAgICAgICByZXR1 cm4gRGF0ZVRpbWVGb3JtYXQ6OkZpZWxkVHlwZU1pbnV0ZTsKLQotICAgIGNhc2UgJ3MnOgotICAg ICAgICByZXR1cm4gRGF0ZVRpbWVGb3JtYXQ6OkZpZWxkVHlwZVNlY29uZDsKLQotICAgIGNhc2Ug J3QnOgotICAgICAgICByZXR1cm4gRGF0ZVRpbWVGb3JtYXQ6OkZpZWxkVHlwZVBlcmlvZDsKLQot ICAgIGRlZmF1bHQ6Ci0gICAgICAgIHJldHVybiBEYXRlVGltZUZvcm1hdDo6RmllbGRUeXBlTGl0 ZXJhbDsKLSAgICB9Ci19Ci0KLS8vIFRoaXMgY2xhc3MgdXNlZCBmb3IgY29udmVydGluZyBXaW5k b3dzIHRpbWUgcGF0dGVybiBmb3JtYXRbMV0gaW50byBMRE1MWzJdCi0vLyB0aW1lIGZvcm1hdCBz dHJpbmcuCi0vLyBbMV0gaHR0cDovL21zZG4ubWljcm9zb2Z0LmNvbS9lbi11cy9saWJyYXJ5L3dp bmRvd3MvZGVza3RvcC9kZDMxODE0OCh2PXZzLjg1KS5hc3B4Ci0vLyBbMl0gTERNTCBodHRwOi8v dW5pY29kZS5vcmcvcmVwb3J0cy90cjM1L3RyMzUtNi5odG1sI0RhdGVfRm9ybWF0X1BhdHRlcm5z Ci1zdGF0aWMgU3RyaW5nIGNvbnZlcnRXaW5kb3dzVGltZUZvcm1hdFRvTERNTChjb25zdCBTdHJp bmcmIHdpbmRvd3NUaW1lRm9ybWF0KQotewotICAgIFN0cmluZ0J1aWxkZXIgYnVpbGRlcjsKLSAg ICBpbnQgY291bnRlciA9IDA7Ci0gICAgRGF0ZVRpbWVGb3JtYXQ6OkZpZWxkVHlwZSBsYXN0Rmll bGRUeXBlID0gRGF0ZVRpbWVGb3JtYXQ6OkZpZWxkVHlwZUxpdGVyYWw7Ci0gICAgZm9yICh1bnNp Z25lZCBpbmRleCA9IDA7IGluZGV4IDwgd2luZG93c1RpbWVGb3JtYXQubGVuZ3RoKCk7ICsraW5k ZXgpIHsKLSAgICAgICAgVUNoYXIgY29uc3QgY2ggPSB3aW5kb3dzVGltZUZvcm1hdFtpbmRleF07 Ci0gICAgICAgIERhdGVUaW1lRm9ybWF0OjpGaWVsZFR5cGUgZmllbGRUeXBlID0gbWFwQ2hhcmFj dGVyVG9EYXRlVGltZUZpZWxkVHlwZShjaCk7Ci0gICAgICAgIGlmIChmaWVsZFR5cGUgPT0gRGF0 ZVRpbWVGb3JtYXQ6OkZpZWxkVHlwZUxpdGVyYWwpCi0gICAgICAgICAgICBidWlsZGVyLmFwcGVu ZChjaCk7Ci0gICAgICAgIGVsc2UgaWYgKGZpZWxkVHlwZSA9PSBsYXN0RmllbGRUeXBlKSB7Ci0g ICAgICAgICAgICArK2NvdW50ZXI7Ci0gICAgICAgICAgICBpZiAoY291bnRlciA9PSAyICYmIGxh c3RGaWVsZFR5cGUgIT0gRGF0ZVRpbWVGb3JtYXQ6OkZpZWxkVHlwZVBlcmlvZCkKLSAgICAgICAg ICAgICAgICBidWlsZGVyLmFwcGVuZChzdGF0aWNfY2FzdDxVQ2hhcj4obGFzdEZpZWxkVHlwZSkp OwotICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgaWYgKGxhc3RGaWVsZFR5cGUgIT0gRGF0 ZVRpbWVGb3JtYXQ6OkZpZWxkVHlwZUxpdGVyYWwpCi0gICAgICAgICAgICAgICAgYnVpbGRlci5h cHBlbmQoc3RhdGljX2Nhc3Q8VUNoYXI+KGxhc3RGaWVsZFR5cGUpKTsKLSAgICAgICAgICAgIGJ1 aWxkZXIuYXBwZW5kKHN0YXRpY19jYXN0PFVDaGFyPihmaWVsZFR5cGUpKTsKLSAgICAgICAgICAg IGNvdW50ZXIgPSAxOwotICAgICAgICB9Ci0gICAgICAgIGxhc3RGaWVsZFR5cGUgPSBmaWVsZFR5 cGU7Ci0gICAgfQotICAgIHJldHVybiBidWlsZGVyLnRvU3RyaW5nKCk7Ci19Ci0KIFN0cmluZyBM b2NhbGVXaW46OmRhdGVGb3JtYXQoKQogewotICAgIGlmICghbV9kYXRlRm9ybWF0LmlzTnVsbCgp KQotICAgICAgICByZXR1cm4gbV9kYXRlRm9ybWF0OwotICAgIGVuc3VyZVNob3J0RGF0ZVRva2Vu cygpOwotICAgIG1fZGF0ZUZvcm1hdCA9IGNvbnZlcnRXaW5kb3dzRGF0ZUZvcm1hdFRvTERNTCht X3Nob3J0RGF0ZVRva2Vucyk7CisgICAgaWYgKG1fZGF0ZUZvcm1hdC5pc051bGwoKSkKKyAgICAg ICAgbV9kYXRlRm9ybWF0ID0gY29udmVydFdpbmRvd3NEYXRlVGltZUZvcm1hdChnZXRMb2NhbGVJ bmZvU3RyaW5nKExPQ0FMRV9TU0hPUlREQVRFKSk7CiAgICAgcmV0dXJuIG1fZGF0ZUZvcm1hdDsK IH0KIAogU3RyaW5nIExvY2FsZVdpbjo6ZGF0ZUZvcm1hdChjb25zdCBTdHJpbmcmIHdpbmRvd3NG b3JtYXQpCiB7Ci0gICAgcmV0dXJuIGNvbnZlcnRXaW5kb3dzRGF0ZUZvcm1hdFRvTERNTChwYXJz ZURhdGVGb3JtYXQod2luZG93c0Zvcm1hdCkpOworICAgIHJldHVybiBjb252ZXJ0V2luZG93c0Rh dGVUaW1lRm9ybWF0KHdpbmRvd3NGb3JtYXQpOwogfQogCiBTdHJpbmcgTG9jYWxlV2luOjptb250 aEZvcm1hdCgpCiB7Ci0gICAgaWYgKCFtX21vbnRoRm9ybWF0LmlzTnVsbCgpKQotICAgICAgICBy ZXR1cm4gbV9tb250aEZvcm1hdDsKLSAgICBtX21vbnRoRm9ybWF0ID0gY29udmVydFdpbmRvd3NE YXRlRm9ybWF0VG9MRE1MKHBhcnNlRGF0ZUZvcm1hdChnZXRMb2NhbGVJbmZvU3RyaW5nKExPQ0FM RV9TWUVBUk1PTlRIKSkpOworICAgIGlmIChtX21vbnRoRm9ybWF0LmlzTnVsbCgpKQorICAgICAg ICBtX21vbnRoRm9ybWF0ID0gY29udmVydFdpbmRvd3NEYXRlVGltZUZvcm1hdChnZXRMb2NhbGVJ bmZvU3RyaW5nKExPQ0FMRV9TWUVBUk1PTlRIKSk7CiAgICAgcmV0dXJuIG1fbW9udGhGb3JtYXQ7 CiB9CiAKIFN0cmluZyBMb2NhbGVXaW46OnRpbWVGb3JtYXQoKQogewogICAgIGlmIChtX3RpbWVG b3JtYXRXaXRoU2Vjb25kcy5pc051bGwoKSkKLSAgICAgICAgbV90aW1lRm9ybWF0V2l0aFNlY29u ZHMgPSBjb252ZXJ0V2luZG93c1RpbWVGb3JtYXRUb0xETUwoZ2V0TG9jYWxlSW5mb1N0cmluZyhM T0NBTEVfU1RJTUVGT1JNQVQpKTsKKyAgICAgICAgbV90aW1lRm9ybWF0V2l0aFNlY29uZHMgPSBj b252ZXJ0V2luZG93c0RhdGVUaW1lRm9ybWF0KGdldExvY2FsZUluZm9TdHJpbmcoTE9DQUxFX1NU SU1FRk9STUFUKSk7CiAgICAgcmV0dXJuIG1fdGltZUZvcm1hdFdpdGhTZWNvbmRzOwogfQogCkBA IC01MjAsNyArMzg2LDcgQEAgU3RyaW5nIExvY2FsZVdpbjo6c2hvcnRUaW1lRm9ybWF0KCkKICAg ICAgICAgaWYgKHBvcyAhPSBub3RGb3VuZCkKICAgICAgICAgICAgIGZvcm1hdC5yZW1vdmUocG9z LCBidWlsZGVyLmxlbmd0aCgpKTsKICAgICB9Ci0gICAgbV90aW1lRm9ybWF0V2l0aG91dFNlY29u ZHMgPSBjb252ZXJ0V2luZG93c1RpbWVGb3JtYXRUb0xETUwoZm9ybWF0KTsKKyAgICBtX3RpbWVG b3JtYXRXaXRob3V0U2Vjb25kcyA9IGNvbnZlcnRXaW5kb3dzRGF0ZVRpbWVGb3JtYXQoZm9ybWF0 KTsKICAgICByZXR1cm4gbV90aW1lRm9ybWF0V2l0aG91dFNlY29uZHM7CiB9CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvd2luL0xvY2FsZVdpbi5oIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vdGV4dC93aW4vTG9jYWxlV2luLmgKaW5kZXggMDgxMTJmZjAzYzJi OWRhMDFiYWRmMjJkOWUzNGZmYTY4MDcwYmQ5NS4uY2U2NGQyMzI3N2Y5YWUzMDhkNDhhN2RhYzM4 NWZmNjE1Mjk3ZTYxOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vdGV4dC93 aW4vTG9jYWxlV2luLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vdGV4dC93aW4vTG9j YWxlV2luLmgKQEAgLTcxLDcgKzcxLDYgQEAgcHJpdmF0ZToKICAgICB2b2lkIGdldExvY2FsZUlu Zm8oTENUWVBFLCBEV09SRCYpOwogICAgIHZvaWQgZW5zdXJlU2hvcnRNb250aExhYmVscygpOwog ICAgIHZvaWQgZW5zdXJlTW9udGhMYWJlbHMoKTsKLSAgICB2b2lkIGVuc3VyZVNob3J0RGF0ZVRv a2VucygpOwogI2lmIEVOQUJMRShDQUxFTkRBUl9QSUNLRVIpCiAgICAgdm9pZCBlbnN1cmVXZWVr RGF5U2hvcnRMYWJlbHMoKTsKICNlbmRpZgpAQCAtNzksNyArNzgsNiBAQCBwcml2YXRlOgogICAg IHZpcnR1YWwgdm9pZCBpbml0aWFsaXplTG9jYWxlRGF0YSgpIE9WRVJSSURFOwogCiAgICAgTENJ RCBtX2xjaWQ7Ci0gICAgVmVjdG9yPERhdGVGb3JtYXRUb2tlbj4gbV9zaG9ydERhdGVUb2tlbnM7 CiAjaWYgRU5BQkxFKERBVEVfQU5EX1RJTUVfSU5QVVRfVFlQRVMpCiAgICAgVmVjdG9yPFN0cmlu Zz4gbV9zaG9ydE1vbnRoTGFiZWxzOwogICAgIFZlY3RvcjxTdHJpbmc+IG1fbW9udGhMYWJlbHM7 Cg==