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 0650a72a5dfe..d2a74cec3c4d 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-01-26 00:49:13 UTC +--- content/renderer/render_thread_impl.cc.orig 2017-03-09 20:04:32 UTC +++ content/renderer/render_thread_impl.cc -@@ -206,11 +206,13 @@ +@@ -207,11 +207,13 @@ #include "content/common/external_ipc_dumper.h" #endif @@ -14,7 +14,7 @@ using base::ThreadRestrictions; using blink::WebDocument; -@@ -1488,7 +1490,7 @@ media::GpuVideoAcceleratorFactories* Ren +@@ -1386,7 +1388,7 @@ media::GpuVideoAcceleratorFactories* Ren 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; -@@ -1846,6 +1848,8 @@ void RenderThreadImpl::RecordPurgeAndSus +@@ -1729,6 +1731,8 @@ void RenderThreadImpl::GetRendererMemory #else size_t malloc_usage = minfo.hblkhd + minfo.arena; #endif |