Index: src/gpu/GrInOrderDrawBuffer.h |
diff --git a/src/gpu/GrInOrderDrawBuffer.h b/src/gpu/GrInOrderDrawBuffer.h |
index dcc5ab7e0bcdb080e97fbae2872e0e78e833ea0f..ca6af3fe8b40fa4270ae3a177654cf4945b9958e 100644 |
--- a/src/gpu/GrInOrderDrawBuffer.h |
+++ b/src/gpu/GrInOrderDrawBuffer.h |
@@ -1,4 +1,3 @@ |
- |
/* |
* Copyright 2011 Google Inc. |
* |
@@ -6,8 +5,6 @@ |
* found in the LICENSE file. |
*/ |
- |
- |
#ifndef GrInOrderDrawBuffer_DEFINED |
#define GrInOrderDrawBuffer_DEFINED |
@@ -19,6 +16,7 @@ |
#include "SkClipStack.h" |
#include "SkStrokeRec.h" |
#include "SkTemplates.h" |
+#include "SkTypes.h" |
class GrGpu; |
class GrIndexBufferAllocPool; |
@@ -98,7 +96,7 @@ private: |
const GrIndexBuffer* fIndexBuffer; |
}; |
- struct StencilPath : GrNoncopyable { |
+ struct StencilPath : public ::SkNoncopyable { |
StencilPath(); |
SkAutoTUnref<const GrPath> fPath; |
@@ -106,7 +104,7 @@ private: |
SkPath::FillType fFill; |
}; |
- struct Clear : GrNoncopyable { |
+ struct Clear : public ::SkNoncopyable { |
Clear() : fRenderTarget(NULL) {} |
~Clear() { SkSafeUnref(fRenderTarget); } |
@@ -115,7 +113,7 @@ private: |
GrRenderTarget* fRenderTarget; |
}; |
- struct CopySurface : GrNoncopyable { |
+ struct CopySurface : public ::SkNoncopyable { |
SkAutoTUnref<GrSurface> fDst; |
SkAutoTUnref<GrSurface> fSrc; |
SkIRect fSrcRect; |