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

Unified Diff: ui/surface/transport_dib.h

Issue 13529027: Switch Linux Auru ports over to POSIX SHM instead of legacy SYSV SHM. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/surface/surface.gyp ('k') | ui/surface/transport_dib_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/surface/transport_dib.h
===================================================================
--- ui/surface/transport_dib.h (revision 200710)
+++ ui/surface/transport_dib.h (working copy)
@@ -14,8 +14,7 @@
#if defined(OS_WIN)
#include <windows.h>
-#elif defined(TOOLKIT_GTK) || \
- (defined(OS_LINUX) && defined(USE_AURA) && defined(USE_X11))
+#elif defined(TOOLKIT_GTK)
#include "ui/base/x/x11_util.h"
#endif
@@ -81,8 +80,7 @@
static int fake_handle = 10;
return reinterpret_cast<Handle>(fake_handle++);
}
-#elif defined(TOOLKIT_GTK) || \
- (defined(OS_LINUX) && defined(USE_AURA) && defined(USE_X11))
+#elif defined(TOOLKIT_GTK)
typedef int Handle; // These two ints are SysV IPC shared memory keys
struct Id {
// Ensure that default initialized Ids are invalid.
@@ -188,8 +186,7 @@
// wire to give this transport DIB to another process.
Handle handle() const;
-#if defined(TOOLKIT_GTK) || \
- (defined(OS_LINUX) && defined(USE_AURA) && defined(USE_X11))
+#if defined(TOOLKIT_GTK)
// Map the shared memory into the X server and return an id for the shared
// segment.
XID MapToX(Display* connection);
@@ -210,8 +207,7 @@
// 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) && defined(USE_X11))
+#if defined(TOOLKIT_GTK)
Id key_; // SysV shared memory id
void* address_; // mapped address
XSharedMemoryId x_shm_; // X id for the shared segment
« no previous file with comments | « ui/surface/surface.gyp ('k') | ui/surface/transport_dib_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698