Index: include/core/SkPicture.h |
diff --git a/include/core/SkPicture.h b/include/core/SkPicture.h |
index 99bca367d987c4d3ca237580b4c9e5b51c73c0b8..c69db37ffa9ccff594be1de438451862589cc5c9 100644 |
--- a/include/core/SkPicture.h |
+++ b/include/core/SkPicture.h |
@@ -130,7 +130,7 @@ public: |
It does not necessarily reflect the bounds of what has been recorded into the picture. |
@return the cull rect used to create this picture |
*/ |
- const SkRect cullRect() const { return SkRect::MakeWH(fCullWidth, fCullHeight); } |
+ SkRect cullRect() const { return fCullRect; } |
/** Return a non-zero, unique value representing the picture. This call is |
only valid when not recording. Between a beginRecording/endRecording |
@@ -260,15 +260,14 @@ private: |
static bool IsValidPictInfo(const SkPictInfo& info); |
// Takes ownership of the SkRecord, refs the (optional) drawablePicts and BBH. |
- SkPicture(SkScalar width, SkScalar height, SkRecord*, SkData* drawablePicts, |
+ SkPicture(const SkRect& cullRect, SkRecord*, SkData* drawablePicts, |
SkBBoxHierarchy*); |
static SkPicture* Forwardport(const SkPictInfo&, const SkPictureData*); |
static SkPictureData* Backport(const SkRecord&, const SkPictInfo&, |
SkPicture const* const drawablePics[], int drawableCount); |
- const SkScalar fCullWidth; |
- const SkScalar fCullHeight; |
+ const SkRect fCullRect; |
mutable SkAutoTUnref<const AccelData> fAccelData; |
mutable SkTDArray<DeletionListener*> fDeletionListeners; // pointers are refed |
SkAutoTDelete<SkRecord> fRecord; |