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

Unified Diff: cc/trees/layer_tree_host_impl.cc

Issue 287643004: Re-land: cc: Examine layers to determine if we're ready to activate. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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 side-by-side diff with in-line comments
Download patch
« cc/resources/tile_manager.cc ('K') | « cc/trees/layer_tree_host_impl.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/layer_tree_host_impl.cc
diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
index f394d52494ea5750809c128277c1f25afb07d363..8b1444e873e3bb6542e984d41b5e156b699e75d9 100644
--- a/cc/trees/layer_tree_host_impl.cc
+++ b/cc/trees/layer_tree_host_impl.cc
@@ -1841,8 +1841,7 @@ void LayerTreeHostImpl::CreateAndSetTileManager(
ResourceProvider* resource_provider,
ContextProvider* context_provider,
bool use_zero_copy,
- bool use_one_copy,
- bool allow_rasterize_on_demand) {
+ bool use_one_copy) {
DCHECK(settings_.impl_side_painting);
DCHECK(resource_provider);
DCHECK(proxy_->ImplThreadTaskRunner());
@@ -1890,10 +1889,10 @@ void LayerTreeHostImpl::CreateAndSetTileManager(
proxy_->ImplThreadTaskRunner(), resource_provider, context_provider);
tile_manager_ =
TileManager::Create(this,
+ proxy_->ImplThreadTaskRunner(),
resource_pool_.get(),
raster_worker_pool_->AsRasterizer(),
direct_raster_worker_pool_->AsRasterizer(),
- allow_rasterize_on_demand,
rendering_stats_instrumentation_);
UpdateTileManagerMemoryPolicy(ActualManagedMemoryPolicy());
@@ -1959,12 +1958,10 @@ bool LayerTreeHostImpl::InitializeRenderer(
GetRendererCapabilities().using_map_image &&
resource_provider->use_sync_query();
- CreateAndSetTileManager(
- resource_provider.get(),
- output_surface->context_provider().get(),
- use_zero_copy,
- use_one_copy,
- GetRendererCapabilities().allow_rasterize_on_demand);
+ CreateAndSetTileManager(resource_provider.get(),
+ output_surface->context_provider().get(),
+ use_zero_copy,
+ use_one_copy);
}
// Initialize vsync parameters to sane values.
@@ -2037,11 +2034,7 @@ void LayerTreeHostImpl::ReleaseGL() {
EnforceZeroBudget(true);
DCHECK(GetRendererCapabilities().using_map_image);
- CreateAndSetTileManager(resource_provider_.get(),
- NULL,
- true,
- false,
- GetRendererCapabilities().allow_rasterize_on_demand);
+ CreateAndSetTileManager(resource_provider_.get(), NULL, true, false);
DCHECK(tile_manager_);
client_->SetNeedsCommitOnImplThread();
« cc/resources/tile_manager.cc ('K') | « cc/trees/layer_tree_host_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698