summaryrefslogtreecommitdiff
path: root/www/iridium/files/patch-content_browser_scheduler_responsiveness_watcher.cc
diff options
context:
space:
mode:
authorRene Ladan <rene@FreeBSD.org>2020-07-23 16:31:18 +0000
committerRene Ladan <rene@FreeBSD.org>2020-07-23 16:31:18 +0000
commit651302b592fe54c5197641402df87ff216c27903 (patch)
tree784a10fc6050d3be8786fd6f4f954d7802bd9204 /www/iridium/files/patch-content_browser_scheduler_responsiveness_watcher.cc
parentAdd compiler:c++14-lang to USES to atttempt to fix on GCC-based systems: (diff)
www/iridium: update to 2020.04.81
PR: 245959 Submitted by: Matthias Wolf MFH: 2020Q3 Security: any Chromium vulnerability between 73 and 81
Diffstat (limited to 'www/iridium/files/patch-content_browser_scheduler_responsiveness_watcher.cc')
-rw-r--r--www/iridium/files/patch-content_browser_scheduler_responsiveness_watcher.cc20
1 files changed, 20 insertions, 0 deletions
diff --git a/www/iridium/files/patch-content_browser_scheduler_responsiveness_watcher.cc b/www/iridium/files/patch-content_browser_scheduler_responsiveness_watcher.cc
new file mode 100644
index 000000000000..ebeeac2a51c1
--- /dev/null
+++ b/www/iridium/files/patch-content_browser_scheduler_responsiveness_watcher.cc
@@ -0,0 +1,20 @@
+--- content/browser/scheduler/responsiveness/watcher.cc.orig 2020-02-03 21:52:46 UTC
++++ content/browser/scheduler/responsiveness/watcher.cc
+@@ -101,7 +101,7 @@ void Watcher::DidRunTask(const base::PendingTask* task
+ // in context menus, among others). Simply ignore the mismatches for now.
+ // See https://crbug.com/929813 for the details of why the mismatch
+ // happens.
+-#if !defined(OS_CHROMEOS) && defined(OS_LINUX) && defined(USE_OZONE)
++#if !defined(OS_CHROMEOS) && (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_OZONE)
+ return currently_running_metadata_ui_.clear();
+ #endif
+ DCHECK_LE(*mismatched_task_identifiers, 1);
+@@ -170,7 +170,7 @@ void Watcher::DidRunEventOnUIThread(const void* opaque
+ mismatched_event_identifiers_ui_ += 1;
+ // See comment in DidRunTask() for why |currently_running_metadata_ui_| may
+ // be reset.
+-#if !defined(OS_CHROMEOS) && defined(OS_LINUX) && defined(USE_OZONE)
++#if !defined(OS_CHROMEOS) && (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_OZONE)
+ return currently_running_metadata_ui_.clear();
+ #endif
+ DCHECK_LE(mismatched_event_identifiers_ui_, 1);