Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(26)

Side by Side Diff: cc/trees/layer_tree_host_impl.cc

Issue 2101043002: Reland of cc: Add mailbox support to ResourceProvider write locks. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@worker_context_sync_tokens_revert
Patch Set: Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « cc/trees/layer_tree_host_impl.h ('k') | cc/trees/layer_tree_host_unittest_context.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2011 The Chromium Authors. All rights reserved. 1 // Copyright 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "cc/trees/layer_tree_host_impl.h" 5 #include "cc/trees/layer_tree_host_impl.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <algorithm> 10 #include <algorithm>
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 #include "cc/output/delegating_renderer.h" 55 #include "cc/output/delegating_renderer.h"
56 #include "cc/output/gl_renderer.h" 56 #include "cc/output/gl_renderer.h"
57 #include "cc/output/software_renderer.h" 57 #include "cc/output/software_renderer.h"
58 #include "cc/output/texture_mailbox_deleter.h" 58 #include "cc/output/texture_mailbox_deleter.h"
59 #include "cc/quads/render_pass_draw_quad.h" 59 #include "cc/quads/render_pass_draw_quad.h"
60 #include "cc/quads/shared_quad_state.h" 60 #include "cc/quads/shared_quad_state.h"
61 #include "cc/quads/solid_color_draw_quad.h" 61 #include "cc/quads/solid_color_draw_quad.h"
62 #include "cc/quads/texture_draw_quad.h" 62 #include "cc/quads/texture_draw_quad.h"
63 #include "cc/raster/bitmap_raster_buffer_provider.h" 63 #include "cc/raster/bitmap_raster_buffer_provider.h"
64 #include "cc/raster/gpu_raster_buffer_provider.h" 64 #include "cc/raster/gpu_raster_buffer_provider.h"
65 #include "cc/raster/gpu_rasterizer.h"
66 #include "cc/raster/one_copy_raster_buffer_provider.h" 65 #include "cc/raster/one_copy_raster_buffer_provider.h"
67 #include "cc/raster/raster_buffer_provider.h" 66 #include "cc/raster/raster_buffer_provider.h"
68 #include "cc/raster/synchronous_task_graph_runner.h" 67 #include "cc/raster/synchronous_task_graph_runner.h"
69 #include "cc/raster/zero_copy_raster_buffer_provider.h" 68 #include "cc/raster/zero_copy_raster_buffer_provider.h"
70 #include "cc/resources/memory_history.h" 69 #include "cc/resources/memory_history.h"
71 #include "cc/resources/resource_pool.h" 70 #include "cc/resources/resource_pool.h"
72 #include "cc/resources/ui_resource_bitmap.h" 71 #include "cc/resources/ui_resource_bitmap.h"
73 #include "cc/scheduler/delay_based_time_source.h" 72 #include "cc/scheduler/delay_based_time_source.h"
74 #include "cc/tiles/eviction_tile_priority_queue.h" 73 #include "cc/tiles/eviction_tile_priority_queue.h"
75 #include "cc/tiles/gpu_image_decode_controller.h" 74 #include "cc/tiles/gpu_image_decode_controller.h"
(...skipping 2085 matching lines...) Expand 10 before | Expand all | Expand 10 after
2161 // See note in LayerTreeImpl::UpdateDrawProperties. Renderer needs to be 2160 // See note in LayerTreeImpl::UpdateDrawProperties. Renderer needs to be
2162 // initialized to get max texture size. Also, after releasing resources, 2161 // initialized to get max texture size. Also, after releasing resources,
2163 // trees need another update to generate new ones. 2162 // trees need another update to generate new ones.
2164 active_tree_->set_needs_update_draw_properties(); 2163 active_tree_->set_needs_update_draw_properties();
2165 if (pending_tree_) 2164 if (pending_tree_)
2166 pending_tree_->set_needs_update_draw_properties(); 2165 pending_tree_->set_needs_update_draw_properties();
2167 client_->UpdateRendererCapabilitiesOnImplThread(); 2166 client_->UpdateRendererCapabilitiesOnImplThread();
2168 } 2167 }
2169 2168
2170 void LayerTreeHostImpl::CreateTileManagerResources() { 2169 void LayerTreeHostImpl::CreateTileManagerResources() {
2171 std::unique_ptr<RasterBufferProvider> raster_buffer_provider; 2170 CreateResourceAndRasterBufferProvider(&raster_buffer_provider_,
2172 CreateResourceAndRasterBufferProvider(&raster_buffer_provider,
2173 &resource_pool_); 2171 &resource_pool_);
2174 2172
2175 if (use_gpu_rasterization_) { 2173 if (use_gpu_rasterization_) {
2176 image_decode_controller_ = base::WrapUnique(new GpuImageDecodeController( 2174 image_decode_controller_ = base::WrapUnique(new GpuImageDecodeController(
2177 output_surface_->worker_context_provider(), 2175 output_surface_->worker_context_provider(),
2178 settings_.renderer_settings.preferred_tile_format, 2176 settings_.renderer_settings.preferred_tile_format,
2179 settings_.gpu_decoded_image_budget_bytes)); 2177 settings_.gpu_decoded_image_budget_bytes));
2180 } else { 2178 } else {
2181 image_decode_controller_ = 2179 image_decode_controller_ =
2182 base::WrapUnique(new SoftwareImageDecodeController( 2180 base::WrapUnique(new SoftwareImageDecodeController(
2183 settings_.renderer_settings.preferred_tile_format, 2181 settings_.renderer_settings.preferred_tile_format,
2184 settings_.software_decoded_image_budget_bytes)); 2182 settings_.software_decoded_image_budget_bytes));
2185 } 2183 }
2186 2184
2187 // Pass the single-threaded synchronous task graph runner to the worker pool 2185 // Pass the single-threaded synchronous task graph runner to the worker pool
2188 // if we're in synchronous single-threaded mode. 2186 // if we're in synchronous single-threaded mode.
2189 TaskGraphRunner* task_graph_runner = task_graph_runner_; 2187 TaskGraphRunner* task_graph_runner = task_graph_runner_;
2190 if (is_synchronous_single_threaded_) { 2188 if (is_synchronous_single_threaded_) {
2191 DCHECK(!single_thread_synchronous_task_graph_runner_); 2189 DCHECK(!single_thread_synchronous_task_graph_runner_);
2192 single_thread_synchronous_task_graph_runner_.reset( 2190 single_thread_synchronous_task_graph_runner_.reset(
2193 new SynchronousTaskGraphRunner); 2191 new SynchronousTaskGraphRunner);
2194 task_graph_runner = single_thread_synchronous_task_graph_runner_.get(); 2192 task_graph_runner = single_thread_synchronous_task_graph_runner_.get();
2195 } 2193 }
2196 2194
2197 tile_task_manager_ = TileTaskManagerImpl::Create( 2195 tile_task_manager_ = TileTaskManagerImpl::Create(task_graph_runner);
2198 std::move(raster_buffer_provider), task_graph_runner);
2199 2196
2200 // TODO(vmpstr): Initialize tile task limit at ctor time. 2197 // TODO(vmpstr): Initialize tile task limit at ctor time.
2201 tile_manager_.SetResources( 2198 tile_manager_.SetResources(
2202 resource_pool_.get(), image_decode_controller_.get(), 2199 resource_pool_.get(), image_decode_controller_.get(),
2203 tile_task_manager_.get(), 2200 tile_task_manager_.get(), raster_buffer_provider_.get(),
2204 is_synchronous_single_threaded_ ? std::numeric_limits<size_t>::max() 2201 is_synchronous_single_threaded_ ? std::numeric_limits<size_t>::max()
2205 : settings_.scheduled_raster_task_limit, 2202 : settings_.scheduled_raster_task_limit,
2206 use_gpu_rasterization_); 2203 use_gpu_rasterization_);
2207 UpdateTileManagerMemoryPolicy(ActualManagedMemoryPolicy()); 2204 UpdateTileManagerMemoryPolicy(ActualManagedMemoryPolicy());
2208 } 2205 }
2209 2206
2210 void LayerTreeHostImpl::CreateResourceAndRasterBufferProvider( 2207 void LayerTreeHostImpl::CreateResourceAndRasterBufferProvider(
2211 std::unique_ptr<RasterBufferProvider>* raster_buffer_provider, 2208 std::unique_ptr<RasterBufferProvider>* raster_buffer_provider,
2212 std::unique_ptr<ResourcePool>* resource_pool) { 2209 std::unique_ptr<ResourcePool>* resource_pool) {
2213 DCHECK(GetTaskRunner()); 2210 DCHECK(GetTaskRunner());
(...skipping 18 matching lines...) Expand all
2232 DCHECK(worker_context_provider); 2229 DCHECK(worker_context_provider);
2233 2230
2234 *resource_pool = 2231 *resource_pool =
2235 ResourcePool::Create(resource_provider_.get(), GetTaskRunner()); 2232 ResourcePool::Create(resource_provider_.get(), GetTaskRunner());
2236 2233
2237 int msaa_sample_count = use_msaa_ ? RequestedMSAASampleCount() : 0; 2234 int msaa_sample_count = use_msaa_ ? RequestedMSAASampleCount() : 0;
2238 2235
2239 *raster_buffer_provider = base::MakeUnique<GpuRasterBufferProvider>( 2236 *raster_buffer_provider = base::MakeUnique<GpuRasterBufferProvider>(
2240 compositor_context_provider, worker_context_provider, 2237 compositor_context_provider, worker_context_provider,
2241 resource_provider_.get(), settings_.use_distance_field_text, 2238 resource_provider_.get(), settings_.use_distance_field_text,
2242 msaa_sample_count); 2239 msaa_sample_count, settings_.async_worker_context_enabled);
2243 return; 2240 return;
2244 } 2241 }
2245 2242
2246 DCHECK(GetRendererCapabilities().using_image); 2243 DCHECK(GetRendererCapabilities().using_image);
2247 2244
2248 bool use_zero_copy = settings_.use_zero_copy; 2245 bool use_zero_copy = settings_.use_zero_copy;
2249 // TODO(reveman): Remove this when mojo supports worker contexts. 2246 // TODO(reveman): Remove this when mojo supports worker contexts.
2250 // crbug.com/522440 2247 // crbug.com/522440
2251 if (!use_zero_copy && !worker_context_provider) { 2248 if (!use_zero_copy && !worker_context_provider) {
2252 LOG(ERROR) 2249 LOG(ERROR)
(...skipping 15 matching lines...) Expand all
2268 ResourcePool::Create(resource_provider_.get(), GetTaskRunner()); 2265 ResourcePool::Create(resource_provider_.get(), GetTaskRunner());
2269 2266
2270 const int max_copy_texture_chromium_size = 2267 const int max_copy_texture_chromium_size =
2271 compositor_context_provider->ContextCapabilities() 2268 compositor_context_provider->ContextCapabilities()
2272 .max_copy_texture_chromium_size; 2269 .max_copy_texture_chromium_size;
2273 2270
2274 *raster_buffer_provider = base::MakeUnique<OneCopyRasterBufferProvider>( 2271 *raster_buffer_provider = base::MakeUnique<OneCopyRasterBufferProvider>(
2275 GetTaskRunner(), compositor_context_provider, worker_context_provider, 2272 GetTaskRunner(), compositor_context_provider, worker_context_provider,
2276 resource_provider_.get(), max_copy_texture_chromium_size, 2273 resource_provider_.get(), max_copy_texture_chromium_size,
2277 settings_.use_partial_raster, settings_.max_staging_buffer_usage_in_bytes, 2274 settings_.use_partial_raster, settings_.max_staging_buffer_usage_in_bytes,
2278 settings_.renderer_settings.preferred_tile_format); 2275 settings_.renderer_settings.preferred_tile_format,
2276 settings_.async_worker_context_enabled);
2279 } 2277 }
2280 2278
2281 void LayerTreeHostImpl::SetLayerTreeMutator( 2279 void LayerTreeHostImpl::SetLayerTreeMutator(
2282 std::unique_ptr<LayerTreeMutator> mutator) { 2280 std::unique_ptr<LayerTreeMutator> mutator) {
2283 if (mutator == mutator_) 2281 if (mutator == mutator_)
2284 return; 2282 return;
2285 TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("compositor-worker"), 2283 TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("compositor-worker"),
2286 "LayerTreeHostImpl::SetLayerTreeMutator"); 2284 "LayerTreeHostImpl::SetLayerTreeMutator");
2287 mutator_ = std::move(mutator); 2285 mutator_ = std::move(mutator);
2288 mutator_->SetClient(this); 2286 mutator_->SetClient(this);
(...skipping 1721 matching lines...) Expand 10 before | Expand all | Expand 10 after
4010 return task_runner_provider_->HasImplThread(); 4008 return task_runner_provider_->HasImplThread();
4011 } 4009 }
4012 4010
4013 bool LayerTreeHostImpl::CommitToActiveTree() const { 4011 bool LayerTreeHostImpl::CommitToActiveTree() const {
4014 // In single threaded mode we skip the pending tree and commit directly to the 4012 // In single threaded mode we skip the pending tree and commit directly to the
4015 // active tree. 4013 // active tree.
4016 return !task_runner_provider_->HasImplThread(); 4014 return !task_runner_provider_->HasImplThread();
4017 } 4015 }
4018 4016
4019 } // namespace cc 4017 } // namespace cc
OLDNEW
« no previous file with comments | « cc/trees/layer_tree_host_impl.h ('k') | cc/trees/layer_tree_host_unittest_context.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698