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); |