Merge branch 'ANGLE-rollback'

This resolves #624

Note: Cherry-picked some fixes on top of the ANGLE version that we want to keep.

1 files changed, 3 insertions, 3 deletions

diff --git a/dom/canvas/WebGLShaderValidator.h b/dom/canvas/WebGLShaderValidator.h
index deb1c7c7f..ba50def28 100644
--- a/dom/canvas/WebGLShaderValidator.h
+++ b/dom/canvas/WebGLShaderValidator.h
@@ -17,7 +17,7 @@ namespace webgl {
 class ShaderValidator final
 {
     const ShHandle mHandle;
-    const ShCompileOptions mCompileOptions;
+    const int mCompileOptions;
     const int mMaxVaryingVectors;
     bool mHasRun;
 
@@ -25,10 +25,10 @@ public:
     static ShaderValidator* Create(GLenum shaderType, ShShaderSpec spec,
                                    ShShaderOutput outputLanguage,
                                    const ShBuiltInResources& resources,
-                                   ShCompileOptions compileOptions);
+                                   int compileOptions);
 
 private:
-    ShaderValidator(ShHandle handle, ShCompileOptions compileOptions,
+    ShaderValidator(ShHandle handle, int compileOptions,
                     int maxVaryingVectors)
         : mHandle(handle)
         , mCompileOptions(compileOptions)