Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(640)

Unified Diff: include/core/SkPicture.h

Issue 226183018: SkNonCopyable should be used with private inheritance. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: name resolution Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « include/core/SkImageDecoder.h ('k') | include/core/SkRefCnt.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include/core/SkPicture.h
diff --git a/include/core/SkPicture.h b/include/core/SkPicture.h
index cfa8c95f0b11897d8b3b5780cb7fb3df8ee1c8fe..a178469314ba6d875e7b0fad78edf3b6cf6a124e 100644
--- a/include/core/SkPicture.h
+++ b/include/core/SkPicture.h
@@ -330,7 +330,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() {}
@@ -347,9 +347,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
« no previous file with comments | « include/core/SkImageDecoder.h ('k') | include/core/SkRefCnt.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698