summaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-content_renderer_render__thread__impl.cc
diff options
context:
space:
mode:
authorRene Ladan <rene@FreeBSD.org>2020-07-30 20:39:39 +0000
committerRene Ladan <rene@FreeBSD.org>2020-07-30 20:39:39 +0000
commit2dd4dd29c063a32031fb5549616ba28e76310f0a (patch)
tree0427b26fe2d2bae71ff47102b5e646fdf927c022 /www/chromium/files/patch-content_renderer_render__thread__impl.cc
parentdevel/cdecl: update to 8.0. (diff)
www/chromium: update to 84.0.4147.105
Submitted by: Matthias Wolf via GitHub MFH: 2020Q3 Security: http://vuxml.freebsd.org/freebsd/9a447f78-d0f8-11ea-9837-e09467587c17.html Security: http://vuxml.freebsd.org/freebsd/870d59b0-c6c4-11ea-8015-e09467587c17.html
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.cc27
1 files changed, 7 insertions, 20 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 a535ade11d96..aed580dbffd6 100644
--- a/www/chromium/files/patch-content_renderer_render__thread__impl.cc
+++ b/www/chromium/files/patch-content_renderer_render__thread__impl.cc
@@ -1,28 +1,15 @@
---- content/renderer/render_thread_impl.cc.orig 2020-05-13 18:40:32 UTC
+--- content/renderer/render_thread_impl.cc.orig 2020-07-07 21:58:16 UTC
+++ content/renderer/render_thread_impl.cc
-@@ -176,12 +176,21 @@
- #include "mojo/public/cpp/bindings/message_dumper.h"
- #endif
+@@ -177,7 +177,7 @@
-+#if !defined(OS_BSD)
#if defined(OS_MACOSX)
#include <malloc/malloc.h>
- #else
+-#else
++#elif !defined(OS_BSD)
#include <malloc.h>
#endif
-+#endif
-+#if defined(OS_BSD)
-+#include <stddef.h>
-+#include <stdint.h>
-+#include <sys/param.h>
-+#include <sys/sysctl.h>
-+#endif
-+
- using base::ThreadRestrictions;
- using blink::WebDocument;
- using blink::WebFrame;
-@@ -738,7 +747,7 @@ void RenderThreadImpl::Init() {
+@@ -744,7 +744,7 @@ void RenderThreadImpl::Init() {
DCHECK(parsed_num_raster_threads) << string_value;
DCHECK_GT(num_raster_threads, 0);
@@ -31,7 +18,7 @@
categorized_worker_pool_->SetBackgroundingCallback(
main_thread_scheduler_->DefaultTaskRunner(),
base::BindOnce(
-@@ -761,7 +770,7 @@ void RenderThreadImpl::Init() {
+@@ -767,7 +767,7 @@ void RenderThreadImpl::Init() {
base::DiscardableMemoryAllocator::SetInstance(
discardable_memory_allocator_.get());
@@ -40,7 +27,7 @@
if (base::FeatureList::IsEnabled(
blink::features::kBlinkCompositorUseDisplayThreadPriority)) {
render_message_filter()->SetThreadPriority(
-@@ -1147,7 +1156,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl:
+@@ -1151,7 +1151,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl:
!cmd_line->HasSwitch(switches::kDisableGpuMemoryBufferVideoFrames);
#else
cmd_line->HasSwitch(switches::kEnableGpuMemoryBufferVideoFrames);