Bug 1245241 - part 4 - move SharedMemorySysV details into nsShmImage.…

… r=nical
iaxat · Feb 18, 2016 · 0eaeee4 · 0eaeee4
1 parent ad05733
commit 0eaeee4
Show file tree

Hide file tree

Showing 6 changed files with 152 additions and 272 deletions.
diff --git a/ipc/glue/SharedMemory.h b/ipc/glue/SharedMemory.h
@@ -47,7 +47,6 @@ class SharedMemory
 public:
   enum SharedMemoryType {
     TYPE_BASIC,
-    TYPE_SYSV,
     TYPE_UNKNOWN
   };
 

diff --git a/ipc/glue/SharedMemorySysV.h b/ipc/glue/SharedMemorySysV.h
diff --git a/ipc/glue/moz.build b/ipc/glue/moz.build
@@ -31,7 +31,6 @@ EXPORTS.mozilla.ipc += [
     'ScopedXREEmbed.h',
     'SharedMemory.h',
     'SharedMemoryBasic.h',
-    'SharedMemorySysV.h',
     'Shmem.h',
     'Transport.h',
     'URIUtils.h',

diff --git a/widget/gtk/nsWindow.h b/widget/gtk/nsWindow.h
@@ -8,8 +8,6 @@
 #ifndef __nsWindow_h__
 #define __nsWindow_h__
 
-#include "mozilla/ipc/SharedMemorySysV.h"
-
 #include "nsAutoPtr.h"
 
 #include "mozcontainer.h"
@@ -27,6 +25,8 @@
 #include <gdk/gdkx.h>
 #endif /* MOZ_X11 */
 
+#include "nsShmImage.h"
+
 #ifdef ACCESSIBILITY
 #include "mozilla/a11y/Accessible.h"
 #endif
@@ -64,10 +64,6 @@ extern PRLogModuleInfo *gWidgetDrawLog;
 class gfxASurface;
 class gfxPattern;
 class nsPluginNativeWindowGtk;
-#if defined(MOZ_X11) && defined(MOZ_HAVE_SHAREDMEMORYSYSV)
-#  define MOZ_HAVE_SHMIMAGE
-class nsShmImage;
-#endif
 
 namespace mozilla {
 class TimeStamp;