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

Unified Diff: cc/resources/picture_pile_base.h

Issue 196023015: Revert of cc: Replace recorded region with direct map lookup (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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/picture_pile.cc ('k') | cc/resources/picture_pile_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/resources/picture_pile_base.h
diff --git a/cc/resources/picture_pile_base.h b/cc/resources/picture_pile_base.h
index afdf1d9a290830e4704e3b53437a877df57754d6..26f6bdbefb7ef540d29a1bc6efdf6b69a588c72c 100644
--- a/cc/resources/picture_pile_base.h
+++ b/cc/resources/picture_pile_base.h
@@ -33,14 +33,14 @@
gfx::Size size() const { return tiling_.total_size(); }
void SetMinContentsScale(float min_contents_scale);
+ void UpdateRecordedRegion();
+ const Region& recorded_region() const { return recorded_region_; }
+
int num_tiles_x() const { return tiling_.num_tiles_x(); }
int num_tiles_y() const { return tiling_.num_tiles_y(); }
gfx::Rect tile_bounds(int x, int y) const { return tiling_.TileBounds(x, y); }
bool HasRecordingAt(int x, int y);
bool CanRaster(float contents_scale, const gfx::Rect& content_rect);
-
- // If this pile contains any valid recordings. May have false positives.
- bool HasRecordings() const { return has_any_recordings_; }
static void ComputeTileGridInfo(const gfx::Size& tile_grid_size,
SkTileGridPicture::TileGridInfo* info);
@@ -84,22 +84,21 @@
virtual ~PicturePileBase();
+ void SetRecordedRegionForTesting(const Region& recorded_region) {
+ recorded_region_ = recorded_region;
+ }
+
int buffer_pixels() const { return tiling_.border_texels(); }
void Clear();
gfx::Rect PaddedRect(const PictureMapKey& key);
gfx::Rect PadRect(const gfx::Rect& rect);
- // An internal CanRaster check that goes to the picture_map rather than
- // using the recorded_viewport hint.
- bool CanRasterSlowTileCheck(const gfx::Rect& layer_rect) const;
-
// A picture pile is a tiled set of pictures. The picture map is a map of tile
// indices to picture infos.
PictureMap picture_map_;
TilingData tiling_;
- // If non-empty, all pictures tiles inside this rect are recorded.
- gfx::Rect recorded_viewport_;
+ Region recorded_region_;
float min_contents_scale_;
SkTileGridPicture::TileGridInfo tile_grid_info_;
SkColor background_color_;
@@ -107,9 +106,6 @@
bool contents_opaque_;
bool show_debug_picture_borders_;
bool clear_canvas_with_debug_color_;
- // A hint about whether there are any recordings. This may be a false
- // positive.
- bool has_any_recordings_;
private:
void SetBufferPixels(int buffer_pixels);
« no previous file with comments | « cc/resources/picture_pile.cc ('k') | cc/resources/picture_pile_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698