diff options
Diffstat (limited to 'www/chromium/files/patch-content_browser_devtools_protocol_system__info__handler.cc')
| -rw-r--r-- | www/chromium/files/patch-content_browser_devtools_protocol_system__info__handler.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/www/chromium/files/patch-content_browser_devtools_protocol_system__info__handler.cc b/www/chromium/files/patch-content_browser_devtools_protocol_system__info__handler.cc index 8ec1e4c32c84..f05bfe856d34 100644 --- a/www/chromium/files/patch-content_browser_devtools_protocol_system__info__handler.cc +++ b/www/chromium/files/patch-content_browser_devtools_protocol_system__info__handler.cc @@ -1,6 +1,6 @@ ---- content/browser/devtools/protocol/system_info_handler.cc.orig 2021-04-14 18:41:02 UTC +--- content/browser/devtools/protocol/system_info_handler.cc.orig 2021-05-12 22:05:52 UTC +++ content/browser/devtools/protocol/system_info_handler.cc -@@ -50,8 +50,8 @@ std::unique_ptr<SystemInfo::Size> GfxSizeToSystemInfoS +@@ -51,8 +51,8 @@ std::unique_ptr<SystemInfo::Size> GfxSizeToSystemInfoS // 1153667. // Windows builds need more time -- see Issue 873112 and 1004472. // ASAN builds need more time -- see Issue 1167875. @@ -8,6 +8,6 @@ - !defined(NDEBUG)) || \ +#if ((defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD)) && \ + !defined(NDEBUG)) || \ - defined(OS_WIN) || defined(ADDRESS_SANITIZER) + defined(OS_WIN) || defined(ADDRESS_SANITIZER) || defined(USE_OZONE) const int kGPUInfoWatchdogTimeoutMs = 30000; #else |