From c65c655d2e7f4570e97c9a0f31ccd29fc41d0a40 Mon Sep 17 00:00:00 2001
From: Chris Jones <jones.chris.g@gmail.com>
Date: Thu, 19 Aug 2010 19:02:21 -0500
Subject: [PATCH] Backed out changeset 5bf0b315a5aa

---
 view/src/nsView.cpp | 12 ++----------
 view/src/nsView.h   |  3 ---
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/view/src/nsView.cpp b/view/src/nsView.cpp
index 828e679f068..73a09cc4561 100644
--- a/view/src/nsView.cpp
+++ b/view/src/nsView.cpp
@@ -745,16 +745,6 @@ nsresult nsView::CreateWidget(const nsIID &aWindowIID,
                     ::HandleEvent, dx, nsnull, nsnull, aWidgetInitData);
   }
 
-  InitializeWindow(aEnableDragDrop, aResetVisibility);
-
-  return NS_OK;
-}
-
-void
-nsView::InitializeWindow(bool aEnableDragDrop, bool aResetVisibility)
-{
-  NS_ABORT_IF_FALSE(mWindow, "Must have a window to initialize");
-
   if (aEnableDragDrop) {
     mWindow->EnableDragDrop(PR_TRUE);
   }
@@ -767,6 +757,8 @@ nsView::InitializeWindow(bool aEnableDragDrop, bool aResetVisibility)
   if (aResetVisibility) {
     SetVisibility(GetVisibility());
   }
+
+  return NS_OK;
 }
 
 // Attach to a top level widget and start receiving mirrored events.
diff --git a/view/src/nsView.h b/view/src/nsView.h
index 76caeced888..ae4db7c8350 100644
--- a/view/src/nsView.h
+++ b/view/src/nsView.h
@@ -194,9 +194,6 @@ protected:
   void DoResetWidgetBounds(PRBool aMoveOnly, PRBool aInvalidateChangedSize);
 
   nsRegion*    mDirtyRegion;
-
-private:
-  void InitializeWindow(bool aEnableDragDrop, bool aResetVisibility);
 };
 
 #endif