mozilla-central: changeset 328875:2e56d81973346704883ec09700fffc3bdc657586

author	Jean-Luc Bonnafoux <jeanluc.bonnafoux@wanadoo.fr>
	Tue, 10 Jan 2017 20:36:16 +0100
changeset 328875	2e56d81973346704883ec09700fffc3bdc657586
parent 328874	926cb3c2f79aa10a59fcdaec5eaf138780a1dcc9
child 328876	c8442d9681094949505bd02c2e65aeda11decfaa
push id	31191
push user	cbook@mozilla.com
push date	Wed, 11 Jan 2017 15:24:19 +0000
treeherder	mozilla-central@63ad56438630 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	jimm
bugs	569583
milestone	53.0a1
first release with	nightly linux32 97d6f7364394 / 53.0a1 / 20170112030301 / files nightly linux64 97d6f7364394 / 53.0a1 / 20170112030301 / files nightly mac 97d6f7364394 / 53.0a1 / 20170112030301 / files nightly win32 97d6f7364394 / 53.0a1 / 20170112030301 / files nightly win64 97d6f7364394 / 53.0a1 / 20170112030301 / files
last release without	nightly linux32 e68cbc3b5b3d / 53.0a1 / 20170110075905 / files nightly linux64 e68cbc3b5b3d / 53.0a1 / 20170110075905 / files nightly mac e68cbc3b5b3d / 53.0a1 / 20170110075905 / files nightly win32 e68cbc3b5b3d / 53.0a1 / 20170110075905 / files nightly win64 e68cbc3b5b3d / 53.0a1 / 20170110075905 / files

--- a/widget/windows/nsWindow.cpp
+++ b/widget/windows/nsWindow.cpp
@@ -1228,17 +1228,23 @@ nsWindow::ReparentNativeWidget(nsIWidget
   NS_ASSERTION(newParent, "Parent widget has a null native window handle");
   if (newParent && mWnd) {
     ::SetParent(mWnd, newParent);
   }
 }
 
 nsIWidget* nsWindow::GetParent(void)
 {
-  return GetParentWindow(false);
+  if (mIsTopWidgetWindow) {
+    return nullptr;
+  }
+  if (mInDtor || mOnDestroyCalled) {
+    return nullptr;
+  }
+  return mParent;
 }
 
 static int32_t RoundDown(double aDouble)
 {
   return aDouble > 0 ? static_cast<int32_t>(floor(aDouble)) :
                        static_cast<int32_t>(ceil(aDouble));
 }