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

Unified Diff: src/gpu/gl/GrGLShaderBuilder.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/GrGLBufferImpl.h ('k') | src/gpu/gl/GrGpuGL.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/gl/GrGLShaderBuilder.h
diff --git a/src/gpu/gl/GrGLShaderBuilder.h b/src/gpu/gl/GrGLShaderBuilder.h
index 42df62ac4583bb62df6870be74719b0ebefa208f..5f2983d19dbbfd36eb857f09ca09fdea3dfdbc04 100644
--- a/src/gpu/gl/GrGLShaderBuilder.h
+++ b/src/gpu/gl/GrGLShaderBuilder.h
@@ -12,6 +12,7 @@
#include "GrBackendEffectFactory.h"
#include "GrColor.h"
#include "GrEffect.h"
+#include "SkTypes.h"
#include "gl/GrGLSL.h"
#include "gl/GrGLUniformManager.h"
@@ -386,7 +387,7 @@ private:
GrGLUniformManager::BuilderUniformArray fUniforms;
private:
- class CodeStage : GrNoncopyable {
+ class CodeStage : public SkNoncopyable {
public:
CodeStage() : fNextIndex(0), fCurrentIndex(-1), fEffect(NULL) {}
@@ -405,7 +406,7 @@ private:
return fCurrentIndex;
}
- class AutoStageRestore : GrNoncopyable {
+ class AutoStageRestore : public SkNoncopyable {
public:
AutoStageRestore(CodeStage* codeStage, const GrEffectRef* effect) {
SkASSERT(NULL != codeStage);
« no previous file with comments | « src/gpu/gl/GrGLBufferImpl.h ('k') | src/gpu/gl/GrGpuGL.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698