diff options
author | reed <reed@google.com> | 2015-02-06 08:36:15 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-02-06 08:36:15 -0800 |
commit | 3cb3840c9af6f70896cf5565a38d4ee03c02d767 (patch) | |
tree | cca84070500dbdd9b4cc1e2b1a7d125964739e81 /src/core/SkPictureRecorder.cpp | |
parent | c4e87724920222a218f31b22612efc5b1ec0ed6c (diff) |
Rename SkCanvasDrawable to SkDrawable, and make public
(patchset #2 id:20001 of https://codereview.chromium.org/903993002/)"
This reverts commit c4e87724920222a218f31b22612efc5b1ec0ed6c.
BUG=skia:
TBR=
NOTREECHECKS=True
Review URL: https://codereview.chromium.org/898343004
Diffstat (limited to 'src/core/SkPictureRecorder.cpp')
-rw-r--r-- | src/core/SkPictureRecorder.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/core/SkPictureRecorder.cpp b/src/core/SkPictureRecorder.cpp index 69411d3bc3..42f8732c79 100644 --- a/src/core/SkPictureRecorder.cpp +++ b/src/core/SkPictureRecorder.cpp @@ -5,8 +5,8 @@ * found in the LICENSE file. */ -#include "SkCanvasDrawable.h" #include "SkData.h" +#include "SkDrawable.h" #include "SkLayerInfo.h" #include "SkPictureRecorder.h" #include "SkRecord.h" @@ -51,7 +51,7 @@ SkPicture* SkPictureRecorder::endRecordingAsPicture() { saveLayerData.reset(SkNEW_ARGS(SkLayerInfo, (key))); } - SkCanvasDrawableList* drawableList = fRecorder->getDrawableList(); + SkDrawableList* drawableList = fRecorder->getDrawableList(); SkPicture::SnapshotArray* pictList = drawableList ? drawableList->newDrawableSnapshot() : NULL; if (fBBH.get()) { @@ -82,8 +82,8 @@ void SkPictureRecorder::partialReplay(SkCanvas* canvas) const { } int drawableCount = 0; - SkCanvasDrawable* const* drawables = NULL; - SkCanvasDrawableList* drawableList = fRecorder->getDrawableList(); + SkDrawable* const* drawables = NULL; + SkDrawableList* drawableList = fRecorder->getDrawableList(); if (drawableList) { drawableCount = drawableList->count(); drawables = drawableList->begin(); @@ -93,15 +93,15 @@ void SkPictureRecorder::partialReplay(SkCanvas* canvas) const { /////////////////////////////////////////////////////////////////////////////////////////////////// -class SkRecordedDrawable : public SkCanvasDrawable { - SkAutoTUnref<SkRecord> fRecord; - SkAutoTUnref<SkBBoxHierarchy> fBBH; - SkAutoTDelete<SkCanvasDrawableList> fDrawableList; - const SkRect fBounds; - const bool fDoSaveLayerInfo; +class SkRecordedDrawable : public SkDrawable { + SkAutoTUnref<SkRecord> fRecord; + SkAutoTUnref<SkBBoxHierarchy> fBBH; + SkAutoTDelete<SkDrawableList> fDrawableList; + const SkRect fBounds; + const bool fDoSaveLayerInfo; public: - SkRecordedDrawable(SkRecord* record, SkBBoxHierarchy* bbh, SkCanvasDrawableList* drawableList, + SkRecordedDrawable(SkRecord* record, SkBBoxHierarchy* bbh, SkDrawableList* drawableList, const SkRect& bounds, bool doSaveLayerInfo) : fRecord(SkRef(record)) , fBBH(SkSafeRef(bbh)) @@ -114,7 +114,7 @@ protected: SkRect onGetBounds() SK_OVERRIDE { return fBounds; } void onDraw(SkCanvas* canvas) SK_OVERRIDE { - SkCanvasDrawable* const* drawables = NULL; + SkDrawable* const* drawables = NULL; int drawableCount = 0; if (fDrawableList) { drawables = fDrawableList->begin(); @@ -153,7 +153,7 @@ protected: } }; -SkCanvasDrawable* SkPictureRecorder::EXPERIMENTAL_endRecordingAsDrawable() { +SkDrawable* SkPictureRecorder::endRecordingAsDrawable() { // TODO: delay as much of this work until just before first playback? SkRecordOptimize(fRecord); @@ -161,10 +161,10 @@ SkCanvasDrawable* SkPictureRecorder::EXPERIMENTAL_endRecordingAsDrawable() { SkRecordFillBounds(fCullRect, *fRecord, fBBH.get()); } - SkCanvasDrawable* drawable = SkNEW_ARGS(SkRecordedDrawable, - (fRecord, fBBH, fRecorder->detachDrawableList(), - fCullRect, - SkToBool(fFlags & kComputeSaveLayerInfo_RecordFlag))); + SkDrawable* drawable = SkNEW_ARGS(SkRecordedDrawable, + (fRecord, fBBH, fRecorder->detachDrawableList(), + fCullRect, + SkToBool(fFlags & kComputeSaveLayerInfo_RecordFlag))); // release our refs now, so only the drawable will be the owner. fRecorder.reset(NULL); |