use picture->cullRect instead of (deprecated) width/height

BUG=

Review URL: https://codereview.chromium.org/797753003

Cr-Commit-Position: refs/heads/master@{#308198}

android_webview/native/aw_picture.cc

@@ -23,17 +23,18 @@ void AwPicture::Destroy(JNIEnv* env, jobject obj) {
 }
 
 jint AwPicture::GetWidth(JNIEnv* env, jobject obj) {
-  return picture_->width();
+  return picture_->cullRect().roundOut().width();
 }
 
 jint AwPicture::GetHeight(JNIEnv* env, jobject obj) {
-  return picture_->height();
+  return picture_->cullRect().roundOut().height();
 }
 
 void AwPicture::Draw(JNIEnv* env, jobject obj, jobject canvas) {
+  const SkIRect bounds = picture_->cullRect().roundOut();
   scoped_ptr<SoftwareCanvasHolder> canvas_holder = SoftwareCanvasHolder::Create(
       canvas, gfx::Vector2d(),
-      gfx::Size(picture_->width(), picture_->height()));
+      gfx::Size(bounds.width(), bounds.height()));
   if (!canvas_holder || !canvas_holder->GetCanvas()) {
     LOG(ERROR) << "Couldn't draw picture";
     return;

cc/resources/picture.cc

@@ -121,7 +121,7 @@ scoped_refptr<Picture> Picture::CreateFromSkpValue(const base::Value* value) {
   if (skpicture == NULL)
     return NULL;
 
-  gfx::Rect layer_rect(skpicture->width(), skpicture->height());
+  gfx::Rect layer_rect(gfx::SkIRectToRect(skpicture->cullRect().roundOut()));
   return make_scoped_refptr(new Picture(skpicture, layer_rect));
 }
 

skia/config/SkUserConfig.h

@@ -265,9 +265,11 @@ SK_API void SkDebugf_FileLine(const char* file, int line, bool fatal,
 #   define SK_IGNORE_GPU_DITHER
 #endif
 
+#if 0
 #ifndef    SK_LEGACY_PICTURE_SIZE_API
 #   define SK_LEGACY_PICTURE_SIZE_API
 #endif
+#endif
 
 #ifndef    SK_LEGACY_PICTURE_DRAW_API
 #   define SK_LEGACY_PICTURE_DRAW_API

skia/ext/pixel_ref_utils.cc

@@ -351,15 +351,17 @@ void PixelRefUtils::GatherDiscardablePixelRefs(
   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->width(), picture->height()));
+  empty_bitmap.setInfo(SkImageInfo::MakeUnknown(picture_ibounds.width(),
+                                                picture_ibounds.height()));
 
   GatherPixelRefDevice device(empty_bitmap, &pixel_ref_set);
   SkNoSaveLayerCanvas canvas(&device);
 
-  canvas.clipRect(SkRect::MakeWH(picture->width(), picture->height()),
-                  SkRegion::kIntersect_Op,
-                  false);
+  // Draw the picture pinned against our top/left corner.
+  canvas.translate(-picture_bounds.left(), -picture_bounds.top());
   canvas.drawPicture(picture);
 }