From a7008403dcd03302e88e2df546d8427afe9e0e80 Mon Sep 17 00:00:00 2001 From: joshualitt Date: Thu, 17 Sep 2015 11:43:01 -0700 Subject: Revert of add a ClassID function to GrBatch (patchset #5 id:80001 of https://codereview.chromium.org/1352813003/ ) Reason for revert: breaks mac bot Original issue's description: > add a ClassID function to GrBatch > > BUG=skia: > > Committed: https://skia.googlesource.com/skia/+/4078d529e9e199eea13456db7bf3a63a104ab5b9 TBR=robertphillips@google.com,bsalomon@google.com,joshualitt@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Review URL: https://codereview.chromium.org/1345393003 --- src/gpu/batches/GrDiscardBatch.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'src/gpu/batches/GrDiscardBatch.h') diff --git a/src/gpu/batches/GrDiscardBatch.h b/src/gpu/batches/GrDiscardBatch.h index c13e7327d7..8a050a7122 100644 --- a/src/gpu/batches/GrDiscardBatch.h +++ b/src/gpu/batches/GrDiscardBatch.h @@ -15,11 +15,9 @@ class GrDiscardBatch final : public GrBatch { public: - DEFINE_BATCH_CLASS_ID - GrDiscardBatch(GrRenderTarget* rt) - : INHERITED(ClassID()) - , fRenderTarget(rt) { + : fRenderTarget(rt) { + this->initClassID(); fBounds = SkRect::MakeWH(SkIntToScalar(rt->width()), SkIntToScalar(rt->height())); } @@ -45,8 +43,6 @@ private: } GrPendingIOResource fRenderTarget; - - typedef GrBatch INHERITED; }; #endif -- cgit v1.2.3