Backout 429315
authorroc+@cs.cmu.edu
Thu, 17 Apr 2008 04:53:55 -0700
changeset 14419 8822304e916cca09b6d3688249314c99a671d72c
parent 14418 1807b5631e98249c4ff1b308b569e1f3f5733a52
child 14420 c8164be42671c8ee8160c218147da219c507253f
push id14
push userbsmedberg@mozilla.com
push dateTue, 29 Apr 2008 14:30:10 +0000
treeherdermozilla-central@78e482f2d4be [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs429315
milestone1.9pre
Backout 429315
view/crashtests/crashtests.list
view/src/nsViewManager.cpp
--- a/view/crashtests/crashtests.list
+++ b/view/crashtests/crashtests.list
@@ -1,4 +1,4 @@
 load 323497-1.html
 load 382756-1.xul
-load 429315-1.html
+# load 429315-1.html
 
--- a/view/src/nsViewManager.cpp
+++ b/view/src/nsViewManager.cpp
@@ -1423,18 +1423,17 @@ void nsViewManager::ReparentChildWidgets
 {
   if (aView->HasWidget()) {
     // Check to see if the parent widget is the
     // same as the new parent. If not then reparent
     // the widget, otherwise there is nothing more
     // to do for the view and its descendants
     nsIWidget* widget = aView->GetWidget();
     nsIWidget* parentWidget = widget->GetParent();
-    // Toplevel widgets should not be reparented!
-    if (parentWidget && parentWidget != aNewWidget) {
+    if (parentWidget != aNewWidget) {
 #ifdef DEBUG
       nsresult rv =
 #endif
         widget->SetParent(aNewWidget);
       NS_ASSERTION(NS_SUCCEEDED(rv), "SetParent failed!");
     }
     return;
   }