Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / skia / src / utils / SkPictureUtils.cpp

diff --git a/src/third_party/skia/src/utils/SkPictureUtils.cpp b/src/third_party/skia/src/utils/SkPictureUtils.cpp
index 702a78d..4f4d2bf 100644 (file)
--- a/src/third_party/skia/src/utils/SkPictureUtils.cpp
+++ b/src/third_party/skia/src/utils/SkPictureUtils.cpp
@@ -190,22 +190,22 @@ private:
     typedef SkBaseDevice INHERITED;
 };
 
-SkData* SkPictureUtils::GatherPixelRefs(SkPicture* pict, const SkRect& area) {
+SkData* SkPictureUtils::GatherPixelRefs(const SkPicture* pict, const SkRect& area) {
     if (NULL == pict) {
         return NULL;
     }
 
     // this test also handles if either area or pict's width/height are empty
-    if (!SkRect::Intersects(area,
-                            SkRect::MakeWH(SkIntToScalar(pict->width()),
-                                           SkIntToScalar(pict->height())))) {
+    if (!SkRect::Intersects(area, pict->cullRect())) {
         return NULL;
     }
 
     SkTDArray<SkPixelRef*> array;
     PixelRefSet prset(&array);
 
-    GatherPixelRefDevice device(pict->width(), pict->height(), &prset);
+    GatherPixelRefDevice device(SkScalarCeilToInt(pict->cullRect().width()), 
+                                SkScalarCeilToInt(pict->cullRect().height()), 
+                                &prset);
     SkNoSaveLayerCanvas canvas(&device);
 
     canvas.clipRect(area, SkRegion::kIntersect_Op, false);