| Index: src/gpu/batches/GrCopySurfaceBatch.h
|
| diff --git a/src/gpu/batches/GrCopySurfaceBatch.h b/src/gpu/batches/GrCopySurfaceBatch.h
|
| index ed5e77f5b061d9bce393c3a30f4f2f3eeffe410a..584bbab5d7b805d656b68f992db30b2ae54da13f 100644
|
| --- a/src/gpu/batches/GrCopySurfaceBatch.h
|
| +++ b/src/gpu/batches/GrCopySurfaceBatch.h
|
| @@ -15,8 +15,6 @@
|
|
|
| class GrCopySurfaceBatch final : public GrBatch {
|
| public:
|
| - DEFINE_BATCH_CLASS_ID
|
| -
|
| static GrBatch* Create(GrSurface* dst, GrSurface* src, const SkIRect& srcRect,
|
| const SkIPoint& dstPoint);
|
|
|
| @@ -39,11 +37,11 @@
|
| private:
|
| GrCopySurfaceBatch(GrSurface* dst, GrSurface* src, const SkIRect& srcRect,
|
| const SkIPoint& dstPoint)
|
| - : INHERITED(ClassID())
|
| - , fDst(dst)
|
| + : fDst(dst)
|
| , fSrc(src)
|
| , fSrcRect(srcRect)
|
| , fDstPoint(dstPoint) {
|
| + this->initClassID<GrCopySurfaceBatch>();
|
| fBounds = SkRect::MakeXYWH(SkIntToScalar(dstPoint.fX), SkIntToScalar(dstPoint.fY),
|
| SkIntToScalar(srcRect.width()), SkIntToScalar(srcRect.height()));
|
| }
|
| @@ -60,8 +58,6 @@
|
| GrPendingIOResource<GrSurface, kRead_GrIOType> fSrc;
|
| SkIRect fSrcRect;
|
| SkIPoint fDstPoint;
|
| -
|
| - typedef GrBatch INHERITED;
|
| };
|
|
|
| #endif
|
|
|