summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvmpstr@chromium.org <vmpstr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-01 00:45:18 +0000
committervmpstr@chromium.org <vmpstr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-01 00:45:18 +0000
commit88186a6159883e30138153ce87f66eb3e8954778 (patch)
tree8e30a15398db1168932081b722585f2b2070075b
parent819d8e0cf9dd0a5522021c91aef0e34519a17925 (diff)
downloadchromium_src-88186a6159883e30138153ce87f66eb3e8954778.zip
chromium_src-88186a6159883e30138153ce87f66eb3e8954778.tar.gz
chromium_src-88186a6159883e30138153ce87f66eb3e8954778.tar.bz2
cc: Change required_for_activation bookkeeping.
This patch changes the bookkeeping of whether required for activation tiles all received memory during AssignGpuMemory. The new approach doesn't rely on the fact that we process every tile in that loop, thus allowing us to early out or use another approach at getting tiles that does not guarantee that every tile will be visited. The end goal is to evaluate if we can activate when the rasterizer notifies us that all tasks given to it that are required for activation are finished rather than trying to figure this out when we schedule tasks. R=reveman, enne Review URL: https://codereview.chromium.org/257773009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@267400 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat
-rw-r--r--cc/layers/picture_layer_impl.cc20
-rw-r--r--cc/layers/picture_layer_impl.h14
-rw-r--r--cc/resources/tile_manager.cc28
-rw-r--r--cc/test/fake_tile_manager_client.h2
4 files changed, 54 insertions, 10 deletions
diff --git a/cc/layers/picture_layer_impl.cc b/cc/layers/picture_layer_impl.cc
index 1475232..5d3fb86 100644
--- a/cc/layers/picture_layer_impl.cc
+++ b/cc/layers/picture_layer_impl.cc
@@ -56,7 +56,9 @@ PictureLayerImpl::PictureLayerImpl(LayerTreeImpl* tree_impl, int id)
should_update_tile_priorities_(false),
should_use_low_res_tiling_(tree_impl->settings().create_low_res_tiling),
use_gpu_rasterization_(false),
- layer_needs_to_register_itself_(true) {}
+ layer_needs_to_register_itself_(true),
+ uninitialized_tiles_required_for_activation_count_(0) {
+}
PictureLayerImpl::~PictureLayerImpl() {
if (!layer_needs_to_register_itself_)
@@ -405,6 +407,7 @@ void PictureLayerImpl::UpdateTilePriorities() {
contents_scale_x(),
current_frame_time_in_seconds);
+ uninitialized_tiles_required_for_activation_count_ = 0;
if (layer_tree_impl()->IsPendingTree())
MarkVisibleResourcesAsRequired();
@@ -417,6 +420,13 @@ void PictureLayerImpl::NotifyTileInitialized(const Tile* tile) {
gfx::RectF layer_damage_rect =
gfx::ScaleRect(tile->content_rect(), 1.f / tile->contents_scale());
AddDamageRect(layer_damage_rect);
+
+ DCHECK_EQ(0, uninitialized_tiles_required_for_activation_count_);
+ } else if (layer_tree_impl()->IsPendingTree()) {
+ if (tile->required_for_activation()) {
+ DCHECK_GT(uninitialized_tiles_required_for_activation_count_, 0);
+ --uninitialized_tiles_required_for_activation_count_;
+ }
}
}
@@ -735,7 +745,7 @@ ResourceProvider::ResourceId PictureLayerImpl::ContentsResourceId() const {
return tile_version.get_resource_id();
}
-void PictureLayerImpl::MarkVisibleResourcesAsRequired() const {
+void PictureLayerImpl::MarkVisibleResourcesAsRequired() {
DCHECK(layer_tree_impl()->IsPendingTree());
DCHECK(!layer_tree_impl()->needs_update_draw_properties());
DCHECK(ideal_contents_scale_);
@@ -843,7 +853,7 @@ bool PictureLayerImpl::MarkVisibleTilesAsRequired(
const PictureLayerTiling* optional_twin_tiling,
float contents_scale,
const gfx::Rect& rect,
- const Region& missing_region) const {
+ const Region& missing_region) {
bool twin_had_missing_tile = false;
for (PictureLayerTiling::CoverageIterator iter(tiling,
contents_scale,
@@ -870,8 +880,10 @@ bool PictureLayerImpl::MarkVisibleTilesAsRequired(
continue;
}
}
-
+ DCHECK(!tile->required_for_activation());
tile->MarkRequiredForActivation();
+ if (!tile->IsReadyToDraw())
+ ++uninitialized_tiles_required_for_activation_count_;
}
return twin_had_missing_tile;
}
diff --git a/cc/layers/picture_layer_impl.h b/cc/layers/picture_layer_impl.h
index bf24251..fc43b07 100644
--- a/cc/layers/picture_layer_impl.h
+++ b/cc/layers/picture_layer_impl.h
@@ -140,6 +140,14 @@ class CC_EXPORT PictureLayerImpl
WhichTree GetTree() const;
bool IsOnActiveOrPendingTree() const;
+ // Return the count of tiles on this layer that meet both of the following
+ // conditions:
+ // 1. The tile is required for activation.
+ // 2. The tile needs initialization (ie, it's not ready to draw).
+ int UninitializedTilesRequiredForActivationCount() const {
+ return uninitialized_tiles_required_for_activation_count_;
+ }
+
protected:
friend class LayerRasterTileIterator;
@@ -163,13 +171,13 @@ class CC_EXPORT PictureLayerImpl
float SnappedContentsScale(float new_contents_scale);
void UpdateLCDTextStatus(bool new_status);
void ResetRasterScale();
- void MarkVisibleResourcesAsRequired() const;
+ void MarkVisibleResourcesAsRequired();
bool MarkVisibleTilesAsRequired(
PictureLayerTiling* tiling,
const PictureLayerTiling* optional_twin_tiling,
float contents_scale,
const gfx::Rect& rect,
- const Region& missing_region) const;
+ const Region& missing_region);
void DoPostCommitInitializationIfNeeded() {
if (needs_post_commit_initialization_)
@@ -221,6 +229,8 @@ class CC_EXPORT PictureLayerImpl
gfx::Size viewport_size_for_tile_priority_;
gfx::Transform screen_space_transform_for_tile_priority_;
+ int uninitialized_tiles_required_for_activation_count_;
+
friend class PictureLayer;
DISALLOW_COPY_AND_ASSIGN(PictureLayerImpl);
};
diff --git a/cc/resources/tile_manager.cc b/cc/resources/tile_manager.cc
index 38948c3..eb389c5 100644
--- a/cc/resources/tile_manager.cc
+++ b/cc/resources/tile_manager.cc
@@ -675,7 +675,8 @@ void TileManager::GetTilesWithAssignedBins(PrioritizedTileSet* tiles) {
// should keep it in the prioritized tile set to ensure that AssignGpuMemory
// can visit it.
if (mts.bin == NEVER_BIN &&
- !mts.tile_versions[mts.raster_mode].raster_task_) {
+ !mts.tile_versions[mts.raster_mode].raster_task_ &&
+ !tile->required_for_activation()) {
FreeResourcesForTile(tile);
continue;
}
@@ -840,6 +841,7 @@ void TileManager::AssignGpuMemoryToTiles(
size_t max_raster_bytes = max_raster_usage_bytes_ / 2;
size_t raster_bytes = 0;
+ int processed_required_for_activation_tile_count = 0;
unsigned schedule_priority = 1u;
for (PrioritizedTileSet::Iterator it(tiles, true); it; ++it) {
Tile* tile = *it;
@@ -859,6 +861,8 @@ void TileManager::AssignGpuMemoryToTiles(
// If the tile is not needed, free it up.
if (mts.bin == NEVER_BIN) {
FreeResourcesForTile(tile);
+ if (tile->required_for_activation())
+ ++processed_required_for_activation_tile_count;
continue;
}
@@ -917,8 +921,10 @@ void TileManager::AssignGpuMemoryToTiles(
hard_bytes_left -= tile_bytes;
soft_bytes_left =
(soft_bytes_left > tile_bytes) ? soft_bytes_left - tile_bytes : 0;
- if (tile_version.resource_)
+ if (tile_version.resource_) {
+ DCHECK(tile->IsReadyToDraw());
continue;
+ }
}
DCHECK(!tile_version.resource_);
@@ -937,16 +943,30 @@ void TileManager::AssignGpuMemoryToTiles(
if (!can_schedule_tile) {
all_tiles_that_need_to_be_rasterized_have_memory_ = false;
- if (tile->required_for_activation())
- all_tiles_required_for_activation_have_memory_ = false;
it.DisablePriorityOrdering();
continue;
}
raster_bytes = raster_bytes_if_rastered;
tiles_that_need_to_be_rasterized->push_back(tile);
+ if (tile->required_for_activation())
+ ++processed_required_for_activation_tile_count;
+ }
+
+ int total_required_for_activation_tile_count = 0;
+ for (std::vector<PictureLayerImpl*>::const_iterator it = layers_.begin();
+ it != layers_.end();
+ ++it) {
+ if ((*it)->GetTree() == PENDING_TREE) {
+ total_required_for_activation_tile_count +=
+ (*it)->UninitializedTilesRequiredForActivationCount();
+ }
}
+ all_tiles_required_for_activation_have_memory_ =
+ processed_required_for_activation_tile_count ==
+ total_required_for_activation_tile_count;
+
// OOM reporting uses hard-limit, soft-OOM is normal depending on limit.
ever_exceeded_memory_budget_ |= oomed_hard;
if (ever_exceeded_memory_budget_) {
diff --git a/cc/test/fake_tile_manager_client.h b/cc/test/fake_tile_manager_client.h
index dd368b9..5e76e27 100644
--- a/cc/test/fake_tile_manager_client.h
+++ b/cc/test/fake_tile_manager_client.h
@@ -9,6 +9,8 @@
namespace cc {
+class Tile;
+
class FakeTileManagerClient : public TileManagerClient {
public:
virtual ~FakeTileManagerClient() {}
generated by cgit v1.1 at 2025-03-18 04:24:39 +0000