Another logic fix that needed to be backported to M17.

Original CL: http://codereview.chromium.org/8698008/ .

BUG=106891
TEST=browser_tests (on bots)
TBR=kerz
Review URL: http://codereview.chromium.org/9022018

git-svn-id: svn://svn.chromium.org/chrome/branches/963/src@115612 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 0 insertions, 25 deletions

diff --git a/ui/gfx/gl/gl_context_cgl.cc b/ui/gfx/gl/gl_context_cgl.cc
index 1ac5601..be7eaeb 100644
--- a/ui/gfx/gl/gl_context_cgl.cc
+++ b/ui/gfx/gl/gl_context_cgl.cc
@@ -85,16 +85,6 @@ bool GLContextCGL::MakeCurrent(GLSurface* surface) {
   if (IsCurrent(surface))
     return true;
 
-  if (CGLSetPBuffer(static_cast<CGLContextObj>(context_),
-                    static_cast<CGLPBufferObj>(surface->GetHandle()),
-                    0,
-                    0,
-                    0) != kCGLNoError) {
-    LOG(ERROR) << "Error attaching pbuffer to context.";
-    Destroy();
-    return false;
-  }
-
   if (CGLSetCurrentContext(
       static_cast<CGLContextObj>(context_)) != kCGLNoError) {
     LOG(ERROR) << "Unable to make gl context current.";
@@ -121,7 +111,6 @@ void GLContextCGL::ReleaseCurrent(GLSurface* surface) {
 
   SetCurrent(NULL, NULL);
   CGLSetCurrentContext(NULL);
-  CGLSetPBuffer(static_cast<CGLContextObj>(context_), NULL, 0, 0, 0);
 }
 
 bool GLContextCGL::IsCurrent(GLSurface* surface) {
@@ -135,20 +124,6 @@ bool GLContextCGL::IsCurrent(GLSurface* surface) {
   if (!native_context_is_current)
     return false;
 
-  if (surface) {
-    CGLPBufferObj current_surface = NULL;
-    GLenum face;
-    GLint level;
-    GLint screen;
-    CGLGetPBuffer(static_cast<CGLContextObj>(context_),
-                  &current_surface,
-                  &face,
-                  &level,
-                  &screen);
-    if (current_surface != surface->GetHandle())
-      return false;
-  }
-
   return true;
 }