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

Unified Diff: src/gpu/gl/GrGpuGL.h

Issue 23483042: Replace uses of GrNoncopyable by SkNoncopyable. (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: rm GrNoncopyable.h Created 7 years, 3 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 | « src/gpu/gl/GrGLShaderBuilder.h ('k') | src/gpu/gl/debug/GrFakeRefObj.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/gl/GrGpuGL.h
diff --git a/src/gpu/gl/GrGpuGL.h b/src/gpu/gl/GrGpuGL.h
index 95ae7265f91fb3bf166f35a0e99e49f4584d6c01..b0195bbaed5b04e2039088cdc986f6184ebc10b9 100644
--- a/src/gpu/gl/GrGpuGL.h
+++ b/src/gpu/gl/GrGpuGL.h
@@ -10,15 +10,16 @@
#include "GrBinHashKey.h"
#include "GrDrawState.h"
-#include "GrGpu.h"
#include "GrGLContext.h"
-#include "GrGLIndexBuffer.h"
#include "GrGLIRect.h"
+#include "GrGLIndexBuffer.h"
#include "GrGLProgram.h"
#include "GrGLStencilBuffer.h"
#include "GrGLTexture.h"
#include "GrGLVertexArray.h"
#include "GrGLVertexBuffer.h"
+#include "GrGpu.h"
+#include "SkTypes.h"
#include "../GrTHashCache.h"
#ifdef SK_DEVELOPER
@@ -170,7 +171,7 @@ private:
static bool BlendCoeffReferencesConstant(GrBlendCoeff coeff);
- class ProgramCache : public ::GrNoncopyable {
+ class ProgramCache : public ::SkNoncopyable {
public:
ProgramCache(GrGpuGL* gpu);
~ProgramCache();
« no previous file with comments | « src/gpu/gl/GrGLShaderBuilder.h ('k') | src/gpu/gl/debug/GrFakeRefObj.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698