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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/gl/gl_surface_egl.cc

Issue 750593003: Ozone X11 platform Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove new evernt type, add direct route from event -> platform window Created 6 years 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 side-by-side diff with in-line comments
Download patch
« build/config/ui.gni ('K') | « ui/gl/gl_surface_egl.h ('k') | ui/gl/gl_surface_ozone.cc » ('j') | ui/gl/gl_surface_ozone.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gl/gl_surface_egl.cc
diff --git a/ui/gl/gl_surface_egl.cc b/ui/gl/gl_surface_egl.cc
index 3a453b6e20fdf19816f6bfea3e8ff63516221262..b7f14c866174d59a8d34a866756dd1371584fa65 100644
--- a/ui/gl/gl_surface_egl.cc
+++ b/ui/gl/gl_surface_egl.cc
@@ -170,7 +170,7 @@ bool GLSurfaceEGL::InitializeOneOff() {
#if defined(USE_OZONE)
const EGLint* config_attribs =
ui::SurfaceFactoryOzone::GetInstance()->GetEGLSurfaceProperties(
- kConfigAttribs);
+ kConfigAttribs, nullptr);
#else
const EGLint* config_attribs = kConfigAttribs;
#endif
@@ -338,9 +338,9 @@ EGLDisplay GLSurfaceEGL::GetPlatformDisplay(
NativeViewGLSurfaceEGL::NativeViewGLSurfaceEGL(EGLNativeWindowType window)
: window_(window),
+ config_(NULL),
surface_(NULL),
supports_post_sub_buffer_(false),
- config_(NULL),
size_(1, 1) {
#if defined(OS_ANDROID)
if (window)
« build/config/ui.gni ('K') | « ui/gl/gl_surface_egl.h ('k') | ui/gl/gl_surface_ozone.cc » ('j') | ui/gl/gl_surface_ozone.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698