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

Side by Side Diff: ui/gfx/gl/gl_surface_egl.h

Issue 7467007: Adding Wayland support for ui/gfx (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Accidentally pulled in some extra changes in common.gypi Created 9 years, 4 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #ifndef UI_GFX_GL_GL_SURFACE_EGL_H_ 5 #ifndef UI_GFX_GL_GL_SURFACE_EGL_H_
6 #define UI_GFX_GL_GL_SURFACE_EGL_H_ 6 #define UI_GFX_GL_GL_SURFACE_EGL_H_
7 #pragma once 7 #pragma once
8 8
9 #if defined(OS_WIN) 9 #if defined(OS_WIN)
10 #include <windows.h> 10 #include <windows.h>
11 #endif 11 #endif
12 12
13 #include "ui/gfx/gl/gl_surface.h" 13 #include "ui/gfx/gl/gl_surface.h"
14 #include "ui/gfx/native_widget_types.h" 14 #include "ui/gfx/native_widget_types.h"
15 #include "ui/gfx/size.h" 15 #include "ui/gfx/size.h"
16 16
17 typedef void* EGLConfig; 17 typedef void* EGLConfig;
18 typedef void* EGLDisplay; 18 typedef void* EGLDisplay;
19 typedef void* EGLSurface; 19 typedef void* EGLSurface;
20 20
21 #if defined(OS_WIN) 21 #if defined(OS_WIN)
22 typedef HDC EGLNativeDisplayType; 22 typedef HDC EGLNativeDisplayType;
23 #elif defined(USE_WAYLAND)
24 typedef struct wl_display* EGLNativeDisplayType;
23 #else 25 #else
24 typedef struct _XDisplay* EGLNativeDisplayType; 26 typedef struct _XDisplay* EGLNativeDisplayType;
25 #endif 27 #endif
26 28
27 namespace gfx { 29 namespace gfx {
28 30
29 // Interface for EGL surface. 31 // Interface for EGL surface.
30 class GLSurfaceEGL : public GLSurface { 32 class GLSurfaceEGL : public GLSurface {
31 public: 33 public:
32 GLSurfaceEGL(); 34 GLSurfaceEGL();
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 private: 87 private:
86 gfx::Size size_; 88 gfx::Size size_;
87 EGLSurface surface_; 89 EGLSurface surface_;
88 90
89 DISALLOW_COPY_AND_ASSIGN(PbufferGLSurfaceEGL); 91 DISALLOW_COPY_AND_ASSIGN(PbufferGLSurfaceEGL);
90 }; 92 };
91 93
92 } // namespace gfx 94 } // namespace gfx
93 95
94 #endif // UI_GFX_GL_GL_SURFACE_EGL_H_ 96 #endif // UI_GFX_GL_GL_SURFACE_EGL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698