Replace uses of GrNoncopyable by SkNoncopyable.
BUG=None
TEST=None, no functional changes.
R=bsalomon@google.com, robertphillips@google.com
Author: tfarina@chromium.org
Review URL: https://chromiumcodereview.appspot.com/23483042
git-svn-id: http://skia.googlecode.com/svn/trunk@11341 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/gpu/GrInOrderDrawBuffer.h b/src/gpu/GrInOrderDrawBuffer.h
index dcc5ab7..ca6af3f 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 @@
const GrIndexBuffer* fIndexBuffer;
};
- struct StencilPath : GrNoncopyable {
+ struct StencilPath : public ::SkNoncopyable {
StencilPath();
SkAutoTUnref<const GrPath> fPath;
@@ -106,7 +104,7 @@
SkPath::FillType fFill;
};
- struct Clear : GrNoncopyable {
+ struct Clear : public ::SkNoncopyable {
Clear() : fRenderTarget(NULL) {}
~Clear() { SkSafeUnref(fRenderTarget); }
@@ -115,7 +113,7 @@
GrRenderTarget* fRenderTarget;
};
- struct CopySurface : GrNoncopyable {
+ struct CopySurface : public ::SkNoncopyable {
SkAutoTUnref<GrSurface> fDst;
SkAutoTUnref<GrSurface> fSrc;
SkIRect fSrcRect;