Upstream version 10.39.225.0

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

diff --git a/src/third_party/skia/src/utils/SkGatherPixelRefsAndRects.cpp b/src/third_party/skia/src/utils/SkGatherPixelRefsAndRects.cpp
index f46fe8e..ee5b147 100644 (file)
--- a/src/third_party/skia/src/utils/SkGatherPixelRefsAndRects.cpp
+++ b/src/third_party/skia/src/utils/SkGatherPixelRefsAndRects.cpp
@@ -11,15 +11,15 @@
 
 void SkPictureUtils::GatherPixelRefsAndRects(SkPicture* pict,
                                              SkPictureUtils::SkPixelRefContainer* prCont) {
-    if (0 == pict->width() || 0 == pict->height()) {
+    if (pict->cullRect().isEmpty()) {
         return ;
     }
 
-    SkGatherPixelRefsAndRectsDevice device(pict->width(), pict->height(), prCont);
+    SkGatherPixelRefsAndRectsDevice device(SkScalarCeilToInt(pict->cullRect().width()), 
+                                           SkScalarCeilToInt(pict->cullRect().height()), 
+                                           prCont);
     SkNoSaveLayerCanvas canvas(&device);
 
-    canvas.clipRect(SkRect::MakeWH(SkIntToScalar(pict->width()),
-                                   SkIntToScalar(pict->height())),
-                    SkRegion::kIntersect_Op, false);
+    canvas.clipRect(pict->cullRect(), SkRegion::kIntersect_Op, false);
     canvas.drawPicture(pict);
 }