diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-06-02 10:43:26 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-06-02 10:44:03 +0200 |
| commit | bb91a70e24ac49fd21c1d7c8c91a216961da1e2d (patch) | |
| tree | 4c2497e0b093c7b0a25d48e72659dca21a50569a /chromium/content/renderer/render_thread_impl.cc | |
| parent | 1ec92e71bb67445775ce64cb081ed25c3d7481f1 (diff) | |
| parent | b92421879c003a0857b2074f7e05b3bbbb326569 (diff) | |
| download | qtwebengine-chromium-bb91a70e24ac49fd21c1d7c8c91a216961da1e2d.tar.gz | |
Merge branch 'upstream-master' into 51-based
Change-Id: I08d36e04494c3bb0c04641ad7c8e53bf418975db
Diffstat (limited to 'chromium/content/renderer/render_thread_impl.cc')
| -rw-r--r-- | chromium/content/renderer/render_thread_impl.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/chromium/content/renderer/render_thread_impl.cc b/chromium/content/renderer/render_thread_impl.cc index 9473a49b7a5..169beeeafcb 100644 --- a/chromium/content/renderer/render_thread_impl.cc +++ b/chromium/content/renderer/render_thread_impl.cc @@ -1342,7 +1342,8 @@ void RenderThreadImpl::RecordComputedAction(const std::string& action) { scoped_ptr<base::SharedMemory> RenderThreadImpl::HostAllocateSharedMemoryBuffer(size_t size) { - return ChildThreadImpl::AllocateSharedMemory(size, thread_safe_sender()); + return ChildThreadImpl::AllocateSharedMemory(size, thread_safe_sender(), + nullptr); } cc::SharedBitmapManager* RenderThreadImpl::GetSharedBitmapManager() { @@ -1470,7 +1471,9 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl::GetGpuFactories() { !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode); const bool enable_gpu_memory_buffer_video_frames = #if defined(OS_MACOSX) || defined(OS_LINUX) - !cmd_line->HasSwitch(switches::kDisableGpuMemoryBufferVideoFrames); + !cmd_line->HasSwitch(switches::kDisableGpuMemoryBufferVideoFrames) && + !cmd_line->HasSwitch(switches::kDisableGpuCompositing) && + !gpu_channel_host->gpu_info().software_rendering; #else cmd_line->HasSwitch(switches::kEnableGpuMemoryBufferVideoFrames); #endif |