projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
85d523f
..
4f4d2bf
100644
(file)
--- a/
src/third_party/skia/src/utils/SkPictureUtils.cpp
+++ b/
src/third_party/skia/src/utils/SkPictureUtils.cpp
@@
-196,16
+196,16
@@
SkData* SkPictureUtils::GatherPixelRefs(const SkPicture* pict, const SkRect& are
}
// this test also handles if either area or pict's width/height are empty
}
// 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);
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);
SkNoSaveLayerCanvas canvas(&device);
canvas.clipRect(area, SkRegion::kIntersect_Op, false);