diff options
| author |  mtklein <mtklein@chromium.org> | 2014-09-30 11:43:53 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-09-30 11:43:53 -0700 |
| commit | 8de02f4bf3dfb6178132231d03caec9f9a5d0beb (patch) | |
| tree | b411e0bc7972af80ff23ba5ec49b2d65682b5ea3 /src | |
| parent | b5a97154f893a5fd3495e16872d370124e93c6ca (diff) | |
Clean up SK_PICTURE_USE_SK_RECORD and SK_PICTURE_OPTIMIZE_SK_RECORD.
This folds the code through as if they were defined, which is the explicit
state in both our build and Chrome's.
This leaves the EXPERIMENTAL_ and DEPRECATED_ hooks in to be cleaned up or
privatized later.
CQ_EXTRA_TRYBOTS=tryserver.skia:Canary-Chrome-Ubuntu13.10-Ninja-x86_64-ToT-Trybot
BUG=skia:
R=reed@google.com, robertphillips@google.com, mtklein@google.com
Author: mtklein@chromium.org
Review URL: https://codereview.chromium.org/616033002
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); } |