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

Unified Diff: ui/gl/init/gl_initializer_ozone.cc

Issue 2723613003: Remove deprecated SurfaceFactoryOzone methods. (Closed)
Patch Set: Brackets. Created 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/gl/init/gl_factory_ozone.cc ('k') | ui/ozone/public/surface_factory_ozone.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gl/init/gl_initializer_ozone.cc
diff --git a/ui/gl/init/gl_initializer_ozone.cc b/ui/gl/init/gl_initializer_ozone.cc
index d0b7234b66440f90db168fb5a818f9fa79549ca8..6e5fc67f8e8cd44c0412565fd362f90f77621c43 100644
--- a/ui/gl/init/gl_initializer_ozone.cc
+++ b/ui/gl/init/gl_initializer_ozone.cc
@@ -6,45 +6,20 @@
#include "base/logging.h"
#include "ui/gl/gl_bindings.h"
-#include "ui/gl/gl_egl_api_implementation.h"
#include "ui/gl/gl_gl_api_implementation.h"
#include "ui/gl/gl_implementation_osmesa.h"
#include "ui/gl/gl_osmesa_api_implementation.h"
-#include "ui/gl/gl_surface_egl.h"
+#include "ui/gl/gl_surface.h"
#include "ui/gl/init/ozone_util.h"
-#include "ui/ozone/public/ozone_platform.h"
-#include "ui/ozone/public/surface_factory_ozone.h"
namespace gl {
namespace init {
-namespace {
-
-bool InitializeStaticEGLInternal() {
- if (!GetSurfaceFactoryOzone()->LoadEGLGLES2Bindings())
- return false;
-
- SetGLImplementation(kGLImplementationEGLGLES2);
- InitializeStaticGLBindingsGL();
- InitializeStaticGLBindingsEGL();
-
- return true;
-}
-
-} // namespace
-
bool InitializeGLOneOffPlatform() {
if (HasGLOzone())
return GetGLOzone()->InitializeGLOneOffPlatform();
switch (GetGLImplementation()) {
- case kGLImplementationEGLGLES2:
- if (!GLSurfaceEGL::InitializeOneOff(
- GetSurfaceFactoryOzone()->GetNativeDisplay())) {
- LOG(ERROR) << "GLSurfaceEGL::InitializeOneOff failed.";
- return false;
- }
- return true;
case kGLImplementationOSMesaGL:
case kGLImplementationMockGL:
case kGLImplementationStubGL:
@@ -68,8 +43,6 @@ bool InitializeStaticGLBindings(GLImplementation implementation) {
switch (implementation) {
case kGLImplementationOSMesaGL:
return InitializeStaticGLBindingsOSMesaGL();
- case kGLImplementationEGLGLES2:
- return InitializeStaticEGLInternal();
case kGLImplementationMockGL:
case kGLImplementationStubGL:
SetGLImplementation(implementation);
@@ -88,19 +61,16 @@ void InitializeDebugGLBindings() {
return;
}
- InitializeDebugGLBindingsEGL();
InitializeDebugGLBindingsGL();
InitializeDebugGLBindingsOSMESA();
}
void ShutdownGLPlatform() {
- GLSurfaceEGL::ShutdownOneOff();
if (HasGLOzone()) {
GetGLOzone()->ShutdownGL();
return;
}
- ClearBindingsEGL();
ClearBindingsGL();
ClearBindingsOSMESA();
}
« no previous file with comments | « ui/gl/init/gl_factory_ozone.cc ('k') | ui/ozone/public/surface_factory_ozone.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698