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

Unified Diff: ui/gl/gl_image_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_context_x11.cc ('k') | ui/gl/gl_image_x11.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gl/gl_image_linux.cc
diff --git a/ui/gl/gl_image_linux.cc b/ui/gl/gl_image_linux.cc
deleted file mode 100644
index fe945eccbe938aead4af2caaf64966844c5ea65a..0000000000000000000000000000000000000000
--- a/ui/gl/gl_image_linux.cc
+++ /dev/null
@@ -1,52 +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_image.h"
-
-#include "base/debug/trace_event.h"
-#include "ui/gl/gl_image_glx.h"
-#include "ui/gl/gl_image_stub.h"
-#include "ui/gl/gl_implementation.h"
-
-namespace gfx {
-
-scoped_refptr<GLImage> GLImage::CreateGLImage(gfx::PluginWindowHandle window) {
- TRACE_EVENT0("gpu", "GLImage::CreateGLImage");
- switch (GetGLImplementation()) {
- case kGLImplementationOSMesaGL:
- return NULL;
- case kGLImplementationDesktopGL: {
- scoped_refptr<GLImageGLX> image(new GLImageGLX(window));
- if (!image->Initialize())
- return NULL;
-
- return image;
- }
- case kGLImplementationEGLGLES2:
- return NULL;
- case kGLImplementationMockGL:
- return new GLImageStub;
- default:
- NOTREACHED();
- return NULL;
- }
-}
-
-scoped_refptr<GLImage> GLImage::CreateGLImageForGpuMemoryBuffer(
- gfx::GpuMemoryBufferHandle buffer, gfx::Size size) {
- TRACE_EVENT0("gpu", "GLImage::CreateGLImageForGpuMemoryBuffer");
- switch (GetGLImplementation()) {
- case kGLImplementationOSMesaGL:
- case kGLImplementationDesktopGL:
- case kGLImplementationEGLGLES2:
- return NULL;
- case kGLImplementationMockGL:
- return new GLImageStub;
- default:
- NOTREACHED();
- return NULL;
- }
-}
-
-} // namespace gfx
« no previous file with comments | « ui/gl/gl_context_x11.cc ('k') | ui/gl/gl_image_x11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698