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

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

Issue 1051253008: gpu: Upgrade to new ANGLE Platform Display init. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix double "command_line" Created 5 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
« no previous file with comments | « no previous file | ui/gl/gl_surface_egl.cc » ('j') | ui/gl/gl_surface_egl.cc » ('J')
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 #ifndef UI_GL_GL_SURFACE_EGL_H_ 5 #ifndef UI_GL_GL_SURFACE_EGL_H_
6 #define UI_GL_GL_SURFACE_EGL_H_ 6 #define UI_GL_GL_SURFACE_EGL_H_
7 7
8 #if defined(OS_WIN) 8 #if defined(OS_WIN)
9 #include <windows.h> 9 #include <windows.h>
10 #endif 10 #endif
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 static bool IsCreateContextRobustnessSupported(); 44 static bool IsCreateContextRobustnessSupported();
45 static bool IsEGLSurfacelessContextSupported(); 45 static bool IsEGLSurfacelessContextSupported();
46 46
47 protected: 47 protected:
48 ~GLSurfaceEGL() override; 48 ~GLSurfaceEGL() override;
49 49
50 private: 50 private:
51 #if defined(OS_WIN) 51 #if defined(OS_WIN)
52 friend struct DriverEGL; 52 friend struct DriverEGL;
53 static EGLDisplay GetPlatformDisplay(EGLNativeDisplayType native_display); 53 static EGLDisplay GetPlatformDisplay(EGLNativeDisplayType native_display);
54 static EGLDisplay GetPlatformANGLEDisplay(EGLNativeDisplayType native_display,
piman 2015/04/16 21:51:05 nit: you can also have it as a free (static) funct
zmo 2015/04/16 21:52:34 This can just be a helper function in the anonymou
Jamie Madill 2015/04/17 19:14:13 Done.
55 EGLenum platform_type,
56 EGLenum device_type);
54 #endif 57 #endif
55 58
56 DISALLOW_COPY_AND_ASSIGN(GLSurfaceEGL); 59 DISALLOW_COPY_AND_ASSIGN(GLSurfaceEGL);
57 }; 60 };
58 61
59 // Encapsulates an EGL surface bound to a view. 62 // Encapsulates an EGL surface bound to a view.
60 class GL_EXPORT NativeViewGLSurfaceEGL : public GLSurfaceEGL { 63 class GL_EXPORT NativeViewGLSurfaceEGL : public GLSurfaceEGL {
61 public: 64 public:
62 explicit NativeViewGLSurfaceEGL(EGLNativeWindowType window); 65 explicit NativeViewGLSurfaceEGL(EGLNativeWindowType window);
63 66
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 ~SurfacelessEGL() override; 160 ~SurfacelessEGL() override;
158 161
159 private: 162 private:
160 gfx::Size size_; 163 gfx::Size size_;
161 DISALLOW_COPY_AND_ASSIGN(SurfacelessEGL); 164 DISALLOW_COPY_AND_ASSIGN(SurfacelessEGL);
162 }; 165 };
163 166
164 } // namespace gfx 167 } // namespace gfx
165 168
166 #endif // UI_GL_GL_SURFACE_EGL_H_ 169 #endif // UI_GL_GL_SURFACE_EGL_H_
OLDNEW
« no previous file with comments | « no previous file | ui/gl/gl_surface_egl.cc » ('j') | ui/gl/gl_surface_egl.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698