Fix some merge bustage.

content/base/src/nsFrameLoader.cpp

@@ -1448,7 +1448,6 @@ nsFrameLoader::UpdateBaseWindowPositionAndSize(nsIFrame *aIFrame)
 nsIntSize
 nsFrameLoader::GetSubDocumentSize(const nsIFrame *aIFrame)
 {
-  nsAutoDisableGetUsedXAssertions disableAssert;
   nsSize docSizeAppUnits;
   nsPresContext* presContext = aIFrame->PresContext();
   nsCOMPtr<nsIDOMHTMLFrameElement> frameElem = 

content/canvas/src/DocumentRendererChild.cpp

@@ -46,7 +46,7 @@
 #include "nsIDocument.h"
 #include "nsIInterfaceRequestorUtils.h"
 #include "nsComponentManagerUtils.h"
-#include "nsICSSParser.h"
+#include "nsCSSParser.h"
 #include "nsPresContext.h"
 #include "nsCOMPtr.h"
 #include "nsColor.h"
@@ -118,9 +118,9 @@ DocumentRendererChild::RenderDocument(nsIDOMWindow *window, const PRInt32& x, co
         return false;
 
     nscolor bgColor;
-    nsCOMPtr<nsICSSParser> parser = do_CreateInstance("@mozilla.org/content/css-parser;1");
-    nsresult rv = parser->ParseColorString(PromiseFlatString(aBGColor),
-                                           nsnull, 0, &bgColor);
+    nsCSSParser parser;
+    nsresult rv = parser.ParseColorString(PromiseFlatString(aBGColor),
+                                          nsnull, 0, &bgColor);
     if (NS_FAILED(rv))
         return false;
 
@@ -138,10 +138,7 @@ DocumentRendererChild::RenderDocument(nsIDOMWindow *window, const PRInt32& x, co
                                                          4 * _width, gfxASurface::ImageFormatARGB32);
     nsRefPtr<gfxContext> ctx = new gfxContext(surf);
 
-    PRBool oldDisableValue = nsLayoutUtils::sDisableGetUsedXAssertions;
-    nsLayoutUtils::sDisableGetUsedXAssertions = oldDisableValue || !flush;
     presShell->RenderDocument(r, flags, bgColor, ctx);
-    nsLayoutUtils::sDisableGetUsedXAssertions = oldDisableValue;
 
     return true;
 }

ipc/testshell/XPCShellEnvironment.cpp

@@ -34,8 +34,6 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "XPCShellEnvironment.h"
-
 #include <stdlib.h>
 #include <errno.h>
 #ifdef HAVE_IO_H
@@ -45,11 +43,15 @@
 #include <unistd.h>     /* for isatty() */
 #endif
 
+#include "base/basictypes.h"
+
 #include "jsapi.h"
 #include "jscntxt.h"
 #include "jsdbgapi.h"
 #include "jsprf.h"
 
+#include "XPCShellEnvironment.h"
+
 #include "mozilla/XPCOM.h"
 
 #include "nsIChannel.h"

js/src/xpconnect/shell/xpcshell.cpp

@@ -45,11 +45,6 @@
 
 /* XPConnect JavaScript interactive shell. */
 
-#ifdef MOZ_IPC
-#include "mozilla/dom/ContentProcessParent.h"
-#include "mozilla/ipc/TestShellParent.h"
-#endif
-
 #include <stdio.h>
 #include "jsapi.h"
 #include "jscntxt.h"
@@ -94,6 +89,11 @@
 #include <unistd.h>
 #endif
 
+#ifdef MOZ_IPC
+#include "mozilla/dom/ContentProcessParent.h"
+#include "mozilla/ipc/TestShellParent.h"
+#endif
+
 #ifndef XPCONNECT_STANDALONE
 #include "nsIScriptSecurityManager.h"
 #include "nsIPrincipal.h"