Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(171)

Side by Side Diff: ui/gfx/gl/gl_surface_mac.cc

Issue 9160012: Change PluginWindowHandle to AcceleratedWidget in ui/gfx/gl (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: oops mac Created 8 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ui/gfx/gl/gl_surface_linux.cc ('k') | ui/gfx/gl/gl_surface_nsview.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/gfx/gl/gl_surface.h" 5 #include "ui/gfx/gl/gl_surface.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "third_party/mesa/MesaLib/include/GL/osmesa.h" 9 #include "third_party/mesa/MesaLib/include/GL/osmesa.h"
10 #include "ui/gfx/gl/gl_bindings.h" 10 #include "ui/gfx/gl/gl_bindings.h"
(...skipping 18 matching lines...) Expand all
29 } 29 }
30 break; 30 break;
31 default: 31 default:
32 break; 32 break;
33 } 33 }
34 return true; 34 return true;
35 } 35 }
36 36
37 scoped_refptr<GLSurface> GLSurface::CreateViewGLSurface( 37 scoped_refptr<GLSurface> GLSurface::CreateViewGLSurface(
38 bool software, 38 bool software,
39 gfx::PluginWindowHandle window) { 39 gfx::AcceleratedWidget window) {
40 #if defined(USE_AURA) 40 #if defined(USE_AURA)
41 if (software) 41 if (software)
42 return NULL; 42 return NULL;
43 43
44 switch (GetGLImplementation()) { 44 switch (GetGLImplementation()) {
45 case kGLImplementationDesktopGL: 45 case kGLImplementationDesktopGL:
46 case kGLImplementationAppleGL: { 46 case kGLImplementationAppleGL: {
47 scoped_refptr<GLSurface> surface(new GLSurfaceNSView(window)); 47 scoped_refptr<GLSurface> surface(new GLSurfaceNSView(window));
48 if (!surface->Initialize()) 48 if (!surface->Initialize())
49 return NULL; 49 return NULL;
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 } 86 }
87 case kGLImplementationMockGL: 87 case kGLImplementationMockGL:
88 return new GLSurfaceStub; 88 return new GLSurfaceStub;
89 default: 89 default:
90 NOTREACHED(); 90 NOTREACHED();
91 return NULL; 91 return NULL;
92 } 92 }
93 } 93 }
94 94
95 } // namespace gfx 95 } // namespace gfx
OLDNEW
« no previous file with comments | « ui/gfx/gl/gl_surface_linux.cc ('k') | ui/gfx/gl/gl_surface_nsview.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698