Non-Windows build bustage fix from bug 596451 part D - base::SharedMemoryHandle is not available to IPDL on non-Windows, so use typedefs.
authorBenjamin Smedberg <benjamin@smedbergs.us>
Mon, 25 Oct 2010 15:12:25 -0400
changeset 57210 866e9298ee159c57b2a434b199b39d5a811cc061
parent 57209 94324cad0457d50276216fec9cd21bdbc191580e
child 57211 425bd6be7289f7439c3968fb6afbd407aa80c0fe
push id16846
push userbsmedberg@mozilla.com
push dateWed, 10 Nov 2010 15:29:47 +0000
treeherdermozilla-central@bdbef533364f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs596451
milestone2.0b8pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Non-Windows build bustage fix from bug 596451 part D - base::SharedMemoryHandle is not available to IPDL on non-Windows, so use typedefs.
dom/plugins/PPluginInstance.ipdl
dom/plugins/PluginMessageUtils.h
--- a/dom/plugins/PPluginInstance.ipdl
+++ b/dom/plugins/PPluginInstance.ipdl
@@ -50,29 +50,29 @@ using NPRemoteWindow;
 using NPRemoteEvent;
 using NPRect;
 using NPNURLVariable;
 using NPCoordinateSpace;
 using mozilla::plugins::NativeWindowHandle;
 using mozilla::gfxSurfaceType;
 using gfxIntSize;
 using mozilla::null_t;
-using base::SharedMemoryHandle;
+using mozilla::plugins::WindowsSharedMemoryHandle;
 
 namespace mozilla {
 namespace plugins {
 
 struct SurfaceDescriptorX11 {
   int XID;
   int xrenderPictID;
   gfxIntSize size;
 };
 
 struct SurfaceDescriptorWin {
-  SharedMemoryHandle handle;
+  WindowsSharedMemoryHandle handle;
   gfxIntSize size;
 };
 
 union SurfaceDescriptor {
   Shmem;
   SurfaceDescriptorX11;
   SurfaceDescriptorWin;
   // Descriptor can be null here in case
--- a/dom/plugins/PluginMessageUtils.h
+++ b/dom/plugins/PluginMessageUtils.h
@@ -125,16 +125,22 @@ typedef HWND NativeWindowHandle;
 #elif defined(MOZ_X11)
 typedef XID NativeWindowHandle;
 #elif defined(XP_MACOSX) || defined(ANDROID)
 typedef intptr_t NativeWindowHandle; // never actually used, will always be 0
 #else
 #error Need NativeWindowHandle for this platform
 #endif
 
+#ifdef XP_WIN
+typedef base::SharedMemoryHandle WindowsSharedMemoryHandle;
+#else
+typedef mozilla::null_t WindowsSharedMemoryHandle;
+#endif
+
 #ifdef MOZ_CRASHREPORTER
 typedef CrashReporter::ThreadId NativeThreadId;
 #else
 // unused in this case
 typedef int32 NativeThreadId;
 #endif
 
 // XXX maybe not the best place for these. better one?