Commit f64f9846 authored by jshin's avatar jshin Committed by Commit bot

Work around for crbug.com/719609

Temporarily disable check for Etc/GMT and take it as well as
Etc/UTC until the root cause of crbug.com/719609 is found.

BUG=chromium:719609,v8:6252
TBR=adamk@chromium.org

Review-Url: https://codereview.chromium.org/2872873002
Cr-Commit-Position: refs/heads/master@{#45186}
parent d412cade
......@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment