Back out Bug 1127201 (part 2) for various problems.

2015-02-06 15:04:32 -08:00
parent 64644acbbe
commit e048a7df33
347 changed files with 3071 additions and 3032 deletions
--- a/widget/nsBaseWidget.cpp
+++ b/widget/nsBaseWidget.cpp
@@ -319,7 +319,7 @@ nsBaseWidget::CreateChild(const nsIntRect  &aRect,
    // nativeWidget parameter.
    nativeParent = parent ? parent->GetNativeData(NS_NATIVE_WIDGET) : nullptr;
    parent = nativeParent ? nullptr : parent;
-    MOZ_ASSERT(!parent || !nativeParent, "messed up logic");
+    NS_ABORT_IF_FALSE(!parent || !nativeParent, "messed up logic");
  }

  nsCOMPtr<nsIWidget> widget;