diff options
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.cc | 8 |
1 files changed, 4 insertions, 4 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 19d8e97b4e56..20973d0141b5 100644 --- a/www/chromium/files/patch-content_renderer_render__thread__impl.cc +++ b/www/chromium/files/patch-content_renderer_render__thread__impl.cc @@ -1,6 +1,6 @@ ---- content/renderer/render_thread_impl.cc.orig 2017-04-19 19:06:34 UTC +--- content/renderer/render_thread_impl.cc.orig 2017-06-05 19:03:07 UTC +++ content/renderer/render_thread_impl.cc -@@ -206,11 +206,13 @@ +@@ -210,11 +210,13 @@ #include "content/common/external_ipc_dumper.h" #endif @@ -14,7 +14,7 @@ using base::ThreadRestrictions; using blink::WebDocument; -@@ -1379,7 +1381,7 @@ media::GpuVideoAcceleratorFactories* Ren +@@ -1383,7 +1385,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: const bool enable_video_accelerator = !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode); const bool enable_gpu_memory_buffer_video_frames = @@ -23,7 +23,7 @@ !cmd_line->HasSwitch(switches::kDisableGpuMemoryBufferVideoFrames) && !cmd_line->HasSwitch(switches::kDisableGpuCompositing) && !gpu_channel_host->gpu_info().software_rendering; -@@ -1712,6 +1714,8 @@ void RenderThreadImpl::GetRendererMemory +@@ -1726,6 +1728,8 @@ bool RenderThreadImpl::GetRendererMemoryMetrics( #else size_t malloc_usage = minfo.hblkhd + minfo.arena; #endif |