Merge backout

This commit is contained in:
Chris Jones 2010-08-19 19:02:24 -05:00
commit 68693b6537
2 changed files with 2 additions and 13 deletions

View File

@ -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.

View File

@ -194,9 +194,6 @@ protected:
void DoResetWidgetBounds(PRBool aMoveOnly, PRBool aInvalidateChangedSize);
nsRegion* mDirtyRegion;
private:
void InitializeWindow(bool aEnableDragDrop, bool aResetVisibility);
};
#endif