| Index: ui/gl/gl_fence.cc
|
| diff --git a/ui/gl/gl_fence.cc b/ui/gl/gl_fence.cc
|
| index 0fb3a743309c588cf688e13915b83a420179b0c3..c119aa0111e28df229128f64d6321be171744c77 100644
|
| --- a/ui/gl/gl_fence.cc
|
| +++ b/ui/gl/gl_fence.cc
|
| @@ -13,10 +13,6 @@
|
| #include "ui/gl/gl_gl_api_implementation.h"
|
| #include "ui/gl/gl_version_info.h"
|
|
|
| -#if defined(OS_MACOSX)
|
| -#include "ui/gl/gl_fence_apple.h"
|
| -#endif
|
| -
|
| namespace gfx {
|
|
|
| GLFence::GLFence() {
|
| @@ -28,11 +24,7 @@ GLFence::~GLFence() {
|
| bool GLFence::IsSupported() {
|
| DCHECK(GetGLVersionInfo());
|
| return g_driver_gl.ext.b_GL_ARB_sync || GetGLVersionInfo()->is_es3 ||
|
| -#if defined(OS_MACOSX)
|
| - g_driver_gl.ext.b_GL_APPLE_fence ||
|
| -#else
|
| g_driver_egl.ext.b_EGL_KHR_fence_sync ||
|
| -#endif
|
| g_driver_gl.ext.b_GL_NV_fence;
|
| }
|
|
|
| @@ -45,13 +37,8 @@ GLFence* GLFence::Create() {
|
| if (g_driver_gl.ext.b_GL_ARB_sync ||
|
| GetGLVersionInfo()->is_es3) {
|
| fence.reset(new GLFenceARB);
|
| -#if defined(OS_MACOSX)
|
| - } else if (g_driver_gl.ext.b_GL_APPLE_fence) {
|
| - fence.reset(new GLFenceAPPLE);
|
| -#else
|
| } else if (g_driver_egl.ext.b_EGL_KHR_fence_sync) {
|
| fence.reset(new GLFenceEGL);
|
| -#endif
|
| } else if (g_driver_gl.ext.b_GL_NV_fence) {
|
| fence.reset(new GLFenceNV);
|
| }
|
|
|