GLContextNSView should not assume concrete type GLSurface is GLSurfaceNSView

This is follow-up from review http://codereview.chromium.org/8486020.
This eliminates down-cast of GLSurface in CLContextNSView::Initialize in favor of
GLSurfaceNSView::OnMakeCurrent implementation.  Also, allows offscreen path in USE_AURA
due to its usage in SharedResourcesCC.

BUG=104390
TEST=compositor_unittests --gtest_filter=LayerWithRealCompositorTest.*
R=apatrick@chromium.org

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

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

4 files changed, 15 insertions, 11 deletions

diff --git a/ui/gfx/gl/gl_context_mac.mm b/ui/gfx/gl/gl_context_mac.mm
index adf67aa..2fcd085 100644
--- a/ui/gfx/gl/gl_context_mac.mm
+++ b/ui/gfx/gl/gl_context_mac.mm
@@ -43,15 +43,15 @@ scoped_refptr<GLContext> GLContext::CreateGLContext(
     case kGLImplementationDesktopGL: {
       scoped_refptr<GLContext> context;
 #if defined(USE_AURA)
-      DCHECK(!compatible_surface->IsOffscreen());
-      context = new GLContextNSView(share_group);
-      if (!context->Initialize(compatible_surface, gpu_preference))
-        return NULL;
+      if (compatible_surface->IsOffscreen())
+        context = new GLContextCGL(share_group);
+      else
+        context = new GLContextNSView(share_group);
 #else
       context = new GLContextCGL(share_group);
+#endif // USE_AURA
       if (!context->Initialize(compatible_surface, gpu_preference))
         return NULL;
-#endif // USE_AURA
 
       return context;
     }
diff --git a/ui/gfx/gl/gl_context_nsview.mm b/ui/gfx/gl/gl_context_nsview.mm
index a3aa7aa..1ad1c6d 100644
--- a/ui/gfx/gl/gl_context_nsview.mm
+++ b/ui/gfx/gl/gl_context_nsview.mm
@@ -46,9 +46,6 @@ bool GLContextNSView::Initialize(GLSurface* surface,
     return false;
   }
 
-  // Allow the surface to call back when in need of |FlushBuffer|.
-  static_cast<GLSurfaceNSView*>(surface)->SetGLContext(this);
-
   return true;
 }
 
@@ -64,6 +61,12 @@ bool GLContextNSView::MakeCurrent(GLSurface* surface) {
   if ([view window])
     [context_ setView:view];
   [context_ makeCurrentContext];
+
+  if (!surface->OnMakeCurrent(this)) {
+    LOG(ERROR) << "Unable to make gl context current.";
+    return false;
+  }
+
   return true;
 }
 
diff --git a/ui/gfx/gl/gl_surface_nsview.h b/ui/gfx/gl/gl_surface_nsview.h
index 58e1344..a53eaf1 100644
--- a/ui/gfx/gl/gl_surface_nsview.h
+++ b/ui/gfx/gl/gl_surface_nsview.h
@@ -29,7 +29,7 @@ class GLSurfaceNSView : public GLSurface {
   virtual void* GetHandle() OVERRIDE;
 
   // Allow the surface to call back to context when in need of |FlushBuffer|.
-  void SetGLContext(GLContextNSView* context);
+  virtual bool OnMakeCurrent(GLContext* context) OVERRIDE;
 
  private:
   // Weak.  An |NSView*|.
diff --git a/ui/gfx/gl/gl_surface_nsview.mm b/ui/gfx/gl/gl_surface_nsview.mm
index 0c7f3aa..e03cb3b 100644
--- a/ui/gfx/gl/gl_surface_nsview.mm
+++ b/ui/gfx/gl/gl_surface_nsview.mm
@@ -39,8 +39,9 @@ void* GLSurfaceNSView::GetHandle() {
   return view_;
 }
 
-void GLSurfaceNSView::SetGLContext(GLContextNSView* context) {
-  context_ = context;
+bool GLSurfaceNSView::OnMakeCurrent(GLContext* context) {
+  context_ = static_cast<GLContextNSView *>(context);
+  return true;
 }
 
 }  // namespace gfx