blob: 19d8e97b4e5645f0d9300cddafe7c866dbd8b5df (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
|
--- content/renderer/render_thread_impl.cc.orig 2017-04-19 19:06:34 UTC
+++ content/renderer/render_thread_impl.cc
@@ -206,11 +206,13 @@
#include "content/common/external_ipc_dumper.h"
#endif
+#if !defined(OS_BSD)
#if defined(OS_MACOSX)
#include <malloc/malloc.h>
#else
#include <malloc.h>
#endif
+#endif
using base::ThreadRestrictions;
using blink::WebDocument;
@@ -1379,7 +1381,7 @@ media::GpuVideoAcceleratorFactories* Ren
const bool enable_video_accelerator =
!cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode);
const bool enable_gpu_memory_buffer_video_frames =
-#if defined(OS_MACOSX) || defined(OS_LINUX)
+#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
!cmd_line->HasSwitch(switches::kDisableGpuMemoryBufferVideoFrames) &&
!cmd_line->HasSwitch(switches::kDisableGpuCompositing) &&
!gpu_channel_host->gpu_info().software_rendering;
@@ -1712,6 +1714,8 @@ void RenderThreadImpl::GetRendererMemory
#else
size_t malloc_usage = minfo.hblkhd + minfo.arena;
#endif
+#elif defined(OS_BSD)
+ size_t malloc_usage = 0;
#else
size_t malloc_usage = GetMallocUsage();
#endif
|
