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

Side by Side Diff: ui/gl/gl_context_mac.mm

Issue 895853003: Update from https://crrev.com/314320 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 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
« no previous file with comments | « ui/gl/gl_context_glx.cc ('k') | ui/gl/gl_context_wgl.cc » ('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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "base/basictypes.h" 5 #include "base/basictypes.h"
6 #include "base/debug/trace_event.h"
7 #include "base/logging.h" 6 #include "base/logging.h"
8 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "base/trace_event/trace_event.h"
9 #include "ui/gl/gl_context_cgl.h" 9 #include "ui/gl/gl_context_cgl.h"
10 #include "ui/gl/gl_context_osmesa.h" 10 #include "ui/gl/gl_context_osmesa.h"
11 #include "ui/gl/gl_context_stub.h" 11 #include "ui/gl/gl_context_stub.h"
12 #include "ui/gl/gl_implementation.h" 12 #include "ui/gl/gl_implementation.h"
13 #include "ui/gl/gl_surface.h" 13 #include "ui/gl/gl_surface.h"
14 #include "ui/gl/gl_switches.h" 14 #include "ui/gl/gl_switches.h"
15 15
16 namespace gfx { 16 namespace gfx {
17 17
18 class GLShareGroup; 18 class GLShareGroup;
(...skipping 26 matching lines...) Expand all
45 } 45 }
46 case kGLImplementationMockGL: 46 case kGLImplementationMockGL:
47 return new GLContextStub; 47 return new GLContextStub;
48 default: 48 default:
49 NOTREACHED(); 49 NOTREACHED();
50 return NULL; 50 return NULL;
51 } 51 }
52 } 52 }
53 53
54 } // namespace gfx 54 } // namespace gfx
OLDNEW
« no previous file with comments | « ui/gl/gl_context_glx.cc ('k') | ui/gl/gl_context_wgl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698