| Index: src/gpu/GrClipMaskCache.h
|
| diff --git a/src/gpu/GrClipMaskCache.h b/src/gpu/GrClipMaskCache.h
|
| index f2b2abd325e98c32cb9c35fd90727ef3a2a1230f..97b4b515cc9b72b40161f3af5d9aa470b9468604 100644
|
| --- a/src/gpu/GrClipMaskCache.h
|
| +++ b/src/gpu/GrClipMaskCache.h
|
| @@ -9,8 +9,8 @@
|
| #define GrClipMaskCache_DEFINED
|
|
|
| #include "GrContext.h"
|
| -#include "GrNoncopyable.h"
|
| #include "SkClipStack.h"
|
| +#include "SkTypes.h"
|
|
|
| class GrTexture;
|
|
|
| @@ -18,7 +18,7 @@ class GrTexture;
|
| * The stencil buffer stores the last clip path - providing a single entry
|
| * "cache". This class provides similar functionality for AA clip paths
|
| */
|
| -class GrClipMaskCache : public GrNoncopyable {
|
| +class GrClipMaskCache : public SkNoncopyable {
|
| public:
|
| GrClipMaskCache();
|
|
|
| @@ -233,7 +233,7 @@ private:
|
| GrContext* fContext;
|
| SkDeque fStack;
|
|
|
| - typedef GrNoncopyable INHERITED;
|
| + typedef SkNoncopyable INHERITED;
|
| };
|
|
|
| #endif // GrClipMaskCache_DEFINED
|
|
|