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

browser(webkit): fix timezone override on Windows (#6277)

Browse source
This commit is contained in:
Yury Semikhatsky 2021-04-22 23:10:12 +00:00 committed by GitHub
parent 111e55992e
commit 2755d5e37d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
browser_patches/webkit/BUILD_NUMBER
View file

@ -1,2 +1,2 @@
1464 1465
Changed: yurys@chromium.org Wed 21 Apr 2021 11:35:09 AM PDT Changed: yurys@chromium.org Thu, Apr 22, 2021 11:00:54 PM

29
browser_patches/webkit/patches/bootstrap.diff
View file

@ -1425,7 +1425,7 @@ index f89806c56b260522fc7c7b98af852cf733f8985f..0ae692ba821d4a6c5210fe12ce77b84a
#include <wtf/unicode/icu/ICUHelpers.h> #include <wtf/unicode/icu/ICUHelpers.h>
diff --git a/Source/JavaScriptCore/runtime/JSDateMath.cpp b/Source/JavaScriptCore/runtime/JSDateMath.cpp diff --git a/Source/JavaScriptCore/runtime/JSDateMath.cpp b/Source/JavaScriptCore/runtime/JSDateMath.cpp
index ea0bfb0d7a5a64c1570da5333199f99b552a5ff6..3b9bd5729e835e909efdaedc590b28b23e32acf4 100644 index ea0bfb0d7a5a64c1570da5333199f99b552a5ff6..2ebe8c6c5ac4343e0b373ccc271e86a4080a98dc 100644
--- a/Source/JavaScriptCore/runtime/JSDateMath.cpp --- a/Source/JavaScriptCore/runtime/JSDateMath.cpp
+++ b/Source/JavaScriptCore/runtime/JSDateMath.cpp +++ b/Source/JavaScriptCore/runtime/JSDateMath.cpp
@@ -76,6 +76,7 @@ @@ -76,6 +76,7 @@
@ -1447,21 +1447,38 @@ index ea0bfb0d7a5a64c1570da5333199f99b552a5ff6..3b9bd5729e835e909efdaedc590b28b2
#if HAVE(ICU_C_TIMEZONE_API) #if HAVE(ICU_C_TIMEZONE_API)
auto& timeZone = *timeZoneCache(); auto& timeZone = *timeZoneCache();
Vector<UChar, 32> buffer; Vector<UChar, 32> buffer;
@@ -382,6 +387,14 @@ Ref<DateInstanceData> DateCache::cachedDateInstanceData(double millisecondsFromE @@ -382,16 +387,29 @@ Ref<DateInstanceData> DateCache::cachedDateInstanceData(double millisecondsFromE
void DateCache::timeZoneCacheSlow() void DateCache::timeZoneCacheSlow()
{ {
ASSERT(!m_timeZoneCache); ASSERT(!m_timeZoneCache);
+ +
+ String override = WTF::timeZoneForAutomation(); + String override = WTF::timeZoneForAutomation();
#if HAVE(ICU_C_TIMEZONE_API)
auto* cache = new OpaqueICUTimeZone;
+ // ucal_open checks that the status is success, so it has to be initialized here.
+ UErrorCode status = U_ZERO_ERROR;
Vector<UChar, 32> timeZoneID;
- auto status = callBufferProducingFunction(ucal_getHostTimeZone, timeZoneID);
- ASSERT_UNUSED(status, U_SUCCESS(status));
+ if (override.isEmpty()) {
+ status = callBufferProducingFunction(ucal_getHostTimeZone, timeZoneID);
+ ASSERT_UNUSED(status, U_SUCCESS(status));
+ } else {
+ timeZoneID = override.charactersWithoutNullTermination();
+ }
cache->m_calendar = std::unique_ptr<UCalendar, ICUDeleter<ucal_close>>(ucal_open(timeZoneID.data(), timeZoneID.size(), "", UCAL_DEFAULT, &status));
ASSERT_UNUSED(status, U_SUCCESS(status));
ucal_setGregorianChange(cache->m_calendar.get(), minECMAScriptTime, &status); // Ignore "unsupported" error.
m_timeZoneCache = std::unique_ptr<OpaqueICUTimeZone, OpaqueICUTimeZoneDeleter>(cache);
#else
+ if (!override.isEmpty()) { + if (!override.isEmpty()) {
+ auto* timezone = icu::TimeZone::createTimeZone(override.utf8().data()); + auto* timezone = icu::TimeZone::createTimeZone(override.utf8().data());
+ m_timeZoneCache = std::unique_ptr<OpaqueICUTimeZone, OpaqueICUTimeZoneDeleter>(bitwise_cast<OpaqueICUTimeZone*>(timezone)); + m_timeZoneCache = std::unique_ptr<OpaqueICUTimeZone, OpaqueICUTimeZoneDeleter>(bitwise_cast<OpaqueICUTimeZone*>(timezone));
+ return; + return;
+ } + }
+ // Do not use icu::TimeZone::createDefault. ICU internally has a cache for timezone and createDefault returns this cached value.
#if HAVE(ICU_C_TIMEZONE_API) m_timeZoneCache = std::unique_ptr<OpaqueICUTimeZone, OpaqueICUTimeZoneDeleter>(bitwise_cast<OpaqueICUTimeZone*>(icu::TimeZone::detectHostTimeZone()));
auto* cache = new OpaqueICUTimeZone; #endif
Vector<UChar, 32> timeZoneID;
diff --git a/Source/ThirdParty/libwebrtc/CMakeLists.txt b/Source/ThirdParty/libwebrtc/CMakeLists.txt diff --git a/Source/ThirdParty/libwebrtc/CMakeLists.txt b/Source/ThirdParty/libwebrtc/CMakeLists.txt
index 351db7adbf094984f04bd2fc923420eba7682abe..1744bd94c21838a8d8eb2cce386458ada38514fc 100644 index 351db7adbf094984f04bd2fc923420eba7682abe..1744bd94c21838a8d8eb2cce386458ada38514fc 100644
--- a/Source/ThirdParty/libwebrtc/CMakeLists.txt --- a/Source/ThirdParty/libwebrtc/CMakeLists.txt