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

Unified Diff: ui/gl/gl_context_linux.cc

Issue 13985039: Rationalize linux vs x11 in ui (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix review / try issues Created 7 years, 8 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/gl.gyp ('k') | ui/gl/gl_context_x11.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gl/gl_context_linux.cc
diff --git a/ui/gl/gl_context_linux.cc b/ui/gl/gl_context_linux.cc
deleted file mode 100644
index 7aff48c54344685bbe1662b9d029f43cfcc50a2d..0000000000000000000000000000000000000000
--- a/ui/gl/gl_context_linux.cc
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "ui/gl/gl_context.h"
-
-#include "base/debug/trace_event.h"
-#include "base/logging.h"
-#include "base/memory/scoped_ptr.h"
-#include "ui/gl/gl_bindings.h"
-#include "ui/gl/gl_context_egl.h"
-#include "ui/gl/gl_context_glx.h"
-#include "ui/gl/gl_context_osmesa.h"
-#include "ui/gl/gl_context_stub.h"
-#include "ui/gl/gl_implementation.h"
-#include "ui/gl/gl_surface_egl.h"
-#include "ui/gl/gl_surface_glx.h"
-#include "ui/gl/gl_surface_osmesa.h"
-#include "ui/gl/gl_surface_stub.h"
-
-namespace gfx {
-
-class GLShareGroup;
-
-scoped_refptr<GLContext> GLContext::CreateGLContext(
- GLShareGroup* share_group,
- GLSurface* compatible_surface,
- GpuPreference gpu_preference) {
- TRACE_EVENT0("gpu", "GLContext::CreateGLContext");
- switch (GetGLImplementation()) {
- case kGLImplementationOSMesaGL: {
- scoped_refptr<GLContext> context(new GLContextOSMesa(share_group));
- if (!context->Initialize(compatible_surface, gpu_preference))
- return NULL;
-
- return context;
- }
- case kGLImplementationDesktopGL: {
- scoped_refptr<GLContext> context(new GLContextGLX(share_group));
- if (!context->Initialize(compatible_surface, gpu_preference))
- return NULL;
-
- return context;
- }
- case kGLImplementationEGLGLES2: {
- scoped_refptr<GLContext> context(new GLContextEGL(share_group));
- if (!context->Initialize(compatible_surface, gpu_preference))
- return NULL;
-
- return context;
- }
- case kGLImplementationMockGL:
- return new GLContextStub;
- default:
- NOTREACHED();
- return NULL;
- }
-}
-
-} // namespace gfx
« no previous file with comments | « ui/gl/gl.gyp ('k') | ui/gl/gl_context_x11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698