diff options
author | 2014-04-07 19:34:38 +0000 | |
---|---|---|
committer | 2014-04-07 19:34:38 +0000 | |
commit | e3beb6bd7de7fa211681abbb0be58e80b19885e0 (patch) | |
tree | 0e5a9079910a9f42053b6518f9ba802a258ed46d /src/gpu/effects/GrTextureStripAtlas.h | |
parent | c4df655b37aea7097d3007b299de582ba517ef16 (diff) |
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
Diffstat (limited to 'src/gpu/effects/GrTextureStripAtlas.h')
-rw-r--r-- | src/gpu/effects/GrTextureStripAtlas.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gpu/effects/GrTextureStripAtlas.h b/src/gpu/effects/GrTextureStripAtlas.h index e06e273e26..5227cc38bd 100644 --- a/src/gpu/effects/GrTextureStripAtlas.h +++ b/src/gpu/effects/GrTextureStripAtlas.h @@ -79,7 +79,7 @@ private: * The state of a single row in our cache, next/prev pointers allow these to be chained * together to represent LRU status */ - struct AtlasRow : public SkNoncopyable { + struct AtlasRow : SkNoncopyable { AtlasRow() : fKey(kEmptyAtlasRowKey), fLocks(0), fNext(NULL), fPrev(NULL) { } // GenerationID of the bitmap that is represented by this row, 0xffffffff means "empty" uint32_t fKey; |