cc: Apply contents scales to impl-side painting rasterization

cc: Apply contents scales to impl-side painting rasterization

Tiles now have a contents scale that they are rastered with, so that non-1.0
contents scales work.  Additionally, PictureLayer derives from
ContentsScalingLayer so that it picks up the right content bounds and default
contents scale.

BUG=155209
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=171111

[nduca, 2012-12-04 02:05:48]

lgtm ++

[commit-bot: I haz the power, 2012-12-04 02:07:59]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/enne@chromium.org/11421210/1

[commit-bot: I haz the power, 2012-12-04 03:57:31]

Retried try job too often on linux_rel for step(s) content_unittests

[commit-bot: I haz the power, 2012-12-04 03:59:48]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/enne@chromium.org/11421210/1

[commit-bot: I haz the power, 2012-12-04 11:48:02]

Failed to apply patch for cc/picture_pile_impl.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file cc/picture_pile_impl.cc
  Hunk #2 FAILED at 43.
  1 out of 2 hunks FAILED -- saving rejects to file cc/picture_pile_impl.cc.rej

Patch:       cc/picture_pile_impl.cc
Index: cc/picture_pile_impl.cc
diff --git a/cc/picture_pile_impl.cc b/cc/picture_pile_impl.cc
index
2f898281360bd2040aa0751840ebe096a5001ade..06b2de494858aa7cfffb8453e16c94fc0e1f0760
100644
--- a/cc/picture_pile_impl.cc
+++ b/cc/picture_pile_impl.cc
@@ -30,8 +30,11 @@ scoped_refptr<PicturePileImpl>
PicturePileImpl::CloneForDrawing() const {
   return clone;
 }
 
-void PicturePileImpl::Raster(SkCanvas* canvas, gfx::Rect rect,
-                             RenderingStats* stats) {
+void PicturePileImpl::Raster(
+    SkCanvas* canvas,
+    gfx::Rect rect,
+    float contents_scale,
+    RenderingStats* stats) {
   base::TimeTicks rasterizeBeginTime = base::TimeTicks::Now();
 
   // TODO(enne): do this more efficiently, i.e. top down with Skia clips
@@ -40,6 +43,7 @@ void PicturePileImpl::Raster(SkCanvas* canvas, gfx::Rect rect,
   SkRect layer_skrect = SkRect::MakeXYWH(rect.x(), rect.y(),
                                          rect.width(), rect.height());
   canvas->clipRect(layer_skrect);
+  canvas->scale(contents_scale, contents_scale);
   for (size_t i = 0; i < pile_.size(); ++i) {
     if (!pile_[i]->LayerRect().Intersects(rect))
       continue;

[commit-bot: I haz the power, 2012-12-04 16:22:43]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/enne@chromium.org/11421210/11

[commit-bot: I haz the power, 2012-12-04 18:33:55]

Retried try job too often on win_rel for step(s) content_browsertests

[commit-bot: I haz the power, 2012-12-04 23:57:38]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/enne@chromium.org/11421210/11

[commit-bot: I haz the power, 2012-12-05 01:15:55]

Change committed as 171111