diff options
| author | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-29 18:13:12 +0000 |
|---|---|---|
| committer | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-29 18:13:12 +0000 |
| commit | 2fa2f2d8bcd5f8fa812723c442bb54f2328ad93e (patch) | |
| tree | bbadbc7c214c5d8adda40904607090f24e70b490 /ui/surface | |
| parent | 40a7e41b4820be63de44ece14c70b3bfe7e4c564 (diff) | |
| download | chromium_src-2fa2f2d8bcd5f8fa812723c442bb54f2328ad93e.zip chromium_src-2fa2f2d8bcd5f8fa812723c442bb54f2328ad93e.tar.gz chromium_src-2fa2f2d8bcd5f8fa812723c442bb54f2328ad93e.tar.bz2 | |
Rationalize linux vs x11 in ui
BUG=236170
TEST=None
R=ben@chromium.org
Review URL: https://codereview.chromium.org/13985039
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@197087 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/surface')
| -rw-r--r-- | ui/surface/transport_dib.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/ui/surface/transport_dib.h b/ui/surface/transport_dib.h index 9057bb6..535567a 100644 --- a/ui/surface/transport_dib.h +++ b/ui/surface/transport_dib.h @@ -14,7 +14,8 @@ #if defined(OS_WIN) #include <windows.h> -#elif defined(TOOLKIT_GTK) || (defined(OS_LINUX) && defined(USE_AURA)) +#elif defined(TOOLKIT_GTK) || \ + (defined(OS_LINUX) && defined(USE_AURA) && defined(USE_X11)) #include "ui/base/x/x11_util.h" #endif @@ -80,7 +81,8 @@ class SURFACE_EXPORT TransportDIB { static int fake_handle = 10; return reinterpret_cast<Handle>(fake_handle++); } -#elif defined(TOOLKIT_GTK) || (defined(OS_LINUX) && defined(USE_AURA)) +#elif defined(TOOLKIT_GTK) || \ + (defined(OS_LINUX) && defined(USE_AURA) && defined(USE_X11)) typedef int Handle; // These two ints are SysV IPC shared memory keys struct Id { // Ensure that default initialized Ids are invalid. @@ -186,7 +188,8 @@ class SURFACE_EXPORT TransportDIB { // wire to give this transport DIB to another process. Handle handle() const; -#if defined(TOOLKIT_GTK) || (defined(OS_LINUX) && defined(USE_AURA)) +#if defined(TOOLKIT_GTK) || \ + (defined(OS_LINUX) && defined(USE_AURA) && defined(USE_X11)) // Map the shared memory into the X server and return an id for the shared // segment. XID MapToX(Display* connection); @@ -207,7 +210,8 @@ class SURFACE_EXPORT TransportDIB { // Verifies that the dib can hold a canvas of the requested dimensions. bool VerifyCanvasSize(int w, int h); -#if defined(TOOLKIT_GTK) || (defined(OS_LINUX) && defined(USE_AURA)) +#if defined(TOOLKIT_GTK) || \ + (defined(OS_LINUX) && defined(USE_AURA) && defined(USE_X11)) Id key_; // SysV shared memory id void* address_; // mapped address XSharedMemoryId x_shm_; // X id for the shared segment |