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/SkRecordDraw.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/SkRecordDraw.h')
| -rw-r--r-- | src/core/SkRecordDraw.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/SkRecordDraw.h b/src/core/SkRecordDraw.h index 7bbab81b5a..593674eddd 100644 --- a/src/core/SkRecordDraw.h +++ b/src/core/SkRecordDraw.h @@ -13,7 +13,7 @@ #include "SkMatrix.h" #include "SkRecord.h" -class SkDrawable; +class SkCanvasDrawable; class SkLayerInfo; // Fill a BBH to be used by SkRecordDraw to accelerate playback. @@ -25,7 +25,7 @@ void SkRecordComputeLayers(const SkRect& cullRect, const SkRecord& record, // Draw an SkRecord into an SkCanvas. A convenience wrapper around SkRecords::Draw. void SkRecordDraw(const SkRecord&, SkCanvas*, SkPicture const* const drawablePicts[], - SkDrawable* const drawables[], int drawableCount, + SkCanvasDrawable* const drawables[], int drawableCount, const SkBBoxHierarchy*, SkPicture::AbortCallback*); // Draw a portion of an SkRecord into an SkCanvas. @@ -43,7 +43,7 @@ namespace SkRecords { class Draw : SkNoncopyable { public: explicit Draw(SkCanvas* canvas, SkPicture const* const drawablePicts[], - SkDrawable* const drawables[], int drawableCount, + SkCanvasDrawable* const drawables[], int drawableCount, const SkMatrix* initialCTM = NULL) : fInitialCTM(initialCTM ? *initialCTM : canvas->getTotalMatrix()) , fCanvas(canvas) @@ -70,7 +70,7 @@ private: const SkMatrix fInitialCTM; SkCanvas* fCanvas; SkPicture const* const* fDrawablePicts; - SkDrawable* const* fDrawables; + SkCanvasDrawable* const* fDrawables; int fDrawableCount; }; |