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

Unified Diff: cc/resources/tile.h

Issue 1132443003: cc: Move raster_source from Tile to PrioritizedTile (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rename var Created 5 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
« no previous file with comments | « cc/resources/prioritized_tile.cc ('k') | cc/resources/tile.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/resources/tile.h
diff --git a/cc/resources/tile.h b/cc/resources/tile.h
index 4d41ebff7844d0be6406f50daaa2b72555c5e825..25e9265b54de2c52e49ffcee6262a7a13d03f8d5 100644
--- a/cc/resources/tile.h
+++ b/cc/resources/tile.h
@@ -13,6 +13,7 @@
namespace cc {
+class PrioritizedTile;
class TileManager;
struct TilePriority;
@@ -31,10 +32,6 @@ class CC_EXPORT Tile {
return id_;
}
- RasterSource* raster_source() { return raster_source_.get(); }
-
- const RasterSource* raster_source() const { return raster_source_.get(); }
-
// TODO(vmpstr): Move this to the iterators.
bool required_for_activation() const { return required_for_activation_; }
void set_required_for_activation(bool is_required) {
@@ -55,8 +52,7 @@ class CC_EXPORT Tile {
!draw_info_.IsReadyToDraw();
}
- void AsValueWithPriorityInto(const TilePriority& priority,
- base::trace_event::TracedValue* dict) const;
+ void AsValueInto(base::trace_event::TracedValue* value) const;
inline bool IsReadyToDraw() const { return draw_info_.IsReadyToDraw(); }
@@ -71,14 +67,6 @@ class CC_EXPORT Tile {
int source_frame_number() const { return source_frame_number_; }
- void set_raster_source(RasterSource* raster_source) {
- DCHECK(raster_source->CoversRect(content_rect_, contents_scale_))
- << "Recording rect: "
- << gfx::ScaleToEnclosingRect(content_rect_, 1.f / contents_scale_)
- .ToString();
- raster_source_ = raster_source;
- }
-
size_t GPUMemoryUsageInBytes() const;
gfx::Size desired_texture_size() const { return desired_texture_size_; }
@@ -109,7 +97,6 @@ class CC_EXPORT Tile {
bool HasRasterTask() const { return !!raster_task_.get(); }
TileManager* tile_manager_;
- scoped_refptr<RasterSource> raster_source_;
gfx::Size desired_texture_size_;
gfx::Rect content_rect_;
float contents_scale_;
« no previous file with comments | « cc/resources/prioritized_tile.cc ('k') | cc/resources/tile.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698