ui/gfx/gl/gl_surface_egl.cc - Issue 6990051: Unix ifdefs patch for ui/ and webkit/

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/gfx/gl/gl_surface_egl.cc

Issue 6990051: Unix ifdefs patch for ui/ and webkit/ (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: removed some too general ifdefs and ppapi changes Created 9 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:

Index: ui/gfx/gl/gl_surface_egl.cc

diff --git a/ui/gfx/gl/gl_surface_egl.cc b/ui/gfx/gl/gl_surface_egl.cc

index 55cbc556b61b90e733ae34dfd100165fcbaa247a..285f003f162b44cd2e1242aa285cc6ac4d261172 100644

--- a/ui/gfx/gl/gl_surface_egl.cc

+++ b/ui/gfx/gl/gl_surface_egl.cc

@@ -14,7 +14,7 @@

// it brings in #defines that cause conflicts.

#include "ui/gfx/gl/gl_bindings.h"

-#if defined(OS_LINUX)

+#if defined(USE_X11)

extern "C" {

#include <X11/Xlib.h>

}

@@ -38,7 +38,7 @@ bool GLSurfaceEGL::InitializeOneOff() {

if (initialized)

return true;

-#ifdef OS_LINUX

+#if defined(USE_X11)

EGLNativeDisplayType native_display = XOpenDisplay(NULL);

#else

EGLNativeDisplayType native_display = EGL_DEFAULT_DISPLAY;