From 26b4c8f71f91d22e081b27814782686edde0c90a Mon Sep 17 00:00:00 2001 From: Antoine Brodin Date: Fri, 1 Jan 2021 10:11:34 +0000 Subject: Revert r559792 to unbreak INDEX and bulk -a It seems a lot of reverse dependencies were missed With hat: portmgr --- .../patch-content_renderer_render__thread__impl.cc | 51 ++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 devel/electron6/files/patch-content_renderer_render__thread__impl.cc (limited to 'devel/electron6/files/patch-content_renderer_render__thread__impl.cc') diff --git a/devel/electron6/files/patch-content_renderer_render__thread__impl.cc b/devel/electron6/files/patch-content_renderer_render__thread__impl.cc new file mode 100644 index 000000000000..8db6c3daf4bd --- /dev/null +++ b/devel/electron6/files/patch-content_renderer_render__thread__impl.cc @@ -0,0 +1,51 @@ +--- content/renderer/render_thread_impl.cc.orig 2019-09-16 09:24:24 UTC ++++ content/renderer/render_thread_impl.cc +@@ -187,12 +187,21 @@ + #include "mojo/public/cpp/bindings/message_dumper.h" + #endif + ++#if !defined(OS_BSD) + #if defined(OS_MACOSX) + #include + #else + #include + #endif ++#endif + ++#if defined(OS_BSD) ++#include ++#include ++#include ++#include ++#endif ++ + using base::ThreadRestrictions; + using blink::WebDocument; + using blink::WebFrame; +@@ -907,7 +916,7 @@ void RenderThreadImpl::Init() { + DCHECK(parsed_num_raster_threads) << string_value; + DCHECK_GT(num_raster_threads, 0); + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + categorized_worker_pool_->SetBackgroundingCallback( + main_thread_scheduler_->DefaultTaskRunner(), + base::BindOnce( +@@ -939,7 +948,7 @@ void RenderThreadImpl::Init() { + GetConnector()->BindInterface(mojom::kBrowserServiceName, + mojo::MakeRequest(&storage_partition_service_)); + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + render_message_filter()->SetThreadPriority( + ChildProcess::current()->io_thread_id(), base::ThreadPriority::DISPLAY); + #endif +@@ -1321,7 +1330,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: + !cmd_line->HasSwitch(switches::kDisableGpuMemoryBufferVideoFrames); + #else + cmd_line->HasSwitch(switches::kEnableGpuMemoryBufferVideoFrames); +-#endif // defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_WIN) ++#endif // defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) + const bool enable_media_stream_gpu_memory_buffers = + enable_gpu_memory_buffers && + base::FeatureList::IsEnabled( -- cgit v1.2.3