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

Side by Side Diff: ui/ozone/platform/x11/x11_surface_factory.cc

Issue 2253173002: Remove callbacks for SurfaceFactoryOzone::LoadEGLGLES2Bindings(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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/ozone/platform/x11/x11_surface_factory.h ('k') | ui/ozone/public/surface_factory_ozone.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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/ozone/platform/x11/x11_surface_factory.h" 5 #include "ui/ozone/platform/x11/x11_surface_factory.h"
6 6
7 #include <X11/Xlib.h> 7 #include <X11/Xlib.h>
8 8
9 #include "third_party/khronos/EGL/egl.h" 9 #include "third_party/khronos/EGL/egl.h"
10 #include "ui/gfx/x/x11_types.h" 10 #include "ui/gfx/x/x11_types.h"
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 gl::GLImplementation implementation, 140 gl::GLImplementation implementation,
141 const gfx::Size& size) { 141 const gfx::Size& size) {
142 if (implementation != gl::kGLImplementationEGLGLES2) { 142 if (implementation != gl::kGLImplementationEGLGLES2) {
143 NOTREACHED(); 143 NOTREACHED();
144 return nullptr; 144 return nullptr;
145 } 145 }
146 146
147 return gl::InitializeGLSurface(new gl::PbufferGLSurfaceEGL(size)); 147 return gl::InitializeGLSurface(new gl::PbufferGLSurfaceEGL(size));
148 } 148 }
149 149
150 bool X11SurfaceFactory::LoadEGLGLES2Bindings( 150 bool X11SurfaceFactory::LoadEGLGLES2Bindings() {
151 AddGLLibraryCallback add_gl_library, 151 return LoadDefaultEGLGLES2Bindings();
152 SetGLGetProcAddressProcCallback set_gl_get_proc_address) {
153 return LoadDefaultEGLGLES2Bindings(add_gl_library, set_gl_get_proc_address);
154 } 152 }
155 153
156 intptr_t X11SurfaceFactory::GetNativeDisplay() { 154 intptr_t X11SurfaceFactory::GetNativeDisplay() {
157 return reinterpret_cast<intptr_t>(gfx::GetXDisplay()); 155 return reinterpret_cast<intptr_t>(gfx::GetXDisplay());
158 } 156 }
159 157
160 } // namespace ui 158 } // namespace ui
OLDNEW
« no previous file with comments | « ui/ozone/platform/x11/x11_surface_factory.h ('k') | ui/ozone/public/surface_factory_ozone.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698