Bug 826115 - Remove noisy NS_ENSURE_TRUE(rollupWidget, false) from nsWindow.cpp
authorMarco Bonardo <mbonardo@mozilla.com>
Fri, 04 Jan 2013 17:42:34 +0100
changeset 117596 324f9002ab8a95a41d99f0827f9f85a44e51f3a7
parent 117595 3355493a69642ad095456bb563c5b1954b55b311
child 117597 c75726a3b18185d1a54ed0403409f2256d07f504
push id20601
push usermak77@bonardo.net
push dateFri, 04 Jan 2013 16:44:54 +0000
treeherdermozilla-inbound@324f9002ab8a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs826115
milestone20.0a1
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
Bug 826115 - Remove noisy NS_ENSURE_TRUE(rollupWidget, false) from nsWindow.cpp r=jimm
widget/windows/nsWindow.cpp
--- a/widget/windows/nsWindow.cpp
+++ b/widget/windows/nsWindow.cpp
@@ -8027,17 +8027,18 @@ nsWindow::DealWithPopups(HWND inWnd, UIN
 
   *outResult = MA_NOACTIVATE;
 
   if (!::IsWindowVisible(inWnd))
     return false;
   nsIRollupListener* rollupListener = nsBaseWidget::GetActiveRollupListener();
   NS_ENSURE_TRUE(rollupListener, false);
   nsCOMPtr<nsIWidget> rollupWidget = rollupListener->GetRollupWidget();
-  NS_ENSURE_TRUE(rollupWidget, false);
+  if (!rollupWidget)
+    return false;
 
   inMsg = WinUtils::GetNativeMessage(inMsg);
   if (inMsg == WM_LBUTTONDOWN || inMsg == WM_RBUTTONDOWN || inMsg == WM_MBUTTONDOWN ||
       inMsg == WM_MOUSEWHEEL || inMsg == WM_MOUSEHWHEEL || inMsg == WM_ACTIVATE ||
       (inMsg == WM_KILLFOCUS && IsDifferentThreadWindow((HWND)inWParam)) ||
       inMsg == WM_NCRBUTTONDOWN ||
       inMsg == WM_MOVING ||
       inMsg == WM_SIZING ||