summaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-content_renderer_render__thread__impl.cc
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-content_renderer_render__thread__impl.cc')
-rw-r--r--www/chromium/files/patch-content_renderer_render__thread__impl.cc28
1 files changed, 12 insertions, 16 deletions
diff --git a/www/chromium/files/patch-content_renderer_render__thread__impl.cc b/www/chromium/files/patch-content_renderer_render__thread__impl.cc
index 8ef7609e8c05..ca77db2f8590 100644
--- a/www/chromium/files/patch-content_renderer_render__thread__impl.cc
+++ b/www/chromium/files/patch-content_renderer_render__thread__impl.cc
@@ -1,7 +1,7 @@
---- content/renderer/render_thread_impl.cc.orig 2018-08-01 00:08:45.000000000 +0200
-+++ content/renderer/render_thread_impl.cc 2018-08-04 19:38:18.130085000 +0200
-@@ -199,12 +199,21 @@
- #include "content/common/external_ipc_dumper.h"
+--- content/renderer/render_thread_impl.cc.orig 2018-12-03 21:16:57.000000000 +0100
++++ content/renderer/render_thread_impl.cc 2018-12-13 21:23:23.111245000 +0100
+@@ -192,12 +192,21 @@
+ #include "mojo/public/cpp/bindings/message_dumper.h"
#endif
+#if !defined(OS_BSD)
@@ -22,7 +22,7 @@
using base::ThreadRestrictions;
using blink::WebDocument;
using blink::WebFrame;
-@@ -1002,7 +1011,7 @@
+@@ -932,7 +941,7 @@
DCHECK(parsed_num_raster_threads) << string_value;
DCHECK_GT(num_raster_threads, 0);
@@ -31,7 +31,7 @@
categorized_worker_pool_->SetBackgroundingCallback(
main_thread_scheduler_->DefaultTaskRunner(),
base::BindOnce(
-@@ -1043,7 +1052,7 @@
+@@ -973,7 +982,7 @@
GetConnector()->BindInterface(mojom::kBrowserServiceName,
mojo::MakeRequest(&storage_partition_service_));
@@ -40,16 +40,7 @@
render_message_filter()->SetThreadPriority(
ChildProcess::current()->io_thread_id(), base::ThreadPriority::DISPLAY);
#endif
-@@ -1248,7 +1257,7 @@
- false));
- GetContentClient()->renderer()->PostCompositorThreadCreated(
- compositor_task_runner_.get());
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- render_message_filter()->SetThreadPriority(compositor_thread_->ThreadId(),
- base::ThreadPriority::DISPLAY);
- #endif
-@@ -1485,7 +1494,7 @@
+@@ -1331,11 +1340,11 @@
gpu::kGpuFeatureStatusEnabled);
const bool enable_gpu_memory_buffers =
!is_gpu_compositing_disabled_ &&
@@ -58,3 +49,8 @@
!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(