99704 2012-10-18 03:35:08 -0700 Add Localizer::monthFormat and implementations 2012-10-18 18:15:11 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 97299 99787 1 tkent tkent haraken morrita oldest_to_newest 745135 0 tkent 2012-10-18 03:35:08 -0700 Localizer::monthFormat will be used for input[type=month]. 745146 1 169388 tkent 2012-10-18 03:59:59 -0700 Created attachment 169388 Patch 745224 2 169388 haraken 2012-10-18 06:43:09 -0700 Comment on attachment 169388 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=169388&action=review > Source/WebCore/platform/text/LocaleWin.cpp:720 > + m_monthFormat = convertWindowsDateFormatToLDML(parseDateFormat(getLocaleInfoString(LOCALE_SYEARMONTH))); (I don't know the details but) don't you need to use m_locale instead of LOCALE_SYEARMONTH? > Source/WebKit/chromium/tests/LocaleMacTest.cpp:247 > + EXPECT_STREQ("MMM yyyy", monthFormat("en_US").utf8().data()); Nit: Shall we add a test case for French, just like other tests? 745242 3 169388 tkent 2012-10-18 07:29:17 -0700 Comment on attachment 169388 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=169388&action=review >> Source/WebCore/platform/text/LocaleWin.cpp:720 >> + m_monthFormat = convertWindowsDateFormatToLDML(parseDateFormat(getLocaleInfoString(LOCALE_SYEARMONTH))); > > (I don't know the details but) don't you need to use m_locale instead of LOCALE_SYEARMONTH? getLocaleInfoString() refers to m_lcid. >> Source/WebKit/chromium/tests/LocaleMacTest.cpp:247 >> + EXPECT_STREQ("MMM yyyy", monthFormat("en_US").utf8().data()); > > Nit: Shall we add a test case for French, just like other tests? will do. 745243 4 tkent 2012-10-18 07:32:22 -0700 Committed r131749: <http://trac.webkit.org/changeset/131749> 169388 2012-10-18 03:59:59 -0700 2012-10-18 07:29:17 -0700 Patch bug-99704-20121018195824.patch text/plain 13920 tkent U3VidmVyc2lvbiBSZXZpc2lvbjogMTMxNzAzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGZlNjVjNWRlMDI0ODE0 YTkyYjM5M2U1M2NmMjIzMTBlNTA3YmYxNi4uMWRlMmYzNTM2MmJiNGRlMjQ2YTNhOWI1ZTgwNWY3 YjViMzliYTM4NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ0IEBACisyMDEyLTEwLTE4ICBLZW50 IFRhbXVyYSAgPHRrZW50QGNocm9taXVtLm9yZz4KKworICAgICAgICBBZGQgTG9jYWxpemVyOjpt b250aEZvcm1hdCBhbmQgaW1wbGVtZW50YXRpb25zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD05OTcwNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIExvY2FsaXplcjo6bW9udGhGb3JtYXQgd2lsbCBiZSB1c2Vk IGZvciBjb25zdHJ1Y3RpbmcgaW5wdXRbdHlwZT1tb250aF0gVUkuCisKKyAgICAgICAgVGVzdHM6 IEFkZCB1bml0IHRlc3RzIHRvIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvLgorCisgICAg ICAgICogcGxhdGZvcm0vdGV4dC9Mb2NhbGl6ZXIuaDoKKyAgICAgICAgKExvY2FsaXplcik6IERl Y2xhcmUgcHVyZSB2aXJ0dWFsIG1vbnRoRm9ybWF0IGZ1bmN0aW9uLgorCisgICAgICAgICogcGxh dGZvcm0vdGV4dC9Mb2NhbGVOb25lLmNwcDoKKyAgICAgICAgKExvY2FsZU5vbmUpOiBEZWNsYXJl IG1vbnRoRm9ybWF0LgorICAgICAgICAoV2ViQ29yZTo6TG9jYWxlTm9uZTo6bW9udGhGb3JtYXQp OgorICAgICAgICBBZGRlZC4gQWx3YXlzIHJldXRybnMgYW4gSVNPLTg2MDEgZm9ybWF0LCAieXl5 eS1NTSIKKworICAgICAgICAqIHBsYXRmb3JtL3RleHQvTG9jYWxlSUNVLmg6CisgICAgICAgIChM b2NhbGVJQ1UpOiBEZWNsYXJlIG1vbnRoRm9ybWF0LgorICAgICAgICAqIHBsYXRmb3JtL3RleHQv TG9jYWxlSUNVLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmdldEZvcm1hdEZvclNrZWxldG9uKToK KyAgICAgICAgQSBoZWxwZXIgdG8gZ2V0IGEgZm9ybWF0IGZvciB0aGUgc3BlY2lmaWVkIHNrZWxl dG9uLgorICAgICAgICBUaGUgb3ZlcmZsb3ctYWxsb2NhbHRlLXRyeS1hZ2FpbiBwYXR0ZXJuIGlz IHNpbWlsYXIgdG8KKyAgICAgICAgTG9jYWxlSUNVOjpkZWNpbWFsU3ltYm9sIGFuZCBMb2NhbGVJ Q1U6OmRlY2ltYWxUZXh0QXR0cmlidXRlLgorICAgICAgICAoV2ViQ29yZTo6TG9jYWxlSUNVOjpt b250aEZvcm1hdCk6CisgICAgICAgIEFkZGVkLiBDYWxscyBnZXRGb3JtYXRGb3JTa2VsZXRvbiB3 aXRoICJ5eXl5TU1NIi4KKworICAgICAgICAqIHBsYXRmb3JtL3RleHQvbWFjL0xvY2FsZU1hYy5o OgorICAgICAgICAoTG9jYWxlTWFjKTogRGVjbGFyZSBtb250aEZvcm1hdC4KKyAgICAgICAgKiBw bGF0Zm9ybS90ZXh0L21hYy9Mb2NhbGVNYWMubW06CisgICAgICAgIChXZWJDb3JlOjpMb2NhbGVN YWM6Om1vbnRoRm9ybWF0KToKKyAgICAgICAgQWRkZWQuIENhbGxzIE5TRGF0ZUZvcm1hdHRlcjo6 ZGF0ZUZvcm1hdEZyb21UZW1wbGF0ZSB3aXRoICJ5eXl5TU1NIi4KKworICAgICAgICAqIHBsYXRm b3JtL3RleHQvTG9jYWxlV2luLmg6CisgICAgICAgIChMb2NhbGVXaW4pOiBEZWNsYXJlIG1vbnRo Rm9ybWF0LgorICAgICAgICAqIHBsYXRmb3JtL3RleHQvTG9jYWxlV2luLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkxvY2FsZVdpbjo6bW9udGhGb3JtYXQpOgorICAgICAgICBHZXQgYSBmb3JtYXQg YnkgTE9DQUxFX1NZRUFSTU9OVEgsIGFuZCBjb252ZXJ0IGl0IHRvIGFuIExETUwgZm9ybWF0Lgor CiAyMDEyLTEwLTE3ICBEYW4gQmVybnN0ZWluICA8bWl0ekBhcHBsZS5jb20+CiAKICAgICAgICAg UkVHUkVTU0lPTiAocjk1MzkxKTogQ29tcGxleFRleHRDb250cm9sbGVyIGlzIHVubmVjZXNzYXJp bHkgc2xvdyB3aXRoIGNoYXJhY3RlcnMgd2l0aCBjb21iaW5pbmcgbWFya3Mgd2hlbiB0aGUgYmFz ZSBjaGFyYWN0ZXIgaXMgbm90IGNvdmVyZWQgYnkgYW55IGZvbnQKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFu Z2VMb2cKaW5kZXggNzJkNDFjZGQ1MjJlYzg2MGEwZGE2NjFmYTkyMGNiZWZjOWE0OTNlYi4uZDM1 NDkwNjQyNDdjZDJkNDM2MWM3N2Y5YTZlNDEzOGIxOTk2YWI2MCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9D aGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAxMi0xMC0xOCAgS2VudCBUYW11cmEgIDx0a2Vu dEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgQWRkIExvY2FsaXplcjo6bW9udGhGb3JtYXQgYW5k IGltcGxlbWVudGF0aW9ucworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9OTk3MDQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIHRlc3RzL0xvY2FsZU1hY1Rlc3QuY3BwOgorICAgICAgICAoTG9jYWxlTWFjVGVz dDo6bW9udGhGb3JtYXQpOiBBIGhlbHBlciBmdW5jdGlvbi4KKyAgICAgICAgKFRFU1RfRik6IEFk ZGVkIHNvbWUgdGVzdHMuCisgICAgICAgICogdGVzdHMvTG9jYWxlV2luVGVzdC5jcHA6CisgICAg ICAgIChMb2NhbGVXaW5UZXN0Ojptb250aEZvcm1hdCk6IEEgaGVscGVyIGZ1bmN0aW9uLgorICAg ICAgICAoVEVTVF9GKTogQWRkZWQgc29tZSB0ZXN0cy4KKyAgICAgICAgKiB0ZXN0cy9Mb2NhbGl6 ZWREYXRlSUNVVGVzdC5jcHA6CisgICAgICAgIChMb2NhbGl6ZWREYXRlSUNVVGVzdDo6bW9udGhG b3JtYXQpOiBBIGhlbHBlciBmdW5jdGlvbi4KKyAgICAgICAgKFRFU1RfRik6IEFkZGVkIHNvbWUg dGVzdHMuCisKIDIwMTItMTAtMTcgIFNoYXNoaSBTaGVraGFyICA8c2hhc2hpc2hla2hhckBnb29n bGUuY29tPgogCiAgICAgICAgIFJlbW92ZSByZWR1bmRhbnQgc2RrX2J1aWxkIHBhcmFtZXRlci4K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvTG9jYWxlSUNVLmNwcCBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvTG9jYWxlSUNVLmNwcAppbmRleCBjZTVmMGFm YzQ2OTcxOGRkMGNmMzRmMzM4NjUwNmNlMWI2YTQ3MTYzLi5mZTFhMGQ3MzQzMzJlMzJlODI3YmU2 NTcxMzBmYmQ3MzRiYmQ5ZmU4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS90 ZXh0L0xvY2FsZUlDVS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vdGV4dC9Mb2Nh bGVJQ1UuY3BwCkBAIC0zMyw2ICszMyw3IEBACiAKICNpbmNsdWRlICJMb2NhbGl6ZWRTdHJpbmdz LmgiCiAjaW5jbHVkZSA8bGltaXRzPgorI2luY2x1ZGUgPHVuaWNvZGUvdWRhdHBnLmg+CiAjaW5j bHVkZSA8dW5pY29kZS91bG9jLmg+CiAjaW5jbHVkZSA8d3RmL0RhdGVNYXRoLmg+CiAjaW5jbHVk ZSA8d3RmL1Bhc3NPd25QdHIuaD4KQEAgLTM5OCw2ICszOTksMzYgQEAgU3RyaW5nIExvY2FsZUlD VTo6ZGF0ZUZvcm1hdCgpCiAgICAgcmV0dXJuIG1fZGF0ZUZvcm1hdDsKIH0KIAorc3RhdGljIFN0 cmluZyBnZXRGb3JtYXRGb3JTa2VsZXRvbihjb25zdCBjaGFyKiBsb2NhbGUsIGNvbnN0IFN0cmlu ZyYgc2tlbGV0b24pCit7CisgICAgU3RyaW5nIGZvcm1hdCA9IEFTQ0lJTGl0ZXJhbCgieXl5eS1N TSIpOworICAgIFVFcnJvckNvZGUgc3RhdHVzID0gVV9aRVJPX0VSUk9SOworICAgIFVEYXRlVGlt ZVBhdHRlcm5HZW5lcmF0b3IqIHBhdHRlcm5HZW5lcmF0b3IgPSB1ZGF0cGdfb3Blbihsb2NhbGUs ICZzdGF0dXMpOworICAgIGlmICghcGF0dGVybkdlbmVyYXRvcikKKyAgICAgICAgcmV0dXJuIGZv cm1hdDsKKyAgICBzdGF0dXMgPSBVX1pFUk9fRVJST1I7CisgICAgaW50MzJfdCBsZW5ndGggPSB1 ZGF0cGdfZ2V0QmVzdFBhdHRlcm4ocGF0dGVybkdlbmVyYXRvciwgc2tlbGV0b24uY2hhcmFjdGVy cygpLCBza2VsZXRvbi5sZW5ndGgoKSwgMCwgMCwgJnN0YXR1cyk7CisgICAgaWYgKHN0YXR1cyA9 PSBVX0JVRkZFUl9PVkVSRkxPV19FUlJPUiAmJiBsZW5ndGgpIHsKKyAgICAgICAgVmVjdG9yPFVD aGFyPiBidWZmZXIobGVuZ3RoKTsKKyAgICAgICAgc3RhdHVzID0gVV9aRVJPX0VSUk9SOworICAg ICAgICB1ZGF0cGdfZ2V0QmVzdFBhdHRlcm4ocGF0dGVybkdlbmVyYXRvciwgc2tlbGV0b24uY2hh cmFjdGVycygpLCBza2VsZXRvbi5sZW5ndGgoKSwgYnVmZmVyLmRhdGEoKSwgbGVuZ3RoLCAmc3Rh dHVzKTsKKyAgICAgICAgaWYgKFVfU1VDQ0VTUyhzdGF0dXMpKQorICAgICAgICAgICAgZm9ybWF0 ID0gU3RyaW5nOjphZG9wdChidWZmZXIpOworICAgIH0KKyAgICB1ZGF0cGdfY2xvc2UocGF0dGVy bkdlbmVyYXRvcik7CisgICAgcmV0dXJuIGZvcm1hdDsKK30KKworU3RyaW5nIExvY2FsZUlDVTo6 bW9udGhGb3JtYXQoKQoreworICAgIGlmICghbV9tb250aEZvcm1hdC5pc051bGwoKSkKKyAgICAg ICAgcmV0dXJuIG1fbW9udGhGb3JtYXQ7CisgICAgLy8gR2V0cyBhIGZvcm1hdCBmb3IgIk1NTSIs IG5vdCAiTU0iIGJlY2F1c2UgV2luZG93cyBBUEkgYWx3YXlzIHByb3ZpZGVzCisgICAgLy8gZm9y bWF0cyBmb3IgIk1NTSIuCisgICAgbV9tb250aEZvcm1hdCA9IGdldEZvcm1hdEZvclNrZWxldG9u KG1fbG9jYWxlLmRhdGEoKSwgQVNDSUlMaXRlcmFsKCJ5eXl5TU1NIikpOworICAgIHJldHVybiBt X21vbnRoRm9ybWF0OworfQorCiBTdHJpbmcgTG9jYWxlSUNVOjp0aW1lRm9ybWF0KCkKIHsKICAg ICBpbml0aWFsaXplRGF0ZVRpbWVGb3JtYXQoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL3RleHQvTG9jYWxlSUNVLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS90ZXh0 L0xvY2FsZUlDVS5oCmluZGV4IGE0YjgxMjJjYjc5M2I2YTI5NmQwMDRkNDczNGJhZDk5MmY1OWE1 ZGQuLjkyYjMxMGIwYjVkOGY0YWEwZGFkYTBmMmQwNWY5NWY0NTkzNzVmY2QgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvTG9jYWxlSUNVLmgKKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vdGV4dC9Mb2NhbGVJQ1UuaApAQCAtNjIsNiArNjIsNyBAQCBwdWJsaWM6 CiAKICNpZiBFTkFCTEUoSU5QVVRfTVVMVElQTEVfRklFTERTX1VJKQogICAgIHZpcnR1YWwgU3Ry aW5nIGRhdGVGb3JtYXQoKSBPVkVSUklERTsKKyAgICB2aXJ0dWFsIFN0cmluZyBtb250aEZvcm1h dCgpIE9WRVJSSURFOwogICAgIHZpcnR1YWwgU3RyaW5nIHRpbWVGb3JtYXQoKSBPVkVSUklERTsK ICAgICB2aXJ0dWFsIFN0cmluZyBzaG9ydFRpbWVGb3JtYXQoKSBPVkVSUklERTsKICAgICB2aXJ0 dWFsIGNvbnN0IFZlY3RvcjxTdHJpbmc+JiB0aW1lQU1QTUxhYmVscygpIE9WRVJSSURFOwpAQCAt MTA3LDYgKzEwOCw3IEBAIHByaXZhdGU6CiAKICNpZiBFTkFCTEUoSU5QVVRfTVVMVElQTEVfRklF TERTX1VJKQogICAgIFN0cmluZyBtX2RhdGVGb3JtYXQ7CisgICAgU3RyaW5nIG1fbW9udGhGb3Jt YXQ7CiAgICAgVURhdGVGb3JtYXQqIG1fbWVkaXVtVGltZUZvcm1hdDsKICAgICBVRGF0ZUZvcm1h dCogbV9zaG9ydFRpbWVGb3JtYXQ7CiAgICAgVmVjdG9yPFN0cmluZz4gbV90aW1lQU1QTUxhYmVs czsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvTG9jYWxlTm9uZS5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L0xvY2FsZU5vbmUuY3BwCmluZGV4IDBk ZGFmMzAzNmNhOWFkNGNhNWJkZjkyMDhiYjYzZGZmNWRhODIyYjAuLjZiNDQ2NWMxNTFlMzZlZjYz OWZhZGM5NGE0MTJkNDg1ODBjNTBjYzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL3RleHQvTG9jYWxlTm9uZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vdGV4 dC9Mb2NhbGVOb25lLmNwcApAQCAtNDIsNiArNDIsNyBAQCBwcml2YXRlOgogI2VuZGlmCiAjaWYg RU5BQkxFKElOUFVUX01VTFRJUExFX0ZJRUxEU19VSSkKICAgICB2aXJ0dWFsIFN0cmluZyBkYXRl Rm9ybWF0KCkgT1ZFUlJJREU7CisgICAgdmlydHVhbCBTdHJpbmcgbW9udGhGb3JtYXQoKSBPVkVS UklERTsKICNlbmRpZgogfTsKIApAQCAtODAsNiArODEsMTEgQEAgU3RyaW5nIExvY2FsZU5vbmU6 OmRhdGVGb3JtYXQoKQogewogICAgIHJldHVybiBBU0NJSUxpdGVyYWwoImRkL01NL3l5eXl5Iik7 CiB9CisKK1N0cmluZyBMb2NhbGVOb25lOjptb250aEZvcm1hdCgpCit7CisgICAgcmV0dXJuIEFT Q0lJTGl0ZXJhbCgieXl5eS1NTSIpOworfQogI2VuZGlmCiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNv cmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvTG9jYWxlV2luLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvTG9jYWxlV2luLmNwcAppbmRleCAwOTdi MDkzMDIzNzc0ZWU2ODE5MzUzMzg4NjAyNzJmZTI2NmQ2NjQxLi5lZjE2NjgwNzY2ZWQ5MGIwYjg2 ZTAxNjc1ZTg4OTRhZmY2ODY5MjQ3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS90ZXh0L0xvY2FsZVdpbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vdGV4dC9M b2NhbGVXaW4uY3BwCkBAIC03MTMsNiArNzEzLDE0IEBAIFN0cmluZyBMb2NhbGVXaW46OmRhdGVG b3JtYXQoY29uc3QgU3RyaW5nJiB3aW5kb3dzRm9ybWF0KQogICAgIHJldHVybiBjb252ZXJ0V2lu ZG93c0RhdGVGb3JtYXRUb0xETUwocGFyc2VEYXRlRm9ybWF0KHdpbmRvd3NGb3JtYXQpKTsKIH0K IAorU3RyaW5nIExvY2FsZVdpbjo6bW9udGhGb3JtYXQoKQoreworICAgIGlmICghbV9tb250aEZv cm1hdC5pc051bGwoKSkKKyAgICAgICAgcmV0dXJuIG1fbW9udGhGb3JtYXQ7CisgICAgbV9tb250 aEZvcm1hdCA9IGNvbnZlcnRXaW5kb3dzRGF0ZUZvcm1hdFRvTERNTChwYXJzZURhdGVGb3JtYXQo Z2V0TG9jYWxlSW5mb1N0cmluZyhMT0NBTEVfU1lFQVJNT05USCkpKTsKKyAgICByZXR1cm4gbV9t b250aEZvcm1hdDsKK30KKwogU3RyaW5nIExvY2FsZVdpbjo6dGltZUZvcm1hdCgpCiB7CiAgICAg aWYgKG1fbG9jYWxpemVkVGltZUZvcm1hdFRleHQuaXNFbXB0eSgpKQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vdGV4dC9Mb2NhbGVXaW4uaCBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL3RleHQvTG9jYWxlV2luLmgKaW5kZXggMjFhZDdiZjVmZGNhNzFkMjdlNjFjZDBhYzFk MzI1Y2M4NjA1NzYxNS4uNWUwZjEzZmM2MTVhYWEzMWI4YWNkODJiM2ZjZjkyYzM0MDBkNGMzOSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vdGV4dC9Mb2NhbGVXaW4uaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L0xvY2FsZVdpbi5oCkBAIC01Nyw2ICs1Nyw3 IEBAIHB1YmxpYzoKIAogI2lmIEVOQUJMRShJTlBVVF9NVUxUSVBMRV9GSUVMRFNfVUkpCiAgICAg dmlydHVhbCBTdHJpbmcgZGF0ZUZvcm1hdCgpIE9WRVJSSURFOworICAgIHZpcnR1YWwgU3RyaW5n IG1vbnRoRm9ybWF0KCkgT1ZFUlJJREU7CiAgICAgdmlydHVhbCBTdHJpbmcgdGltZUZvcm1hdCgp IE9WRVJSSURFOwogICAgIHZpcnR1YWwgU3RyaW5nIHNob3J0VGltZUZvcm1hdCgpIE9WRVJSSURF OwogICAgIHZpcnR1YWwgY29uc3QgVmVjdG9yPFN0cmluZz4mIHRpbWVBTVBNTGFiZWxzKCkgT1ZF UlJJREU7CkBAIC05OCw2ICs5OSw3IEBAIHByaXZhdGU6CiAgICAgVmVjdG9yPFN0cmluZz4gbV9t b250aExhYmVsczsKICNpZiBFTkFCTEUoSU5QVVRfTVVMVElQTEVfRklFTERTX1VJKQogICAgIFN0 cmluZyBtX2RhdGVGb3JtYXQ7CisgICAgU3RyaW5nIG1fbW9udGhGb3JtYXQ7CiAjZW5kaWYKICNp ZiBFTkFCTEUoQ0FMRU5EQVJfUElDS0VSKQogICAgIFZlY3RvcjxTdHJpbmc+IG1fd2Vla0RheVNo b3J0TGFiZWxzOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vdGV4dC9Mb2Nh bGl6ZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvTG9jYWxpemVyLmgKaW5kZXgg MmVkMjc3Yzk1NzllM2Q5ZjNhYjc0ODU4MzMzNGM4YjY3NTBlNTJiYy4uOTJiNjQzZTkzYjA3NTZk Yzk3MTdlZGY4NGIxMWE3ODM3YjlhM2FiOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vdGV4dC9Mb2NhbGl6ZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS90ZXh0 L0xvY2FsaXplci5oCkBAIC02Miw2ICs2Miw5IEBAIHB1YmxpYzoKICAgICAvLyBbMV0gTERNTCBo dHRwOi8vdW5pY29kZS5vcmcvcmVwb3J0cy90cjM1LyNEYXRlX0Zvcm1hdF9QYXR0ZXJucwogICAg IHZpcnR1YWwgU3RyaW5nIGRhdGVGb3JtYXQoKSA9IDA7CiAKKyAgICAvLyBSZXR1cm5zIGEgeWVh ci1tb250aCBmb3JtYXQgaW4gVW5pY29kZSBUUjM1IExETUwuCisgICAgdmlydHVhbCBTdHJpbmcg bW9udGhGb3JtYXQoKSA9IDA7CisKICAgICAvLyBSZXR1cm5zIHRpbWUgZm9ybWF0IGluIFVuaWNv ZGUgVFIzNSBMRE1MWzFdIGNvbnRhaW5pbmcgaG91ciwgbWludXRlLCBhbmQKICAgICAvLyBzZWNv bmQgd2l0aCBvcHRpb25hbCBwZXJpb2QoQU0vUE0pLCBlLmcuICJoOm1tOnNzIGEiCiAgICAgLy8g WzFdIExETUwgaHR0cDovL3VuaWNvZGUub3JnL3JlcG9ydHMvdHIzNS8jRGF0ZV9Gb3JtYXRfUGF0 dGVybnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvbWFjL0xvY2Fs ZU1hYy5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vdGV4dC9tYWMvTG9jYWxlTWFjLmgKaW5k ZXggYWMwMjllYTAzNWQ2OGRkNzRmMDFjODQ1ZjA2MTExOGI1NThhOGVjZi4uNDY3ZmZmNGUwZDlj NTk3ZWZjZjdjYTA1MmNjMGFmMDZmN2I1YWRhMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vdGV4dC9tYWMvTG9jYWxlTWFjLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vdGV4dC9tYWMvTG9jYWxlTWFjLmgKQEAgLTYyLDYgKzYyLDcgQEAgcHVibGljOgogCiAjaWYg RU5BQkxFKElOUFVUX01VTFRJUExFX0ZJRUxEU19VSSkKICAgICB2aXJ0dWFsIFN0cmluZyBkYXRl Rm9ybWF0KCkgT1ZFUlJJREU7CisgICAgdmlydHVhbCBTdHJpbmcgbW9udGhGb3JtYXQoKSBPVkVS UklERTsKICAgICB2aXJ0dWFsIFN0cmluZyB0aW1lRm9ybWF0KCkgT1ZFUlJJREU7CiAgICAgdmly dHVhbCBTdHJpbmcgc2hvcnRUaW1lRm9ybWF0KCkgT1ZFUlJJREU7CiAgICAgdmlydHVhbCBjb25z dCBWZWN0b3I8U3RyaW5nPiYgdGltZUFNUE1MYWJlbHMoKSBPVkVSUklERTsKQEAgLTg0LDYgKzg1 LDcgQEAgcHJpdmF0ZToKICAgICBSZXRhaW5QdHI8TlNEYXRlRm9ybWF0dGVyPiBzaG9ydFRpbWVG b3JtYXR0ZXIoKTsKIAogICAgIFN0cmluZyBtX2RhdGVGb3JtYXQ7CisgICAgU3RyaW5nIG1fbW9u dGhGb3JtYXQ7CiAgICAgU3RyaW5nIG1fbG9jYWxpemVkVGltZUZvcm1hdFRleHQ7CiAgICAgU3Ry aW5nIG1fbG9jYWxpemVkU2hvcnRUaW1lRm9ybWF0VGV4dDsKICAgICBWZWN0b3I8U3RyaW5nPiBt X3RpbWVBTVBNTGFiZWxzOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vdGV4 dC9tYWMvTG9jYWxlTWFjLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vdGV4dC9tYWMvTG9j YWxlTWFjLm1tCmluZGV4IGEyMDI1NGUxMjk1MDAyMjE4MDkyODRkZTEzMzVlZDgzZTVjMzkxNTEu LjVkY2ExN2E1NTE2ZDNhYjY2NDM3OGUyNjgxNzczYjI4NDEwYWNhY2IgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvbWFjL0xvY2FsZU1hYy5tbQorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS90ZXh0L21hYy9Mb2NhbGVNYWMubW0KQEAgLTI0Niw2ICsyNDYsMTYg QEAgU3RyaW5nIExvY2FsZU1hYzo6ZGF0ZUZvcm1hdCgpCiAgICAgcmV0dXJuIG1fZGF0ZUZvcm1h dDsKIH0KIAorU3RyaW5nIExvY2FsZU1hYzo6bW9udGhGb3JtYXQoKQoreworICAgIGlmICghbV9t b250aEZvcm1hdC5pc051bGwoKSkKKyAgICAgICAgcmV0dXJuIG1fbW9udGhGb3JtYXQ7CisgICAg Ly8gR2V0cyBhIGZvcm1hdCBmb3IgIk1NTSIsIG5vdCAiTU0iIGJlY2F1c2UgV2luZG93cyBBUEkg YWx3YXlzIHByb3ZpZGVzCisgICAgLy8gZm9ybWF0cyBmb3IgIk1NTSIuCisgICAgbV9tb250aEZv cm1hdCA9IFtOU0RhdGVGb3JtYXR0ZXIgZGF0ZUZvcm1hdEZyb21UZW1wbGF0ZTpAInl5eXlNTU0i IG9wdGlvbnM6MCBsb2NhbGU6bV9sb2NhbGUuZ2V0KCldOworICAgIHJldHVybiBtX21vbnRoRm9y bWF0OworfQorCiBTdHJpbmcgTG9jYWxlTWFjOjp0aW1lRm9ybWF0KCkKIHsKICAgICBpZiAoIW1f bG9jYWxpemVkVGltZUZvcm1hdFRleHQuaXNOdWxsKCkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL3Rlc3RzL0xvY2FsZU1hY1Rlc3QuY3BwIGIvU291cmNlL1dlYktpdC9jaHJv bWl1bS90ZXN0cy9Mb2NhbGVNYWNUZXN0LmNwcAppbmRleCA0NDk3NzYxOTUyODliY2QxNzgzNjJl MDk5OWVmMWQzNGMzNGUxNjAwLi45MGI2ZWY2YTYzMTVhY2RmZjIxYzkzZTZjNDhiNTcyNDc1MmI5 OWI0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0xvY2FsZU1hY1Rl c3QuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvTG9jYWxlTWFjVGVzdC5j cHAKQEAgLTEyMCw2ICsxMjAsMTIgQEAgcHJvdGVjdGVkOgogI2VuZGlmCiAKICNpZiBFTkFCTEUo SU5QVVRfTVVMVElQTEVfRklFTERTX1VJKQorICAgIFN0cmluZyBtb250aEZvcm1hdChjb25zdCBT dHJpbmcmIGxvY2FsZVN0cmluZykKKyAgICB7CisgICAgICAgIE93blB0cjxMb2NhbGVNYWM+IGxv Y2FsZSA9IExvY2FsZU1hYzo6Y3JlYXRlKGxvY2FsZVN0cmluZyk7CisgICAgICAgIHJldHVybiBs b2NhbGUtPm1vbnRoRm9ybWF0KCk7CisgICAgfQorCiAgICAgU3RyaW5nIHRpbWVGb3JtYXQoY29u c3QgU3RyaW5nJiBsb2NhbGVTdHJpbmcpCiAgICAgewogICAgICAgICBPd25QdHI8TG9jYWxlTWFj PiBsb2NhbGUgPSBMb2NhbGVNYWM6OmNyZWF0ZShsb2NhbGVTdHJpbmcpOwpAQCAtMjM2LDYgKzI0 MiwxMiBAQCBURVNUX0YoTG9jYWxlTWFjVGVzdCwgaXNSVEwpCiAjZW5kaWYKIAogI2lmIEVOQUJM RShJTlBVVF9NVUxUSVBMRV9GSUVMRFNfVUkpCitURVNUX0YoTG9jYWxlTWFjVGVzdCwgbW9udGhG b3JtYXQpCit7CisgICAgRVhQRUNUX1NUUkVRKCJNTU0geXl5eSIsIG1vbnRoRm9ybWF0KCJlbl9V UyIpLnV0ZjgoKS5kYXRhKCkpOworICAgIEVYUEVDVF9TVFJFUSgieXl5eVx4RTVceEI5XHhCNE1c eEU2XHg5Q1x4ODgiLCBtb250aEZvcm1hdCgiamFfSlAiKS51dGY4KCkuZGF0YSgpKTsKK30KKwog VEVTVF9GKExvY2FsZU1hY1Rlc3QsIHRpbWVGb3JtYXQpCiB7CiAgICAgRVhQRUNUX1NUUkVRKCJo Om1tOnNzIGEiLCB0aW1lRm9ybWF0KCJlbl9VUyIpLnV0ZjgoKS5kYXRhKCkpOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9Mb2NhbGVXaW5UZXN0LmNwcCBiL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvTG9jYWxlV2luVGVzdC5jcHAKaW5kZXggNzVhZjQxOWRk ZjIyZjljNDEwMGRlYTAwMGNhYTA5YmYxYjljOTQ3NC4uOGU0MGFlNGM4OWE4ZGNkODRlMTkyNWY3 MjdhNmRiYjM3MjFkNDQ3YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0 cy9Mb2NhbGVXaW5UZXN0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0xv Y2FsZVdpblRlc3QuY3BwCkBAIC0xMjksNiArMTI5LDEyIEBAIHByb3RlY3RlZDoKICNlbmRpZgog CiAjaWYgRU5BQkxFKElOUFVUX01VTFRJUExFX0ZJRUxEU19VSSkKKyAgICBTdHJpbmcgbW9udGhG b3JtYXQoTENJRCBsY2lkKQorICAgIHsKKyAgICAgICAgT3duUHRyPExvY2FsZVdpbj4gbG9jYWxl ID0gTG9jYWxlV2luOjpjcmVhdGUobGNpZCk7CisgICAgICAgIHJldHVybiBsb2NhbGUtPm1vbnRo Rm9ybWF0KCk7CisgICAgfQorCiAgICAgU3RyaW5nIHRpbWVGb3JtYXQoTENJRCBsY2lkKQogICAg IHsKICAgICAgICAgT3duUHRyPExvY2FsZVdpbj4gbG9jYWxlID0gTG9jYWxlV2luOjpjcmVhdGUo bGNpZCk7CkBAIC0yODQsNiArMjkwLDEzIEBAIFRFU1RfRihMb2NhbGVXaW5UZXN0LCBkYXRlRm9y bWF0KQogICAgIEVYUEVDVF9TVFJFUSgieXl5eSctJycnJydNTU1NJy0nZGQiLCBMb2NhbGVXaW46 OmRhdGVGb3JtYXQoInl5eXktJycnJ01NTU0tZGQiKS51dGY4KCkuZGF0YSgpKTsKIH0KIAorVEVT VF9GKExvY2FsZVdpblRlc3QsIG1vbnRoRm9ybWF0KQoreworICAgIEVYUEVDVF9TVFJFUSgiTU1N TScsICd5eXl5IiwgbW9udGhGb3JtYXQoRW5nbGlzaFVTKS51dGY4KCkuZGF0YSgpKTsKKyAgICBF WFBFQ1RfU1RSRVEoIk1NTU0nICd5eXl5IiwgbW9udGhGb3JtYXQoRnJlbmNoRlIpLnV0ZjgoKS5k YXRhKCkpOworICAgIEVYUEVDVF9TVFJFUSgieXl5eSdceEU1XHhCOVx4QjQnTSdceEU2XHg5Q1x4 ODgnIiwgbW9udGhGb3JtYXQoSmFwYW5lc2VKUCkudXRmOCgpLmRhdGEoKSk7Cit9CisKIFRFU1Rf RihMb2NhbGVXaW5UZXN0LCB0aW1lRm9ybWF0KQogewogICAgIEVYUEVDVF9TVFJFUSgiaDptbTpz cyBhIiwgdGltZUZvcm1hdChFbmdsaXNoVVMpLnV0ZjgoKS5kYXRhKCkpOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9Mb2NhbGl6ZWREYXRlSUNVVGVzdC5jcHAgYi9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0xvY2FsaXplZERhdGVJQ1VUZXN0LmNwcAppbmRl eCA3NzFhM2NiYzBjZTUxN2UyNjQyNjc1ZWMzNjk1YjJlNDM1YWU2MWNiLi4yYTIwNTA5YzdhZGMy NzkzY2RiMTFlN2FhYWRmOTFjZTM4YmE3NDNkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL3Rlc3RzL0xvY2FsaXplZERhdGVJQ1VUZXN0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 L2Nocm9taXVtL3Rlc3RzL0xvY2FsaXplZERhdGVJQ1VUZXN0LmNwcApAQCAtODgsNiArODgsMTIg QEAgcHJvdGVjdGVkOgogICAgICAgICByZXR1cm4gTGFiZWxzKGxhYmVscyk7CiAgICAgfQogCisg ICAgU3RyaW5nIG1vbnRoRm9ybWF0KGNvbnN0IGNoYXIqIGxvY2FsZVN0cmluZykKKyAgICB7Cisg ICAgICAgIE93blB0cjxMb2NhbGVJQ1U+IGxvY2FsZSA9IExvY2FsZUlDVTo6Y3JlYXRlKGxvY2Fs ZVN0cmluZyk7CisgICAgICAgIHJldHVybiBsb2NhbGUtPm1vbnRoRm9ybWF0KCk7CisgICAgfQor CiAgICAgU3RyaW5nIGxvY2FsaXplZERhdGVGb3JtYXRUZXh0KGNvbnN0IGNoYXIqIGxvY2FsZVN0 cmluZykKICAgICB7CiAgICAgICAgIE93blB0cjxMb2NhbGVJQ1U+IGxvY2FsZSA9IExvY2FsZUlD VTo6Y3JlYXRlKGxvY2FsZVN0cmluZyk7CkBAIC0xMjYsNiArMTMyLDEzIEBAIFRFU1RfRihMb2Nh bGl6ZWREYXRlSUNVVGVzdCwgaXNSVEwpCiAgICAgRVhQRUNUX0ZBTFNFKGlzUlRMKCIqKmludmFs aWQqKiIpKTsKIH0KIAorVEVTVF9GKExvY2FsaXplZERhdGVJQ1VUZXN0LCBtb250aEZvcm1hdCkK K3sKKyAgICBFWFBFQ1RfU1RSRVEoIk1NTSB5eXl5IiwgbW9udGhGb3JtYXQoImVuX1VTIikudXRm OCgpLmRhdGEoKSk7CisgICAgRVhQRUNUX1NUUkVRKCJNTU0geXl5eSIsIG1vbnRoRm9ybWF0KCJm ciIpLnV0ZjgoKS5kYXRhKCkpOworICAgIEVYUEVDVF9TVFJFUSgieXl5eVx4RTVceEI5XHhCNE1c eEU2XHg5Q1x4ODgiLCBtb250aEZvcm1hdCgiamEiKS51dGY4KCkuZGF0YSgpKTsKK30KKwogVEVT VF9GKExvY2FsaXplZERhdGVJQ1VUZXN0LCBsb2NhbGl6ZWREYXRlRm9ybWF0VGV4dCkKIHsKICAg ICAvLyBOb3RlOiBFWFBFQ1RfRVEoU3RyaW5nLCBTdHJpbmcpIGRvZXNuJ3QgcHJpbnQgcmVzdWx0 IGFzIHN0cmluZy4K