summaryrefslogtreecommitdiffstats
path: root/cc
diff options
context:
space:
mode:
authoralokp@chromium.org <alokp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-14 01:40:21 +0000
committeralokp@chromium.org <alokp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-14 01:40:21 +0000
commit4a530a65a2aaa867215115af0348df70908e0c66 (patch)
tree0201ae83e01b33d93333551b60e8175cfaa021d4 /cc
parent7058e8d37174aa6c03e946ec2164c538f0beee2a (diff)
downloadchromium_src-4a530a65a2aaa867215115af0348df70908e0c66.zip
chromium_src-4a530a65a2aaa867215115af0348df70908e0c66.tar.gz
chromium_src-4a530a65a2aaa867215115af0348df70908e0c66.tar.bz2
cc: Removed TileVersion::has_text.
This is dead code after r276918. AnalysisCanvas also no longer needs to keep looking for text. We can abort earlier. I will do that in a separate patch. BUG=368513 Review URL: https://codereview.chromium.org/332983002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@277151 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc')
-rw-r--r--cc/resources/managed_tile_state.cc4
-rw-r--r--cc/resources/managed_tile_state.h4
-rw-r--r--cc/resources/tile.h4
-rw-r--r--cc/resources/tile_manager.cc1
4 files changed, 2 insertions, 11 deletions
diff --git a/cc/resources/managed_tile_state.cc b/cc/resources/managed_tile_state.cc
index d1bf9ac..0374327 100644
--- a/cc/resources/managed_tile_state.cc
+++ b/cc/resources/managed_tile_state.cc
@@ -54,8 +54,8 @@ ManagedTileState::ManagedTileState()
visible_and_ready_to_draw(false),
scheduled_priority(0) {}
-ManagedTileState::TileVersion::TileVersion()
- : mode_(RESOURCE_MODE), has_text_(false) {}
+ManagedTileState::TileVersion::TileVersion() : mode_(RESOURCE_MODE) {
+}
ManagedTileState::TileVersion::~TileVersion() { DCHECK(!resource_); }
diff --git a/cc/resources/managed_tile_state.h b/cc/resources/managed_tile_state.h
index b3d80bb..7224dd6 100644
--- a/cc/resources/managed_tile_state.h
+++ b/cc/resources/managed_tile_state.h
@@ -76,7 +76,6 @@ class CC_EXPORT ManagedTileState {
size_t GPUMemoryUsageInBytes() const;
void SetSolidColorForTesting(SkColor color) { set_solid_color(color); }
- void SetHasTextForTesting(bool has_text) { has_text_ = has_text; }
void SetResourceForTesting(scoped_ptr<ScopedResource> resource) {
resource_ = resource.Pass();
}
@@ -94,13 +93,10 @@ class CC_EXPORT ManagedTileState {
solid_color_ = color;
}
- void set_has_text(bool has_text) { has_text_ = has_text; }
-
void set_rasterize_on_demand() { mode_ = PICTURE_PILE_MODE; }
Mode mode_;
SkColor solid_color_;
- bool has_text_;
scoped_ptr<ScopedResource> resource_;
scoped_refptr<RasterTask> raster_task_;
};
diff --git a/cc/resources/tile.h b/cc/resources/tile.h
index f231155..69ef56f 100644
--- a/cc/resources/tile.h
+++ b/cc/resources/tile.h
@@ -101,10 +101,6 @@ class CC_EXPORT Tile : public RefCountedManaged<Tile> {
}
gfx::Rect opaque_rect() const { return opaque_rect_; }
- bool has_text(RasterMode mode) const {
- return managed_state_.tile_versions[mode].has_text_;
- }
-
float contents_scale() const { return contents_scale_; }
gfx::Rect content_rect() const { return content_rect_; }
diff --git a/cc/resources/tile_manager.cc b/cc/resources/tile_manager.cc
index e569410..9c3e473 100644
--- a/cc/resources/tile_manager.cc
+++ b/cc/resources/tile_manager.cc
@@ -1138,7 +1138,6 @@ void TileManager::OnRasterTaskCompleted(
++update_visible_tiles_stats_.completed_count;
- tile_version.set_has_text(analysis.has_text);
if (analysis.is_solid_color) {
tile_version.set_solid_color(analysis.solid_color);
resource_pool_->ReleaseResource(resource.Pass());