93083 2012-08-03 03:09:06 -0700 [Chromium-win] Use the default locale only if the browser locale matches to it 2012-08-05 18:13:00 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 93085 1 tkent tkent morrita oldest_to_newest 686500 0 tkent 2012-08-03 03:09:06 -0700 http://code.google.com/p/chromium/issues/detail?id=139337 For a calendar picker, we have used month names and day-of-week names obtained from the OS default locale. However, the year-month format and [Today] [Clear] labels are decided with the browser locale. So, if the OS default locale is en-US and the browser locale is ja-JP, - Month names and DOW names are English - [Today] [Clear] labels are Japanese, and year-month format is for ja-JP. The calendar picker shows '2012年 August' (OOPS!) 686507 1 156305 tkent 2012-08-03 03:18:49 -0700 Created attachment 156305 Patch 686536 2 156305 morrita 2012-08-03 03:51:21 -0700 Comment on attachment 156305 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=156305&action=review > Source/WebCore/platform/text/LocaleWin.cpp:81 > - static LocaleWin* currentLocale = LocaleWin::create(LOCALE_USER_DEFAULT).leakPtr(); > + static LocaleWin* currentLocale; I'd extract LCID lookup part to a function, then we easily do early return and the code will look simpler. 686541 3 156315 tkent 2012-08-03 04:01:51 -0700 Created attachment 156315 Patch 2 make a function 686547 4 156305 tkent 2012-08-03 04:05:53 -0700 Comment on attachment 156305 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=156305&action=review >> Source/WebCore/platform/text/LocaleWin.cpp:81 >> + static LocaleWin* currentLocale; > > I'd extract LCID lookup part to a function, then we easily do early return and the code will look simpler. Indeed. Updated the patch. 687690 5 tkent 2012-08-05 18:13:00 -0700 Committed r124721: <http://trac.webkit.org/changeset/124721> 156305 2012-08-03 03:18:49 -0700 2012-08-03 04:05:53 -0700 Patch bug-93083-20120803191828.patch text/plain 3327 tkent U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0NTU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWExMDZkMTU4M2M4MzM1 NGM0OGZhMGU4ZmQ1OTI0ZWRiMjE2NmFjZi4uMmYzNmU0OWVjZjhiMTUxMzUzMjk5NjFhN2IzMTI4 ODY3NTdjZDU0ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDEyLTA4LTAzICBLZW50 IFRhbXVyYSAgPHRrZW50QGNocm9taXVtLm9yZz4KKworICAgICAgICBbQ2hyb21pdW0td2luXSBV c2UgdGhlIGRlZmF1bHQgbG9jYWxlIG9ubHkgaWYgdGhlIGJyb3dzZXIgbG9jYWxlIG1hdGNoZXMg dG8gaXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTkz MDgzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRm9y IGEgY2FsZW5kYXIgcGlja2VyLCB3ZSBoYXZlIHVzZWQgbW9udGggbmFtZXMgYW5kIGRheS1vZi13 ZWVrIG5hbWVzCisgICAgICAgIG9idGFpbmVkIGZyb20gdGhlIE9TIGRlZmF1bHQgbG9jYWxlLiBI b3dldmVyLCB0aGUgeWVhci1tb250aCBmb3JtYXQgYW5kCisgICAgICAgIFtUb2RheV0gW0NsZWFy XSBsYWJlbHMgYXJlIGRlY2lkZWQgd2l0aCB0aGUgYnJvd3NlciBsb2NhbGUuIEl0IG1hZGUKKyAg ICAgICAgY2FsZW5kYXIgcGlja2VycyB3aXRoIG1peGVkIGxhbmd1YWdlcy4KKworICAgICAgICBU byBtYWtlIGNhbGVuZGFyIHBpY2tlcnMgd2l0aCBhIHNpbmdsZSBsYW5ndWFnZSwgd2UgdXNlIHRo ZSBPUyBkZWZhdWx0CisgICAgICAgIGxvY2FsZSBvbmx5IGlmIHRoZSBicm93c2VyIGxvY2FsZSBt YXRjaGVzIHRvIGl0LgorICAgICAgICBUaGlzIHBhdGNoIGNoYW5nZXMgdGhlIGJlaGF2aW9yIGZv ciBXaW5kb3dzIFZpc3RhIG9yIGxhdGVyLiBObyBjaGFuZ2UKKyAgICAgICAgZm9yIFdpbmRvd3Mg WFAgYmVjYXVzZSBvZiBBUEkgc3VwcG9ydCBsaW1pdGF0aW9uLgorCisgICAgICAgIE5vIG5ldyB0 ZXN0cy4gIEJlaGF2aW9yIGZvciBsb2NhbGUgc2V0dGluZyBpcyBub3QgdGVzdGFibGUgaW4gV2Vi S2l0LgorCisgICAgICAgICogcGxhdGZvcm0vdGV4dC9Mb2NhbGVXaW4uY3BwOgorICAgICAgICAo V2ViQ29yZTo6TG9jYWxlV2luOjpjdXJyZW50TG9jYWxlKToKKwogMjAxMi0wOC0wMiAgS2VudCBU YW11cmEgIDx0a2VudEBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgRml4IGNyYXNoZXMgZm9yIDxp bnB1dD4gYW5kIDx0ZXh0YXJlYT4gd2l0aCBkaXNwbGF5OnJ1bi1pbi4KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvTG9jYWxlV2luLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL3RleHQvTG9jYWxlV2luLmNwcAppbmRleCAwZjBlNzQwZTAzZjhiYTYzMWY1N2E1 Yzg0NDI1MDI2NjYzZjQ1ODkyLi5iMDNjYjQwZjhmODg2YzNkNzgzN2RkNmQyM2Q1MmMzYzdlMTNi MWZhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L0xvY2FsZVdpbi5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vdGV4dC9Mb2NhbGVXaW4uY3BwCkBAIC0z NSw2ICszNSw3IEBACiAjaWYgRU5BQkxFKElOUFVUX1RZUEVfVElNRV9NVUxUSVBMRV9GSUVMRFMp CiAjaW5jbHVkZSAiRGF0ZVRpbWVGb3JtYXQuaCIKICNlbmRpZgorI2luY2x1ZGUgIkxhbmd1YWdl LmgiCiAjaW5jbHVkZSAiTG9jYWxpemVkU3RyaW5ncy5oIgogI2luY2x1ZGUgPGxpbWl0cz4KICNp bmNsdWRlIDx3aW5kb3dzLmg+CkBAIC03Nyw5ICs3OCwyNSBAQCBQYXNzT3duUHRyPExvY2FsZVdp bj4gTG9jYWxlV2luOjpjcmVhdGUoTENJRCBsY2lkKQogCiBMb2NhbGVXaW4qIExvY2FsZVdpbjo6 Y3VycmVudExvY2FsZSgpCiB7Ci0gICAgLy8gSWRlYWxseSB3ZSBzaG91bGQgbWFrZSBMQ0lEIGZy b20gZGVmYXVsdExhbmd1YWdlKCkuIEJ1dAotICAgIC8vIDo6TG9jYWxlTmFtZVRvTENJRCgpIGlz IGF2YWlsYWJsZSBzaW5jZSBXaW5kb3dzIFZpc3RhLgotICAgIHN0YXRpYyBMb2NhbGVXaW4qIGN1 cnJlbnRMb2NhbGUgPSBMb2NhbGVXaW46OmNyZWF0ZShMT0NBTEVfVVNFUl9ERUZBVUxUKS5sZWFr UHRyKCk7CisgICAgc3RhdGljIExvY2FsZVdpbiogY3VycmVudExvY2FsZTsKKyAgICBpZiAoY3Vy cmVudExvY2FsZSkKKyAgICAgICAgcmV0dXJuIGN1cnJlbnRMb2NhbGU7CisgICAgTENJRCBsY2lk ID0gTE9DQUxFX1VTRVJfREVGQVVMVDsKKyAgICAvLyBMb2NhbGVOYW1lVG9MQ0lEKCkgaXMgYXZh aWxhYmxlIHNpbmNlIFdpbmRvd3MgVmlzdGEuCisgICAgdHlwZWRlZiBMQ0lEIChXSU5BUEkqIExv Y2FsZU5hbWVUb0xDSURQdHIpKExQQ1dTVFIsIERXT1JEKTsKKyAgICBMb2NhbGVOYW1lVG9MQ0lE UHRyIGxvY2FsZU5hbWVUb0xDSUQgPSByZWludGVycHJldF9jYXN0PExvY2FsZU5hbWVUb0xDSURQ dHI+KDo6R2V0UHJvY0FkZHJlc3MoOjpHZXRNb2R1bGVIYW5kbGUoTCJrZXJuZWwzMiIpLCAiTG9j YWxlTmFtZVRvTENJRCIpKTsKKyAgICBpZiAobG9jYWxlTmFtZVRvTENJRCkgeworICAgICAgICBj b25zdCBzaXplX3QgbGFuZ3VhZ2VDb2RlQnVmZmVyU2l6ZSA9IDk7CisgICAgICAgIFdDSEFSIGxv d2VyY2FzZUxhbmd1YWdlQ29kZVtsYW5ndWFnZUNvZGVCdWZmZXJTaXplXTsKKyAgICAgICAgOjpH ZXRMb2NhbGVJbmZvKExPQ0FMRV9VU0VSX0RFRkFVTFQsIExPQ0FMRV9TSVNPNjM5TEFOR05BTUUs IGxvd2VyY2FzZUxhbmd1YWdlQ29kZSwgbGFuZ3VhZ2VDb2RlQnVmZmVyU2l6ZSk7CisgICAgICAg IFN0cmluZyBicm93c2VyTGFuZ3VhZ2UgPSBkZWZhdWx0TGFuZ3VhZ2UoKTsKKyAgICAgICAgc2l6 ZV90IGRhc2hQb3NpdGlvbiA9IGJyb3dzZXJMYW5ndWFnZS5maW5kKCctJyk7CisgICAgICAgIGlm IChkYXNoUG9zaXRpb24gIT0gbm90Rm91bmQpCisgICAgICAgICAgICBicm93c2VyTGFuZ3VhZ2Ug PSBicm93c2VyTGFuZ3VhZ2UubGVmdChkYXNoUG9zaXRpb24pOworICAgICAgICBpZiAoIWVxdWFs SWdub3JpbmdDYXNlKGJyb3dzZXJMYW5ndWFnZSwgU3RyaW5nKGxvd2VyY2FzZUxhbmd1YWdlQ29k ZSkpKQorICAgICAgICAgICAgbGNpZCA9IGxvY2FsZU5hbWVUb0xDSUQoZGVmYXVsdExhbmd1YWdl KCkuY2hhcmFjdGVyc1dpdGhOdWxsVGVybWluYXRpb24oKSwgMCk7CisgICAgfQorICAgIGN1cnJl bnRMb2NhbGUgPSBMb2NhbGVXaW46OmNyZWF0ZShsY2lkKS5sZWFrUHRyKCk7CiAgICAgcmV0dXJu IGN1cnJlbnRMb2NhbGU7CiB9CiAK 156315 2012-08-03 04:01:51 -0700 2012-08-05 18:04:01 -0700 Patch 2 bug-93083-20120803200130.patch text/plain 3755 tkent U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0NTU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWExMDZkMTU4M2M4MzM1 NGM0OGZhMGU4ZmQ1OTI0ZWRiMjE2NmFjZi4uN2IyYzU5MGU4MDI0NzU2MWFiYTNhNmYzMDQyMzE5 YWQwOWEzMjJlNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDEyLTA4LTAzICBLZW50 IFRhbXVyYSAgPHRrZW50QGNocm9taXVtLm9yZz4KKworICAgICAgICBbQ2hyb21pdW0td2luXSBV c2UgdGhlIGRlZmF1bHQgbG9jYWxlIG9ubHkgaWYgdGhlIGJyb3dzZXIgbG9jYWxlIG1hdGNoZXMg dG8gaXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTkz MDgzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRm9y IGEgY2FsZW5kYXIgcGlja2VyLCB3ZSBoYXZlIHVzZWQgbW9udGggbmFtZXMgYW5kIGRheS1vZi13 ZWVrIG5hbWVzCisgICAgICAgIG9idGFpbmVkIGZyb20gdGhlIE9TIGRlZmF1bHQgbG9jYWxlLiBI b3dldmVyLCB0aGUgeWVhci1tb250aCBmb3JtYXQgYW5kCisgICAgICAgIFtUb2RheV0gW0NsZWFy XSBsYWJlbHMgYXJlIGRlY2lkZWQgd2l0aCB0aGUgYnJvd3NlciBsb2NhbGUuIEl0IG1hZGUKKyAg ICAgICAgY2FsZW5kYXIgcGlja2VycyB3aXRoIG1peGVkIGxhbmd1YWdlcy4KKworICAgICAgICBU byBtYWtlIGNhbGVuZGFyIHBpY2tlcnMgd2l0aCBhIHNpbmdsZSBsYW5ndWFnZSwgd2UgdXNlIHRo ZSBPUyBkZWZhdWx0CisgICAgICAgIGxvY2FsZSBvbmx5IGlmIHRoZSBicm93c2VyIGxvY2FsZSBt YXRjaGVzIHRvIGl0LgorICAgICAgICBUaGlzIHBhdGNoIGNoYW5nZXMgdGhlIGJlaGF2aW9yIGZv ciBXaW5kb3dzIFZpc3RhIG9yIGxhdGVyLiBObyBjaGFuZ2UKKyAgICAgICAgZm9yIFdpbmRvd3Mg WFAgYmVjYXVzZSBvZiBBUEkgc3VwcG9ydCBsaW1pdGF0aW9uLgorCisgICAgICAgIE5vIG5ldyB0 ZXN0cy4gIEJlaGF2aW9yIGZvciBsb2NhbGUgc2V0dGluZyBpcyBub3QgdGVzdGFibGUgaW4gV2Vi S2l0LgorCisgICAgICAgICogcGxhdGZvcm0vdGV4dC9Mb2NhbGVXaW4uY3BwOgorICAgICAgICAo ZGV0ZXJtaW5lQ3VycmVudExDSUQpOgorICAgICAgICBBZGRlZC4gSWYgdGhlIHN5c3RlbSBoYXMg bm8gTG9jYWxlTmFtZVRvTENJRCBBUEksIGp1c3QgcmV0dXJucworICAgICAgICBMT0NBTEVfVVNF Ul9ERUZBVUxULiBPdGhlcndpc2UsIGlmIHRoZSBzeXN0ZW0gbG9jYWxlIG1hdGNoZXMgdG8gdGhl CisgICAgICAgIGJyb3dzZXIgbG9jYWxlLCBpdCByZXR1cm5zIExPQ0FMRV9VU0VSX0RFRkFVTFQs IG90aGVyd2lzZSBpdCByZXR1cm5zIHRoZQorICAgICAgICBMQ0lEIGZvciB0aGUgYnJvd3NlciBs b2NhbGUuCisgICAgICAgIChXZWJDb3JlOjpMb2NhbGVXaW46OmN1cnJlbnRMb2NhbGUpOiBVc2Vz IGRldGVybWluZUN1cnJlbnRMQ0lEKCkuCisKIDIwMTItMDgtMDIgIEtlbnQgVGFtdXJhICA8dGtl bnRAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIEZpeCBjcmFzaGVzIGZvciA8aW5wdXQ+IGFuZCA8 dGV4dGFyZWE+IHdpdGggZGlzcGxheTpydW4taW4uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS90ZXh0L0xvY2FsZVdpbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS90 ZXh0L0xvY2FsZVdpbi5jcHAKaW5kZXggMGYwZTc0MGUwM2Y4YmE2MzFmNTdhNWM4NDQyNTAyNjY2 M2Y0NTg5Mi4uOGJkMzcwM2ZlYWFkMWE4YTlhM2FmZjM2ZWIwMjMxOGY4OGI2ZWQ2NiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vdGV4dC9Mb2NhbGVXaW4uY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvTG9jYWxlV2luLmNwcApAQCAtMzUsNiArMzUsNyBA QAogI2lmIEVOQUJMRShJTlBVVF9UWVBFX1RJTUVfTVVMVElQTEVfRklFTERTKQogI2luY2x1ZGUg IkRhdGVUaW1lRm9ybWF0LmgiCiAjZW5kaWYKKyNpbmNsdWRlICJMYW5ndWFnZS5oIgogI2luY2x1 ZGUgIkxvY2FsaXplZFN0cmluZ3MuaCIKICNpbmNsdWRlIDxsaW1pdHM+CiAjaW5jbHVkZSA8d2lu ZG93cy5oPgpAQCAtNzUsMTEgKzc2LDMwIEBAIFBhc3NPd25QdHI8TG9jYWxlV2luPiBMb2NhbGVX aW46OmNyZWF0ZShMQ0lEIGxjaWQpCiAgICAgcmV0dXJuIGFkb3B0UHRyKG5ldyBMb2NhbGVXaW4o bGNpZCkpOwogfQogCitzdGF0aWMgTENJRCBkZXRlcm1pbmVDdXJyZW50TENJRCgpCit7CisgICAg TENJRCBsY2lkID0gTE9DQUxFX1VTRVJfREVGQVVMVDsKKyAgICAvLyBMb2NhbGVOYW1lVG9MQ0lE KCkgaXMgYXZhaWxhYmxlIHNpbmNlIFdpbmRvd3MgVmlzdGEuCisgICAgdHlwZWRlZiBMQ0lEIChX SU5BUEkqIExvY2FsZU5hbWVUb0xDSURQdHIpKExQQ1dTVFIsIERXT1JEKTsKKyAgICBMb2NhbGVO YW1lVG9MQ0lEUHRyIGxvY2FsZU5hbWVUb0xDSUQgPSByZWludGVycHJldF9jYXN0PExvY2FsZU5h bWVUb0xDSURQdHI+KDo6R2V0UHJvY0FkZHJlc3MoOjpHZXRNb2R1bGVIYW5kbGUoTCJrZXJuZWwz MiIpLCAiTG9jYWxlTmFtZVRvTENJRCIpKTsKKyAgICBpZiAoIWxvY2FsZU5hbWVUb0xDSUQpCisg ICAgICAgIHJldHVybiBsY2lkOworICAgIC8vIEFjY29yZGluZyB0byBNU0ROLCA5IGlzIGVub3Vn aCBmb3IgTE9DQUxFX1NJU082MzlMQU5HTkFNRS4KKyAgICBjb25zdCBzaXplX3QgbGFuZ3VhZ2VD b2RlQnVmZmVyU2l6ZSA9IDk7CisgICAgV0NIQVIgbG93ZXJjYXNlTGFuZ3VhZ2VDb2RlW2xhbmd1 YWdlQ29kZUJ1ZmZlclNpemVdOworICAgIDo6R2V0TG9jYWxlSW5mbyhMT0NBTEVfVVNFUl9ERUZB VUxULCBMT0NBTEVfU0lTTzYzOUxBTkdOQU1FLCBsb3dlcmNhc2VMYW5ndWFnZUNvZGUsIGxhbmd1 YWdlQ29kZUJ1ZmZlclNpemUpOworICAgIFN0cmluZyBicm93c2VyTGFuZ3VhZ2UgPSBkZWZhdWx0 TGFuZ3VhZ2UoKTsKKyAgICBzaXplX3QgZGFzaFBvc2l0aW9uID0gYnJvd3Nlckxhbmd1YWdlLmZp bmQoJy0nKTsKKyAgICBpZiAoZGFzaFBvc2l0aW9uICE9IG5vdEZvdW5kKQorICAgICAgICBicm93 c2VyTGFuZ3VhZ2UgPSBicm93c2VyTGFuZ3VhZ2UubGVmdChkYXNoUG9zaXRpb24pOworICAgIGlm ICghZXF1YWxJZ25vcmluZ0Nhc2UoYnJvd3Nlckxhbmd1YWdlLCBTdHJpbmcobG93ZXJjYXNlTGFu Z3VhZ2VDb2RlKSkpCisgICAgICAgIGxjaWQgPSBsb2NhbGVOYW1lVG9MQ0lEKGRlZmF1bHRMYW5n dWFnZSgpLmNoYXJhY3RlcnNXaXRoTnVsbFRlcm1pbmF0aW9uKCksIDApOworICAgIHJldHVybiBs Y2lkOworfQorCiBMb2NhbGVXaW4qIExvY2FsZVdpbjo6Y3VycmVudExvY2FsZSgpCiB7Ci0gICAg Ly8gSWRlYWxseSB3ZSBzaG91bGQgbWFrZSBMQ0lEIGZyb20gZGVmYXVsdExhbmd1YWdlKCkuIEJ1 dAotICAgIC8vIDo6TG9jYWxlTmFtZVRvTENJRCgpIGlzIGF2YWlsYWJsZSBzaW5jZSBXaW5kb3dz IFZpc3RhLgotICAgIHN0YXRpYyBMb2NhbGVXaW4qIGN1cnJlbnRMb2NhbGUgPSBMb2NhbGVXaW46 OmNyZWF0ZShMT0NBTEVfVVNFUl9ERUZBVUxUKS5sZWFrUHRyKCk7CisgICAgc3RhdGljIExvY2Fs ZVdpbiogY3VycmVudExvY2FsZSA9IExvY2FsZVdpbjo6Y3JlYXRlKGRldGVybWluZUN1cnJlbnRM Q0lEKCkpLmxlYWtQdHIoKTsKICAgICByZXR1cm4gY3VycmVudExvY2FsZTsKIH0KIAo=