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

Side by Side Diff: ui/gl/gl_context_x11.cc

Issue 1930633002: Fix gpu_ipc_service_unittests on mac_chromium_rel_ng by managing GL shared groups the same way in s… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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_win.cc ('k') | no next file » | 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 "ui/gl/gl_context.h" 5 #include "ui/gl/gl_context.h"
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/trace_event/trace_event.h" 10 #include "base/trace_event/trace_event.h"
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 return context; 44 return context;
45 } 45 }
46 case kGLImplementationEGLGLES2: { 46 case kGLImplementationEGLGLES2: {
47 scoped_refptr<GLContext> context(new GLContextEGL(share_group)); 47 scoped_refptr<GLContext> context(new GLContextEGL(share_group));
48 if (!context->Initialize(compatible_surface, gpu_preference)) 48 if (!context->Initialize(compatible_surface, gpu_preference))
49 return nullptr; 49 return nullptr;
50 50
51 return context; 51 return context;
52 } 52 }
53 case kGLImplementationMockGL: 53 case kGLImplementationMockGL:
54 return new GLContextStub; 54 return new GLContextStub(share_group);
55 default: 55 default:
56 NOTREACHED(); 56 NOTREACHED();
57 return nullptr; 57 return nullptr;
58 } 58 }
59 } 59 }
60 60
61 } // namespace gfx 61 } // namespace gfx
OLDNEW
« no previous file with comments | « ui/gl/gl_context_win.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698