diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-07 19:34:38 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-07 19:34:38 +0000 |
| commit | e3beb6bd7de7fa211681abbb0be58e80b19885e0 (patch) | |
| tree | 0e5a9079910a9f42053b6518f9ba802a258ed46d /include/core/SkPicture.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 'include/core/SkPicture.h')
| -rw-r--r-- | include/core/SkPicture.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/include/core/SkPicture.h b/include/core/SkPicture.h index baa9486236..70691179db 100644 --- a/include/core/SkPicture.h +++ b/include/core/SkPicture.h @@ -328,7 +328,7 @@ protected: private: // An OperationList encapsulates a set of operation offsets into the picture byte // stream along with the CTMs needed for those operation. - class OperationList : public SkNoncopyable { + class OperationList : ::SkNoncopyable { public: virtual ~OperationList() {} @@ -345,9 +345,6 @@ private: virtual const SkMatrix& matrix(int index) const { SkASSERT(false); return SkMatrix::I(); } static const OperationList& InvalidList(); - - private: - typedef SkNoncopyable INHERITED; }; /** PRIVATE / EXPERIMENTAL -- do not call |