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

Side by Side Diff: content/browser/renderer_host/image_transport_client_linux.cc

Issue 10392068: ui: Move gl/ directory out of gfx/, up to ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix mac_rel Created 8 years, 7 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 #include "content/browser/renderer_host/image_transport_client.h" 5 #include "content/browser/renderer_host/image_transport_client.h"
6 6
7 #include <X11/Xlib.h> 7 #include <X11/Xlib.h>
8 #include <X11/extensions/Xcomposite.h> 8 #include <X11/extensions/Xcomposite.h>
9 9
10 #include "base/debug/trace_event.h" 10 #include "base/debug/trace_event.h"
11 #include "base/lazy_instance.h" 11 #include "base/lazy_instance.h"
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "base/message_loop.h" 13 #include "base/message_loop.h"
14 #include "content/browser/renderer_host/image_transport_factory.h" 14 #include "content/browser/renderer_host/image_transport_factory.h"
15 #include "third_party/angle/include/EGL/egl.h" 15 #include "third_party/angle/include/EGL/egl.h"
16 #include "third_party/angle/include/EGL/eglext.h" 16 #include "third_party/angle/include/EGL/eglext.h"
17 #include "ui/gfx/gl/gl_bindings.h"
18 #include "ui/gfx/gl/gl_implementation.h"
19 #include "ui/gfx/gl/gl_surface_egl.h"
20 #include "ui/gfx/gl/gl_surface_glx.h"
21 #include "ui/gfx/gl/scoped_make_current.h"
22 #include "ui/gfx/size.h" 17 #include "ui/gfx/size.h"
18 #include "ui/gl/gl_bindings.h"
19 #include "ui/gl/gl_implementation.h"
20 #include "ui/gl/gl_surface_egl.h"
21 #include "ui/gl/gl_surface_glx.h"
22 #include "ui/gl/scoped_make_current.h"
23 23
24 namespace { 24 namespace {
25 25
26 class ScopedPtrXFree { 26 class ScopedPtrXFree {
27 public: 27 public:
28 void operator()(void* x) const { 28 void operator()(void* x) const {
29 ::XFree(x); 29 ::XFree(x);
30 } 30 }
31 }; 31 };
32 32
(...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after
297 return new ImageTransportClientOSMesa(factory, size); 297 return new ImageTransportClientOSMesa(factory, size);
298 case gfx::kGLImplementationDesktopGL: 298 case gfx::kGLImplementationDesktopGL:
299 return new ImageTransportClientGLX(factory, size); 299 return new ImageTransportClientGLX(factory, size);
300 case gfx::kGLImplementationEGLGLES2: 300 case gfx::kGLImplementationEGLGLES2:
301 return new ImageTransportClientEGL(factory, size); 301 return new ImageTransportClientEGL(factory, size);
302 default: 302 default:
303 NOTREACHED(); 303 NOTREACHED();
304 return NULL; 304 return NULL;
305 } 305 }
306 } 306 }
OLDNEW
« no previous file with comments | « content/browser/renderer_host/compositing_iosurface_mac.mm ('k') | content/browser/renderer_host/image_transport_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698