| 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
|
|
|