diff options
| author |  reed <reed@google.com> | 2015-02-06 08:20:07 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-02-06 08:20:07 -0800 |
| commit | c4e87724920222a218f31b22612efc5b1ec0ed6c (patch) | |
| tree | 430afe3af23867684e9b75b487a3e06281ce5a8e /src/core/SkRecorder.h | |
| parent | 4ae9eb7463cf2160723407359608f221c0d5e2a6 (diff) | |
Revert of rename SkCanvasDrawable to SkDrawable, and make public (patchset #2 id:20001 of https://codereview.chromium.org/903993002/)
Reason for revert:
bug in gyp
Original issue's description:
> rename SkCanvasDrawable to SkDrawable, and make public
>
> BUG=skia:
> NOTRY=True
> ... winbuilder flake
>
> Committed: https://skia.googlesource.com/skia/+/4ae9eb7463cf2160723407359608f221c0d5e2a6
TBR=robertphillips@google.com,djsollen@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/882853006
Diffstat (limited to 'src/core/SkRecorder.h')
| -rw-r--r-- | src/core/SkRecorder.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/core/SkRecorder.h b/src/core/SkRecorder.h index 130dce9ebc..611dbbdcd7 100644 --- a/src/core/SkRecorder.h +++ b/src/core/SkRecorder.h @@ -15,20 +15,20 @@ class SkBBHFactory; -class SkDrawableList : SkNoncopyable { +class SkCanvasDrawableList : SkNoncopyable { public: - ~SkDrawableList(); + ~SkCanvasDrawableList(); int count() const { return fArray.count(); } - SkDrawable* const* begin() const { return fArray.begin(); } + SkCanvasDrawable* const* begin() const { return fArray.begin(); } - void append(SkDrawable* drawable); + void append(SkCanvasDrawable* drawable); // Return a new or ref'd array of pictures that were snapped from our drawables. SkPicture::SnapshotArray* newDrawableSnapshot(); private: - SkTDArray<SkDrawable*> fArray; + SkTDArray<SkCanvasDrawable*> fArray; }; // SkRecorder provides an SkCanvas interface for recording into an SkRecord. @@ -39,8 +39,8 @@ public: SkRecorder(SkRecord*, int width, int height); // legacy version SkRecorder(SkRecord*, const SkRect& bounds); - SkDrawableList* getDrawableList() const { return fDrawableList.get(); } - SkDrawableList* detachDrawableList() { return fDrawableList.detach(); } + SkCanvasDrawableList* getDrawableList() const { return fDrawableList.get(); } + SkCanvasDrawableList* detachDrawableList() { return fDrawableList.detach(); } // Make SkRecorder forget entirely about its SkRecord*; all calls to SkRecorder will fail. void forgetRecord(); @@ -54,7 +54,7 @@ public: void didSetMatrix(const SkMatrix&) SK_OVERRIDE; void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) SK_OVERRIDE; - void onDrawDrawable(SkDrawable*) SK_OVERRIDE; + void onDrawDrawable(SkCanvasDrawable*) SK_OVERRIDE; void onDrawText(const void* text, size_t byteLength, SkScalar x, @@ -131,7 +131,7 @@ private: SkRecord* fRecord; - SkAutoTDelete<SkDrawableList> fDrawableList; + SkAutoTDelete<SkCanvasDrawableList> fDrawableList; }; #endif//SkRecorder_DEFINED |