Filip/playwright
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

browser(ff-beta): fix timezone emulation on Win (#9812)

Browse source
This commit is contained in:
Andrey Lushnikov 2021-10-27 09:34:16 -07:00 committed by GitHub
parent d7610ebab2
commit 56b0823269
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
browser_patches/firefox-beta/BUILD_NUMBER
View file

@ -1,2 +1,2 @@
1298 1299
Changed: lushnikov@chromium.org Tue 19 Oct 2021 05:01:45 PM PDT Changed: lushnikov@chromium.org Wed 27 Oct 2021 12:40:16 AM PDT

17
browser_patches/firefox-beta/patches/bootstrap.diff
View file

@ -1920,7 +1920,7 @@ index b32d426ba38045d14e6f1e79d17e8e6061e78227..df782034e79466fcc251e9a06e99d2e1
} }
diff --git a/js/src/vm/DateTime.cpp b/js/src/vm/DateTime.cpp diff --git a/js/src/vm/DateTime.cpp b/js/src/vm/DateTime.cpp
index e8f27fb69691aa6062c860a14ec94660fb9e5189..dd0218a5c2b3f2908f1549b8ef44a73df062b50e 100644 index e8f27fb69691aa6062c860a14ec94660fb9e5189..67715cbbc8257f11927564b45bbc8ee5384f809d 100644
--- a/js/src/vm/DateTime.cpp --- a/js/src/vm/DateTime.cpp
+++ b/js/src/vm/DateTime.cpp +++ b/js/src/vm/DateTime.cpp
@@ -170,6 +170,11 @@ void js::DateTimeInfo::internalResetTimeZone(ResetTimeZoneMode mode) { @@ -170,6 +170,11 @@ void js::DateTimeInfo::internalResetTimeZone(ResetTimeZoneMode mode) {
@ -1964,16 +1964,15 @@ index e8f27fb69691aa6062c860a14ec94660fb9e5189..dd0218a5c2b3f2908f1549b8ef44a73d
void js::DateTimeInfo::internalResyncICUDefaultTimeZone() { void js::DateTimeInfo::internalResyncICUDefaultTimeZone() {
#if JS_HAS_INTL_API #if JS_HAS_INTL_API
- if (const char* tzenv = std::getenv("TZ")) {
- std::string_view tz(tzenv);
+ std::string_view tz;
+ if (!timeZoneOverride_.empty()) { + if (!timeZoneOverride_.empty()) {
+ tz = timeZoneOverride_; + mozilla::Span<const char> tzid = mozilla::Span(timeZoneOverride_.data(), timeZoneOverride_.length());
+ } else if (const char* tzenv = std::getenv("TZ")) { + mozilla::intl::TimeZone::SetDefaultTimeZone(tzid);
+ tz = std::string_view(tzenv); + return;
+ } + }
+
+ if (!tz.empty()) { if (const char* tzenv = std::getenv("TZ")) {
std::string_view tz(tzenv);
-
mozilla::Span<const char> tzid; mozilla::Span<const char> tzid;
# if defined(XP_WIN) # if defined(XP_WIN)