Fixed build problems on Mac OS X when using GLContext from Chromium's

WebKit code. Added glIsFramebufferEXT and glIsRenderbufferEXT as
preferred aliases.

BUG=none
TEST=WebGL, try bots

Review URL: http://codereview.chromium.org/3146002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55584 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 10 insertions, 7 deletions

diff --git a/app/gfx/gl/generate_bindings.py b/app/gfx/gl/generate_bindings.py
index dd118833..b3449b7 100644
--- a/app/gfx/gl/generate_bindings.py
+++ b/app/gfx/gl/generate_bindings.py
@@ -143,9 +143,11 @@ GL_FUNCTIONS = [
 ['void', ['glHint'], 'GLenum target, GLenum mode'],
 ['GLboolean', ['glIsBuffer'], 'GLuint buffer'],
 ['GLboolean', ['glIsEnabled'], 'GLenum cap'],
-['GLboolean', ['glIsFramebuffer'], 'GLuint framebuffer'],
+['GLboolean', ['glIsFramebufferEXT', 'glIsFramebuffer'],
+    'GLuint framebuffer'],
 ['GLboolean', ['glIsProgram'], 'GLuint program'],
-['GLboolean', ['glIsRenderbuffer'], 'GLuint renderbuffer'],
+['GLboolean', ['glIsRenderbufferEXT', 'glIsRenderbuffer'],
+    'GLuint renderbuffer'],
 ['GLboolean', ['glIsShader'], 'GLuint shader'],
 ['GLboolean', ['glIsTexture'], 'GLuint texture'],
 ['void', ['glLineWidth'], 'GLfloat width'],
diff --git a/app/gfx/gl/gl_context.h b/app/gfx/gl/gl_context.h
index 656a0d3..1282b59 100644
--- a/app/gfx/gl/gl_context.h
+++ b/app/gfx/gl/gl_context.h
@@ -6,7 +6,6 @@
 #define APP_GFX_GL_GL_CONTEXT_H_
 #pragma once
 
-#include "base/logging.h"
 #include "build/build_config.h"
 #include "gfx/native_widget_types.h"
 #include "gfx/size.h"
diff --git a/app/gfx/gl/gl_context_egl.cc b/app/gfx/gl/gl_context_egl.cc
index 1d05eb0..7cfde87 100644
--- a/app/gfx/gl/gl_context_egl.cc
+++ b/app/gfx/gl/gl_context_egl.cc
@@ -9,6 +9,7 @@
 #include "app/x11_util.h"
 #define EGL_HAS_PBUFFERS 1
 #endif
+#include "base/logging.h"
 #include "base/scoped_ptr.h"
 #include "app/gfx/gl/gl_bindings.h"
 #include "app/gfx/gl/gl_context_egl.h"
diff --git a/app/gfx/gl/gl_context_osmesa.cc b/app/gfx/gl/gl_context_osmesa.cc
index 451c4d7..28eb170 100644
--- a/app/gfx/gl/gl_context_osmesa.cc
+++ b/app/gfx/gl/gl_context_osmesa.cc
@@ -8,6 +8,7 @@
 
 #include "app/gfx/gl/gl_bindings.h"
 #include "app/gfx/gl/gl_context_osmesa.h"
+#include "base/logging.h"
 
 namespace gfx {
 
diff --git a/app/gfx/gl/gl_interface.h b/app/gfx/gl/gl_interface.h
index a13f406..0d52793 100644
--- a/app/gfx/gl/gl_interface.h
+++ b/app/gfx/gl/gl_interface.h
@@ -240,11 +240,11 @@ class GLInterface {
 
   virtual GLboolean IsEnabled(GLenum cap) = 0;
 
-  virtual GLboolean IsFramebuffer(GLuint framebuffer) = 0;
+  virtual GLboolean IsFramebufferEXT(GLuint framebuffer) = 0;
 
   virtual GLboolean IsProgram(GLuint program) = 0;
 
-  virtual GLboolean IsRenderbuffer(GLuint renderbuffer) = 0;
+  virtual GLboolean IsRenderbufferEXT(GLuint renderbuffer) = 0;
 
   virtual GLboolean IsShader(GLuint shader) = 0;
 
diff --git a/app/gfx/gl/gl_mock.h b/app/gfx/gl/gl_mock.h
index 70223d3..4564fee 100644
--- a/app/gfx/gl/gl_mock.h
+++ b/app/gfx/gl/gl_mock.h
@@ -235,11 +235,11 @@ class MockGLInterface : public GLInterface {
 
   MOCK_METHOD1(IsEnabled, GLboolean(GLenum cap));
 
-  MOCK_METHOD1(IsFramebuffer, GLboolean(GLuint framebuffer));
+  MOCK_METHOD1(IsFramebufferEXT, GLboolean(GLuint framebuffer));
 
   MOCK_METHOD1(IsProgram, GLboolean(GLuint program));
 
-  MOCK_METHOD1(IsRenderbuffer, GLboolean(GLuint renderbuffer));
+  MOCK_METHOD1(IsRenderbufferEXT, GLboolean(GLuint renderbuffer));
 
   MOCK_METHOD1(IsShader, GLboolean(GLuint shader));