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

Unified Diff: cc/resources/picture_pile_base.cc

Issue 389973004: cc: Give TilingData back a Size instead of a Rect. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: tilingsize: comments Created 6 years, 5 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_base.h ('k') | cc/resources/picture_pile_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/resources/picture_pile_base.cc
diff --git a/cc/resources/picture_pile_base.cc b/cc/resources/picture_pile_base.cc
index 1c3f4afceaeb97d13079425c96d56e0abf3faab7..55209dbf86ff1d2220b56f01fd35690ba9944943 100644
--- a/cc/resources/picture_pile_base.cc
+++ b/cc/resources/picture_pile_base.cc
@@ -155,11 +155,11 @@ bool PicturePileBase::HasRecordingAt(int x, int y) {
bool PicturePileBase::CanRaster(float contents_scale,
const gfx::Rect& content_rect) {
- if (tiling_.tiling_rect().IsEmpty())
+ if (tiling_.tiling_size().IsEmpty())
return false;
gfx::Rect layer_rect = gfx::ScaleToEnclosingRect(
content_rect, 1.f / contents_scale);
- layer_rect.Intersect(tiling_.tiling_rect());
+ layer_rect.Intersect(gfx::Rect(tiling_.tiling_size()));
// Common case inside of viewport to avoid the slower map lookups.
if (recorded_viewport_.Contains(layer_rect)) {
@@ -200,7 +200,7 @@ gfx::Rect PicturePileBase::PadRect(const gfx::Rect& rect) {
scoped_ptr<base::Value> PicturePileBase::AsValue() const {
scoped_ptr<base::ListValue> pictures(new base::ListValue());
- gfx::Rect tiling_rect(tiling_.tiling_rect());
+ gfx::Rect tiling_rect(tiling_.tiling_size());
std::set<void*> appended_pictures;
bool include_borders = true;
for (TilingData::Iterator tile_iter(&tiling_, tiling_rect, include_borders);
« no previous file with comments | « cc/resources/picture_pile_base.h ('k') | cc/resources/picture_pile_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698