Changed typedefs for GLintptr and GLsizeiptr (and ARB variants) to work around conflicts with Skia's typedefs in src/third_party/skia/include/gpu/gl/GrGLFunctions.h . There is a fundamental conflict between the OpenGL and OpenGL ES headers for these typedefs. Without this modification, src/ui/gl/gl_bindings_skia_in_process.cc fails to compile.
This patch is not appropriate to upstream to Mesa. Additionally, there may be a different workaround available which would allow this patch to be reverted.
BUG=238755
TBR=marcheu@chromium.org
Review URL: https://codereview.chromium.org/16818021
git-svn-id: svn://svn.chromium.org/chrome/trunk/deps/third_party/mesa@206312 0039d316-1c4b-4281-b951-d872f2087c98
1 file changed
