From 78fd0255093c56d92b4281b7e3095a92a3f3d4ed Mon Sep 17 00:00:00 2001 From: kbr Date: Thu, 6 Aug 2015 21:32:56 -0700 Subject: Revert of cc: Use worker context for one-copy tile initialization. (patchset #20 id:380001 of https://codereview.chromium.org/1230203007/ ) Reason for revert: Suspected of colliding with another patch and causing Issue 517719. Original issue's description: > cc: Use worker context for one-copy tile initialization. > > This moves management of staging resources to > OneCopyTileTaskWorkerPool class. This makes it possible > to use a worker context to issue and detect when copy > operations complete. > > BUG=490295 > CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel > > Committed: https://crrev.com/d5157ac5afec145b85746b42f2d86383483a8222 > Cr-Commit-Position: refs/heads/master@{#342235} TBR=piman@chromium.org,primiano@chromium.org,vmiura@chromium.org,vmpstr@chromium.org,reveman@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=490295,517719 Review URL: https://codereview.chromium.org/1273163004 Cr-Commit-Position: refs/heads/master@{#342284} --- cc/surfaces/display.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'cc/surfaces/display.cc') diff --git a/cc/surfaces/display.cc b/cc/surfaces/display.cc index 586bfad..7e80854 100644 --- a/cc/surfaces/display.cc +++ b/cc/surfaces/display.cc @@ -101,10 +101,13 @@ void Display::InitializeRenderer() { if (resource_provider_) return; + // Display does not use GpuMemoryBuffers, so persistent map is not relevant. + bool use_persistent_map_for_gpu_memory_buffers = false; scoped_ptr resource_provider = ResourceProvider::Create( output_surface_.get(), bitmap_manager_, gpu_memory_buffer_manager_, nullptr, settings_.highp_threshold_min, settings_.use_rgba_4444_textures, - settings_.texture_id_allocation_chunk_size); + settings_.texture_id_allocation_chunk_size, + use_persistent_map_for_gpu_memory_buffers); if (!resource_provider) return; -- cgit v1.1