Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(534)

Unified Diff: src/objects/intl-objects.cc

Issue 2872873002: Work around for crbug.com/719609 (Closed)
Patch Set: Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/objects/intl-objects.cc
diff --git a/src/objects/intl-objects.cc b/src/objects/intl-objects.cc
index 4465c81acd1b9b92aa97b63df1fd1a80037e3aa2..fd6546b3904646b236601725eb31409dde3f3c78 100644
--- a/src/objects/intl-objects.cc
+++ b/src/objects/intl-objects.cc
@@ -178,8 +178,10 @@ void SetResolvedDateSettings(Isolate* isolate, const icu::Locale& icu_locale,
// timezone. We'd not have "Etc/GMT" here because we canonicalize it and
// other GMT-variants to "UTC" in intl.js and "UTC" is turned to "Etc/UTC"
// by ICU before getting here.
- DCHECK(canonical_time_zone != UNICODE_STRING_SIMPLE("Etc/GMT"));
- if (canonical_time_zone == UNICODE_STRING_SIMPLE("Etc/UTC")) {
+ // TODO(jshin): Figure out the cause of crbug.com/719609 and re-enable
+ // DCHECK(canonical_time_zone != UNICODE_STRING_SIMPLE("Etc/GMT")) .
+ if (canonical_time_zone == UNICODE_STRING_SIMPLE("Etc/UTC") ||
+ canonical_time_zone == UNICODE_STRING_SIMPLE("Etc/GMT")) {
JSObject::SetProperty(resolved,
factory->NewStringFromStaticChars("timeZone"),
factory->NewStringFromStaticChars("UTC"), SLOPPY)
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698