| Index: ui/gfx/gl/gl_context_cgl.h
|
| ===================================================================
|
| --- ui/gfx/gl/gl_context_cgl.h (revision 104937)
|
| +++ ui/gfx/gl/gl_context_cgl.h (working copy)
|
| @@ -15,7 +15,8 @@
|
| virtual ~GLContextCGL();
|
|
|
| // Implement GLContext.
|
| - virtual bool Initialize(GLSurface* compatible_surface);
|
| + virtual bool Initialize(
|
| + GLSurface* compatible_surface, GpuPreference gpu_preference);
|
| virtual void Destroy();
|
| virtual bool MakeCurrent(GLSurface* surface);
|
| virtual void ReleaseCurrent(GLSurface* surface);
|
| @@ -25,7 +26,10 @@
|
|
|
| private:
|
| void* context_;
|
| + GpuPreference gpu_preference_;
|
|
|
| + GpuPreference GetGpuPreference();
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(GLContextCGL);
|
| };
|
|
|
|
|