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

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

Issue 862133002: Update from https://crrev.com/312398 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 11 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
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_egl.h" 5 #include "ui/gl/gl_surface_egl.h"
6 6
7 #if defined(OS_ANDROID) 7 #if defined(OS_ANDROID)
8 #include <android/native_window_jni.h> 8 #include <android/native_window_jni.h>
9 #endif 9 #endif
10 10
(...skipping 11 matching lines...) Expand all
22 #include "ui/gl/gl_switches.h" 22 #include "ui/gl/gl_switches.h"
23 #include "ui/gl/scoped_make_current.h" 23 #include "ui/gl/scoped_make_current.h"
24 #include "ui/gl/sync_control_vsync_provider.h" 24 #include "ui/gl/sync_control_vsync_provider.h"
25 25
26 #if defined(USE_X11) 26 #if defined(USE_X11)
27 extern "C" { 27 extern "C" {
28 #include <X11/Xlib.h> 28 #include <X11/Xlib.h>
29 } 29 }
30 #endif 30 #endif
31 31
32 #if defined (USE_OZONE)
33 #include "ui/ozone/public/surface_factory_ozone.h"
34 #endif
35
32 #if !defined(EGL_FIXED_SIZE_ANGLE) 36 #if !defined(EGL_FIXED_SIZE_ANGLE)
33 #define EGL_FIXED_SIZE_ANGLE 0x3201 37 #define EGL_FIXED_SIZE_ANGLE 0x3201
34 #endif 38 #endif
35 39
36 #if defined(OS_WIN) 40 #if defined(OS_WIN)
37 // From ANGLE's egl/eglext.h. 41 // From ANGLE's egl/eglext.h.
38 #if !defined(EGL_PLATFORM_ANGLE_ANGLE) 42 #if !defined(EGL_PLATFORM_ANGLE_ANGLE)
39 #define EGL_PLATFORM_ANGLE_ANGLE 0x3201 43 #define EGL_PLATFORM_ANGLE_ANGLE 0x3201
40 #endif 44 #endif
41 #if !defined(EGL_PLATFORM_ANGLE_TYPE_ANGLE) 45 #if !defined(EGL_PLATFORM_ANGLE_TYPE_ANGLE)
(...skipping 764 matching lines...) Expand 10 before | Expand all | Expand 10 after
806 } 810 }
807 811
808 void* SurfacelessEGL::GetShareHandle() { 812 void* SurfacelessEGL::GetShareHandle() {
809 return NULL; 813 return NULL;
810 } 814 }
811 815
812 SurfacelessEGL::~SurfacelessEGL() { 816 SurfacelessEGL::~SurfacelessEGL() {
813 } 817 }
814 818
815 } // namespace gfx 819 } // namespace gfx
OLDNEW
« shell/BUILD.gn ('K') | « ui/gl/gl_mock_autogen_gl.h ('k') | ui/gl/gl_surface_ozone.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698