diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/SkPicture.cpp | 2 | ||||
| -rw-r--r-- | src/core/SkPictureRecorder.cpp | 10 |
2 files changed, 3 insertions, 9 deletions
diff --git a/src/core/SkPicture.cpp b/src/core/SkPicture.cpp index eab0b927ab..10bbbcedb3 100644 --- a/src/core/SkPicture.cpp +++ b/src/core/SkPicture.cpp @@ -631,9 +631,7 @@ uint32_t SkPicture::uniqueID() const { static SkRecord* optimized(SkRecord* r) { -#ifdef SK_PICTURE_OPTIMIZE_SK_RECORD SkRecordOptimize(r); -#endif return r; } diff --git a/src/core/SkPictureRecorder.cpp b/src/core/SkPictureRecorder.cpp index 77274e675e..43111a5c6c 100644 --- a/src/core/SkPictureRecorder.cpp +++ b/src/core/SkPictureRecorder.cpp @@ -20,11 +20,7 @@ SkPictureRecorder::~SkPictureRecorder() {} SkCanvas* SkPictureRecorder::beginRecording(SkScalar width, SkScalar height, SkBBHFactory* bbhFactory /* = NULL */, uint32_t recordFlags /* = 0 */) { -#ifdef SK_PICTURE_USE_SK_RECORD return EXPERIMENTAL_beginRecording(width, height, bbhFactory); -#else - return DEPRECATED_beginRecording(width, height, bbhFactory, recordFlags); -#endif } SkCanvas* SkPictureRecorder::DEPRECATED_beginRecording(SkScalar width, SkScalar height, @@ -75,14 +71,14 @@ SkPicture* SkPictureRecorder::endRecording() { SkPicture* picture = NULL; if (fRecord.get()) { - picture = SkNEW_ARGS(SkPicture, (fCullWidth, fCullHeight, + picture = SkNEW_ARGS(SkPicture, (fCullWidth, fCullHeight, fRecord.detach(), fBBH.get())); } if (fPictureRecord.get()) { fPictureRecord->endRecording(); const bool deepCopyOps = false; - picture = SkNEW_ARGS(SkPicture, (fCullWidth, fCullHeight, + picture = SkNEW_ARGS(SkPicture, (fCullWidth, fCullHeight, *fPictureRecord.get(), deepCopyOps)); } @@ -106,7 +102,7 @@ void SkPictureRecorder::partialReplay(SkCanvas* canvas) const { if (fPictureRecord.get()) { const bool deepCopyOps = true; - SkPicture picture(fCullWidth, fCullHeight, + SkPicture picture(fCullWidth, fCullHeight, *fPictureRecord.get(), deepCopyOps); picture.playback(canvas); } |