From e3beb6bd7de7fa211681abbb0be58e80b19885e0 Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Mon, 7 Apr 2014 19:34:38 +0000 Subject: SkNonCopyable should be used with private inheritance. This is mostly s/public SkNoncopyable/SkNoncopyable/g. Two classes (SkDrawLooper::Context and SkPicture::OperationList) don't actually work with SkNoncopyable because they introduce a virtual destructor. I added SkNoncopyableVirtual to make them work as intended. Sort of questionable whether they really need to be noncopyable in the first place, but I guess it doesn't hurt to keep the behavior the same. BUG=skia: R=reed@google.com, mtklein@google.com Author: mtklein@chromium.org Review URL: https://codereview.chromium.org/226183018 git-svn-id: http://skia.googlecode.com/svn/trunk@14081 2bbb7eff-a529-9590-31e7-b0007b416f81 --- src/gpu/GrTemplates.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/gpu/GrTemplates.h') diff --git a/src/gpu/GrTemplates.h b/src/gpu/GrTemplates.h index 5a009dfdf1..2cab132783 100644 --- a/src/gpu/GrTemplates.h +++ b/src/gpu/GrTemplates.h @@ -35,7 +35,7 @@ template Dst GrTCast(Src src) { * ... * } // fCount is restored */ -template class GrAutoTRestore : public SkNoncopyable { +template class GrAutoTRestore : SkNoncopyable { public: GrAutoTRestore() : fPtr(NULL), fVal() {} -- cgit v1.2.3