| Index: src/core/SkRecordDraw.h
|
| diff --git a/src/core/SkRecordDraw.h b/src/core/SkRecordDraw.h
|
| index 593674edddee936ca14a55bcd86b01a3a1790b05..7bbab81b5aeb479d84b4b26c66d99fdf978f6001 100644
|
| --- a/src/core/SkRecordDraw.h
|
| +++ b/src/core/SkRecordDraw.h
|
| @@ -13,7 +13,7 @@
|
| #include "SkMatrix.h"
|
| #include "SkRecord.h"
|
|
|
| -class SkCanvasDrawable;
|
| +class SkDrawable;
|
| 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[],
|
| - SkCanvasDrawable* const drawables[], int drawableCount,
|
| + SkDrawable* 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[],
|
| - SkCanvasDrawable* const drawables[], int drawableCount,
|
| + SkDrawable* 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;
|
| - SkCanvasDrawable* const* fDrawables;
|
| + SkDrawable* const* fDrawables;
|
| int fDrawableCount;
|
| };
|
|
|
|
|