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, 1 insertions, 6 deletions

diff --git a/gfx/angle/src/libANGLE/ResourceManager.h b/gfx/angle/src/libANGLE/ResourceManager.h
index f6a0002ed..a673257e1 100755
--- a/gfx/angle/src/libANGLE/ResourceManager.h
+++ b/gfx/angle/src/libANGLE/ResourceManager.h
@@ -64,7 +64,7 @@ class ResourceManager : angle::NonCopyable
     void deletePaths(GLuint first, GLsizei range);
 
     Buffer *getBuffer(GLuint handle);
-    Shader *getShader(GLuint handle) const;
+    Shader *getShader(GLuint handle);
     Program *getProgram(GLuint handle) const;
     Texture *getTexture(GLuint handle);
     Renderbuffer *getRenderbuffer(GLuint handle);
@@ -85,11 +85,6 @@ class ResourceManager : angle::NonCopyable
 
     bool isSampler(GLuint sampler);
 
-    // GL_CHROMIUM_bind_generates_resource
-    bool isTextureGenerated(GLuint texture) const;
-    bool isBufferGenerated(GLuint buffer) const;
-    bool isRenderbufferGenerated(GLuint renderbuffer) const;
-
   private:
     void createTextureInternal(GLuint handle);