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

Unified Diff: ui/gl/gl_context_wayland.cc

Issue 17265006: wayland patch for inspection Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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_bindings.h ('k') | ui/gl/gl_image_wayland.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gl/gl_context_wayland.cc
diff --git a/ui/gl/gl_context_x11.cc b/ui/gl/gl_context_wayland.cc
similarity index 62%
copy from ui/gl/gl_context_x11.cc
copy to ui/gl/gl_context_wayland.cc
index 7aff48c54344685bbe1662b9d029f43cfcc50a2d..e1af0c6f66ca5015925d23f323e0ef9d46a0268a 100644
--- a/ui/gl/gl_context_x11.cc
+++ b/ui/gl/gl_context_wayland.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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.
@@ -9,13 +9,9 @@
#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 {
@@ -28,20 +24,6 @@ scoped_refptr<GLContext> GLContext::CreateGLContext(
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))
« no previous file with comments | « ui/gl/gl_bindings.h ('k') | ui/gl/gl_image_wayland.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698