Fix merge bustage

content/canvas/src/nsCanvasRenderingContext2D.cpp

@@ -124,6 +124,8 @@
 #  include "mozilla/ipc/DocumentRendererShmemParent.h"
 // windows.h (included by chromium code) defines this, in its infinite wisdom
 #  undef DrawText
+
+using mozilla::ipc::SharedMemory;
 #endif
 
 using namespace mozilla;
@@ -977,10 +979,12 @@ nsCanvasRenderingContext2D::CreateShmemSegments(PRInt32 width, PRInt32 height,
                                                 gfxASurface::gfxImageFormat format)
 {
     if (!mozilla::dom::ContentProcessParent::GetSingleton()->
-                AllocShmem(width * height * 4, &mFrontBuffer))
+        AllocShmem(width * height * 4, SharedMemory::TYPE_BASIC,
+                   &mFrontBuffer))
         return false;
     if (!mozilla::dom::ContentProcessParent::GetSingleton()->
-                AllocShmem(width * height * 4, &mBackBuffer))
+                AllocShmem(width * height * 4, SharedMemory::TYPE_BASIC,
+                           &mBackBuffer))
         return false;
 
     mBackSurface = new gfxImageSurface(mBackBuffer.get<unsigned char>(),

content/events/src/nsDOMUIEvent.h

@@ -42,7 +42,6 @@
 #include "nsIDOMUIEvent.h"
 #include "nsIDOMNSUIEvent.h"
 #include "nsIDOMAbstractView.h"
-#include "nsIPrivateCompositionEvent.h"
 #include "nsDOMEvent.h"
 
 class nsDOMUIEvent : public nsDOMEvent,

modules/plugin/test/testplugin/nptest.cpp

@@ -201,7 +201,7 @@ static const NPUTF8* sPluginMethodIdentifierNames[] = {
   "getClipboardText",
   "callOnDestroy",
   "reinitWidget",
-  "propertyAndMethod"
+  "propertyAndMethod",
   "crashInNestedLoop",
 };
 static NPIdentifier sPluginMethodIdentifiers[ARRAY_LENGTH(sPluginMethodIdentifierNames)];