Ensure that enums used by GrCustomStage TestCreate functions are declared in SK_ALLOW_GLOBAL_STATIC_INITIALIZERS=0 builds (e.g. android)

git-svn-id: http://skia.googlecode.com/svn/trunk@4953 2bbb7eff-a529-9590-31e7-b0007b416f81

1 files changed, 8 insertions, 5 deletions

diff --git a/include/gpu/GrCustomStageUnitTest.h b/include/gpu/GrCustomStageUnitTest.h
index f928727e4a..6c63bd3d91 100644
--- a/include/gpu/GrCustomStageUnitTest.h
+++ b/include/gpu/GrCustomStageUnitTest.h
@@ -12,6 +12,14 @@
 #include "GrNoncopyable.h"
 #include "SkTArray.h"
 
+namespace GrCustomStageUnitTest {
+// Used to access the dummy textures in TestCreate procs.
+enum {
+    kSkiaPMTextureIdx = 0,
+    kAlphaTextureIdx = 1,
+};
+}
+
 #if SK_ALLOW_STATIC_GLOBAL_INITIALIZERS
 
 class GrCustomStage;
@@ -20,11 +28,6 @@ class GrTexture;
 
 class GrCustomStageTestFactory : GrNoncopyable {
 public:
-    // Used to access the dummy textures in TestCreate procs.
-    enum {
-        kSkiaPMTextureIdx = 0,
-        kAlphaTextureIdx = 1,
-    };
 
     typedef GrCustomStage* (*CreateProc)(SkRandom*, GrContext*, GrTexture* dummyTextures[]);