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

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

Issue 1998723002: Move code in ui/gl/* from gfx:: to gl:: (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 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
« no previous file with comments | « ui/gl/gl_surface_win.cc ('k') | ui/gl/gl_switches.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "ui/gl/gl_surface.h" 5 #include "ui/gl/gl_surface.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include <memory> 9 #include <memory>
10 10
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "base/message_loop/message_loop.h" 13 #include "base/message_loop/message_loop.h"
14 #include "base/trace_event/trace_event.h" 14 #include "base/trace_event/trace_event.h"
15 #include "ui/gfx/native_widget_types.h" 15 #include "ui/gfx/native_widget_types.h"
16 #include "ui/gfx/x/x11_types.h" 16 #include "ui/gfx/x/x11_types.h"
17 #include "ui/gl/gl_bindings.h" 17 #include "ui/gl/gl_bindings.h"
18 #include "ui/gl/gl_implementation.h" 18 #include "ui/gl/gl_implementation.h"
19 #include "ui/gl/gl_surface_egl.h" 19 #include "ui/gl/gl_surface_egl.h"
20 #include "ui/gl/gl_surface_egl_x11.h" 20 #include "ui/gl/gl_surface_egl_x11.h"
21 #include "ui/gl/gl_surface_glx.h" 21 #include "ui/gl/gl_surface_glx.h"
22 #include "ui/gl/gl_surface_osmesa.h" 22 #include "ui/gl/gl_surface_osmesa.h"
23 #include "ui/gl/gl_surface_stub.h" 23 #include "ui/gl/gl_surface_stub.h"
24 24
25 namespace gfx { 25 namespace gl {
26 26
27 namespace { 27 namespace {
28 28
29 // This OSMesa GL surface can use XLib to swap the contents of the buffer to a 29 // This OSMesa GL surface can use XLib to swap the contents of the buffer to a
30 // view. 30 // view.
31 class NativeViewGLSurfaceOSMesa : public GLSurfaceOSMesa { 31 class NativeViewGLSurfaceOSMesa : public GLSurfaceOSMesa {
32 public: 32 public:
33 explicit NativeViewGLSurfaceOSMesa(gfx::AcceleratedWidget window); 33 explicit NativeViewGLSurfaceOSMesa(gfx::AcceleratedWidget window);
34 34
35 static bool InitializeOneOff(); 35 static bool InitializeOneOff();
(...skipping 303 matching lines...) Expand 10 before | Expand all | Expand 10 after
339 default: 339 default:
340 NOTREACHED(); 340 NOTREACHED();
341 return NULL; 341 return NULL;
342 } 342 }
343 } 343 }
344 344
345 EGLNativeDisplayType GetPlatformDefaultEGLNativeDisplay() { 345 EGLNativeDisplayType GetPlatformDefaultEGLNativeDisplay() {
346 return gfx::GetXDisplay(); 346 return gfx::GetXDisplay();
347 } 347 }
348 348
349 } // namespace gfx 349 } // namespace gl
OLDNEW
« no previous file with comments | « ui/gl/gl_surface_win.cc ('k') | ui/gl/gl_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698