Merge backout
authorChris Jones <jones.chris.g@gmail.com>
Thu, 19 Aug 2010 19:02:24 -0500
changeset 50959 3ceaf53d80dfbb6f17013bcf9b4c52deca5e9a8e
parent 50957 3496939165ad1e978ee6bdb50fd36abf6b75e94a (current diff)
parent 50958 344aa86787f71f1e701f3c282af24fb10387df34 (diff)
child 50961 28070f8d44b57484024a709e54bd18fcf4078c02
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone2.0b5pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge backout
view/src/nsView.cpp
view/src/nsView.h
--- a/view/src/nsView.cpp
+++ b/view/src/nsView.cpp
@@ -740,38 +740,30 @@ nsresult nsView::CreateWidget(const nsII
     initData.mListenForResizes = (!initDataPassedIn && GetParent() && 
                                   GetParent()->GetViewManager() != mViewManager);
     nsIWidget* parentWidget = GetParent() ? GetParent()->GetNearestWidget(nsnull)
                                           : nsnull;
     mWindow->Create(parentWidget, nsnull, trect,
                     ::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);
   }
       
   // propagate the z-index to the widget.
   UpdateNativeWidgetZIndexes(this, FindNonAutoZIndex(this));
 
   //make sure visibility state is accurate
 
   if (aResetVisibility) {
     SetVisibility(GetVisibility());
   }
+
+  return NS_OK;
 }
 
 // Attach to a top level widget and start receiving mirrored events.
 nsresult nsIView::AttachToTopLevelWidget(nsIWidget* aWidget)
 {
   NS_PRECONDITION(nsnull != aWidget, "null widget ptr");
   /// XXXjimm This is a temporary workaround to an issue w/document
   // viewer (bug 513162).
--- a/view/src/nsView.h
+++ b/view/src/nsView.h
@@ -189,14 +189,11 @@ public:
   nsIWidget* GetNearestWidget(nsPoint* aOffset, const PRInt32 aAPD) const;
 
 protected:
   // Do the actual work of ResetWidgetBounds, unconditionally.  Don't
   // call this method if we have no widget.
   void DoResetWidgetBounds(PRBool aMoveOnly, PRBool aInvalidateChangedSize);
 
   nsRegion*    mDirtyRegion;
-
-private:
-  void InitializeWindow(bool aEnableDragDrop, bool aResetVisibility);
 };
 
 #endif