cc: Plumb more details about pixel refs to tile manager.

skia/ext/pixel_ref_utils.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "skia/ext/pixel_ref_utils.h"
 
 #include <algorithm>
 
 #include "third_party/skia/include/core/SkBitmapDevice.h"
 #include "third_party/skia/include/core/SkCanvas.h"
@@ skipping 81 matching lines @@
 
     GatherPixelRefDevice::drawRect(draw, bounds, paint);
   }
   void drawRect(const SkDraw& draw,
                 const SkRect& rect,
                 const SkPaint& paint) override {
     SkBitmap bitmap;
     if (GetBitmapFromPaint(paint, &bitmap)) {
       SkRect mapped_rect;
       draw.fMatrix->mapRect(&mapped_rect, rect);
-      if (mapped_rect.intersect(SkRect::Make(draw.fRC->getBounds()))) {
+      if (mapped_rect.intersects(SkRect::Make(draw.fRC->getBounds()))) {
         AddBitmap(bitmap, mapped_rect, *draw.fMatrix, paint.getFilterQuality());
       }
     }
   }
   void drawOval(const SkDraw& draw,
                 const SkRect& rect,
                 const SkPaint& paint) override {
     GatherPixelRefDevice::drawRect(draw, rect, paint);
   }
   void drawRRect(const SkDraw& draw,
@@ skipping 221 matching lines @@
   }
 
  private:
   DiscardablePixelRefSet* pixel_ref_set_;
 
   void AddBitmap(const SkBitmap& bm,
                  const SkRect& rect,
                  const SkMatrix& matrix,
                  SkFilterQuality filter_quality) {
     SkRect canvas_rect = SkRect::MakeWH(width(), height());
-    SkRect paint_rect = SkRect::MakeEmpty();
-    if (paint_rect.intersect(rect, canvas_rect)) {
-      pixel_ref_set_->Add(bm.pixelRef(), paint_rect, matrix,
-                          filter_quality);
+    if (rect.intersects(canvas_rect)) {
+      pixel_ref_set_->Add(bm.pixelRef(), rect, matrix, filter_quality);
     }
   }
 
   bool GetBitmapFromPaint(const SkPaint& paint, SkBitmap* bm) {
     SkShader* shader = paint.getShader();
     if (shader) {
       // Check whether the shader is a gradient in order to prevent generation
       // of bitmaps from gradient shaders, which implement asABitmap.
       if (SkShader::kNone_GradientType == shader->asAGradient(NULL))
         return shader->asABitmap(bm, NULL, NULL);
     }
     return false;
   }
 };
 
 }  // namespace
 
 void PixelRefUtils::GatherDiscardablePixelRefs(
     SkPicture* picture,
     std::vector<PositionPixelRef>* pixel_refs) {
   pixel_refs->clear();
   DiscardablePixelRefSet pixel_ref_set(pixel_refs);
 
   SkRect picture_bounds = picture->cullRect();
   SkIRect picture_ibounds = picture_bounds.roundOut();
   SkBitmap empty_bitmap;
-  empty_bitmap.setInfo(SkImageInfo::MakeUnknown(picture_ibounds.width(),
-                                                picture_ibounds.height()));
+  empty_bitmap.setInfo(SkImageInfo::MakeUnknown(picture_ibounds.right(),

[weiliangc, 2015/08/07 22:56:00]

Just to double check, this won't need more memory right?

[vmpstr, 2015/08/10 17:36:05]

It shouldn't, since we don't allocate any memory for this. +reed to ensure my
understanding is correct.

+                                                picture_ibounds.bottom()));
 
   GatherPixelRefDevice device(empty_bitmap, &pixel_ref_set);
   SkNoSaveLayerCanvas canvas(&device);
 
-  // Draw the picture pinned against our top/left corner.
-  canvas.translate(-picture_bounds.left(), -picture_bounds.top());
   canvas.drawPicture(picture);
 }
 
 }  // namespace skia