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

Unified Diff: cc/resources/picture_pile_impl.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.cc ('k') | cc/resources/picture_pile_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/resources/picture_pile_impl.cc
diff --git a/cc/resources/picture_pile_impl.cc b/cc/resources/picture_pile_impl.cc
index 90713b4fc7e2a81ee1f30afccf58f2cb0c11723f..db824e36b05122d297e70ea0d5c4014868bfff63 100644
--- a/cc/resources/picture_pile_impl.cc
+++ b/cc/resources/picture_pile_impl.cc
@@ -113,7 +113,7 @@ void PicturePileImpl::RasterToBitmap(
// texel (since the recording won't cover it) and outside the last texel
// (due to linear filtering when using this texture).
gfx::Rect content_tiling_rect = gfx::ToEnclosingRect(
- gfx::ScaleRect(tiling_.tiling_rect(), contents_scale));
+ gfx::ScaleRect(gfx::Rect(tiling_.tiling_size()), contents_scale));
// The final texel of content may only be partially covered by a
// rasterization; this rect represents the content rect that is fully
@@ -269,7 +269,7 @@ void PicturePileImpl::RasterCommon(
canvas->translate(-canvas_rect.x(), -canvas_rect.y());
gfx::Rect content_tiling_rect = gfx::ToEnclosingRect(
- gfx::ScaleRect(tiling_.tiling_rect(), contents_scale));
+ gfx::ScaleRect(gfx::Rect(tiling_.tiling_size()), contents_scale));
content_tiling_rect.Intersect(canvas_rect);
canvas->clipRect(gfx::RectToSkRect(content_tiling_rect),
@@ -345,7 +345,7 @@ void PicturePileImpl::RasterCommon(
skia::RefPtr<SkPicture> PicturePileImpl::GetFlattenedPicture() {
TRACE_EVENT0("cc", "PicturePileImpl::GetFlattenedPicture");
- gfx::Rect tiling_rect(tiling_.tiling_rect());
+ gfx::Rect tiling_rect(tiling_.tiling_size());
SkPictureRecorder recorder;
SkCanvas* canvas =
recorder.beginRecording(tiling_rect.width(), tiling_rect.height());
@@ -374,7 +374,7 @@ void PicturePileImpl::AnalyzeInRect(
gfx::Rect layer_rect = gfx::ScaleToEnclosingRect(
content_rect, 1.0f / contents_scale);
- layer_rect.Intersect(tiling_.tiling_rect());
+ layer_rect.Intersect(gfx::Rect(tiling_.tiling_size()));
skia::AnalysisCanvas canvas(layer_rect.width(), layer_rect.height());
« no previous file with comments | « cc/resources/picture_pile_base.cc ('k') | cc/resources/picture_pile_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698