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

Unified Diff: ui/ozone/platform/cast/surface_factory_cast.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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/ozone/platform/cast/surface_factory_cast.h ('k') | ui/ozone/platform/drm/gpu/gbm_surface_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/ozone/platform/cast/surface_factory_cast.cc
diff --git a/ui/ozone/platform/cast/surface_factory_cast.cc b/ui/ozone/platform/cast/surface_factory_cast.cc
index 7074271ad64790cd2b472281f6014d0bf35dd0d6..280a340b5fb4860fd32907452073efa6bf5357f6 100644
--- a/ui/ozone/platform/cast/surface_factory_cast.cc
+++ b/ui/ozone/platform/cast/surface_factory_cast.cc
@@ -308,9 +308,7 @@ scoped_refptr<NativePixmap> SurfaceFactoryCast::CreateNativePixmap(
return make_scoped_refptr(new CastPixmap(this));
}
-bool SurfaceFactoryCast::LoadEGLGLES2Bindings(
- AddGLLibraryCallback add_gl_library,
- SetGLGetProcAddressProcCallback set_gl_get_proc_address) {
+bool SurfaceFactoryCast::LoadEGLGLES2Bindings() {
if (state_ != kInitialized) {
InitializeHardware();
if (state_ != kInitialized) {
@@ -320,14 +318,14 @@ bool SurfaceFactoryCast::LoadEGLGLES2Bindings(
void* lib_egl = egl_platform_->GetEglLibrary();
void* lib_gles2 = egl_platform_->GetGles2Library();
- GLGetProcAddressProc gl_proc = egl_platform_->GetGLProcAddressProc();
+ gl::GLGetProcAddressProc gl_proc = egl_platform_->GetGLProcAddressProc();
if (!lib_egl || !lib_gles2 || !gl_proc) {
return false;
}
- set_gl_get_proc_address.Run(gl_proc);
- add_gl_library.Run(lib_egl);
- add_gl_library.Run(lib_gles2);
+ gl::SetGLGetProcAddressProc(gl_proc);
+ gl::AddGLNativeLibrary(lib_egl);
+ gl::AddGLNativeLibrary(lib_gles2);
return true;
}
« no previous file with comments | « ui/ozone/platform/cast/surface_factory_cast.h ('k') | ui/ozone/platform/drm/gpu/gbm_surface_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698