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

Side by Side Diff: ui/gl/gl_image_glx.cc

Issue 13543007: GLImage support for Android zero-copy pixel buffers (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove a TODO and remove pixel_buffer.h from gl.gyp 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 extern "C" { 5 extern "C" {
6 #include <X11/extensions/Xcomposite.h> 6 #include <X11/extensions/Xcomposite.h>
7 } 7 }
8 8
9 #include "ui/gl/gl_image_glx.h" 9 #include "ui/gl/gl_image_glx.h"
10 10
11 #include "base/basictypes.h" 11 #include "base/basictypes.h"
12 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "base/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
14 #include "base/message_loop.h" 14 #include "base/message_loop.h"
15 #include "ui/gl/gl_bindings.h"
15 #include "ui/gl/gl_surface_glx.h" 16 #include "ui/gl/gl_surface_glx.h"
16 17
17 namespace gfx { 18 namespace gfx {
18 19
19 namespace { 20 namespace {
20 21
21 // scoped_ptr functor for XFree(). Use as follows: 22 // scoped_ptr functor for XFree(). Use as follows:
22 // scoped_ptr_malloc<XVisualInfo, ScopedPtrXFree> foo(...); 23 // scoped_ptr_malloc<XVisualInfo, ScopedPtrXFree> foo(...);
23 // where "XVisualInfo" is any X type that is freed with XFree. 24 // where "XVisualInfo" is any X type that is freed with XFree.
24 class ScopedPtrXFree { 25 class ScopedPtrXFree {
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 return; 168 return;
168 169
169 glXReleaseTexImageEXT(display_, glx_pixmap_, GLX_FRONT_LEFT_EXT); 170 glXReleaseTexImageEXT(display_, glx_pixmap_, GLX_FRONT_LEFT_EXT);
170 } 171 }
171 172
172 GLImageGLX::~GLImageGLX() { 173 GLImageGLX::~GLImageGLX() {
173 Destroy(); 174 Destroy();
174 } 175 }
175 176
176 } // namespace gfx 177 } // namespace gfx
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698