Backed out changeset 7159bd45a4f6 (bug 1354809) for causing test failure. a=backout DONTBUILD RELEASE_BASE_20170922
authorJorg K <jorgk@jorgk.com>
Fri, 22 Sep 2017 04:48:28 +0200
changeset 28617 f39bbe313d6de4c83c2fccd85ebe7e972e67926e
parent 28614 a0cedf86bdab256d625bf0842d827bd68eb40182
child 28620 fdb81e2306ae306975f2b08fc097b3c36d0b7da3
child 28622 70f0b16ec8c5129e0b7f6daf30f275ad7b52b923
child 28951 a1abb2ce10b2ff0dc88e0f8933b9f15a1f34873f
child 28954 6e58c772b47e2dd54ea120cf7b5ccf268de3c27b
child 28956 8a323150581cc3a733b15c0adfa36402845ab47f
child 28958 22d55fa7d4644ca82dc580a1de3934dbf952b3c8
child 28960 42e54e8b14b946bb6508a76fbf40b171867c844f
child 28963 4852db884a8a7d8d943d5ef35cfe43381191d316
child 28974 eaf8f59faece9630070117a4b9336cfec5087258
child 28976 9d938417000ae302c659edbc984541d5052d21e9
child 28993 e2b2a54167936db2254ce367d365f3db5af5abe5
child 28996 21cb2dd877bbf1c77c40a10973ce13689e49a976
push id2023
push usermozilla@jorgk.com
push dateFri, 22 Sep 2017 02:49:31 +0000
treeherdercomm-beta@f39bbe313d6d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1354809
backs out7159bd45a4f6813f96ad665986bd4e9da2ced430
Backed out changeset 7159bd45a4f6 (bug 1354809) for causing test failure. a=backout DONTBUILD
mailnews/base/src/nsMsgGroupView.cpp
--- a/mailnews/base/src/nsMsgGroupView.cpp
+++ b/mailnews/base/src/nsMsgGroupView.cpp
@@ -950,19 +950,16 @@ NS_IMETHODIMP nsMsgGroupView::CellTextFo
     }
     return NS_OK;
   }
   return nsMsgDBView::CellTextForColumn(aRow, aColumnName, aValue);
 }
 
 NS_IMETHODIMP nsMsgGroupView::LoadMessageByViewIndex(nsMsgViewIndex aViewIndex)
 {
-  if (!IsValidIndex(aViewIndex))
-    return NS_MSG_INVALID_DBVIEW_INDEX;
-
   if (m_flags[aViewIndex] & MSG_VIEW_FLAG_DUMMY)
   {
     // if we used to have one item selected, and now we have more than one, we should clear the message pane.
     nsCOMPtr<nsIMsgWindow> msgWindow(do_QueryReferent(mMsgWindowWeak));
     nsCOMPtr <nsIMsgWindowCommands> windowCommands;
     if (msgWindow && NS_SUCCEEDED(msgWindow->GetWindowCommands(getter_AddRefs(windowCommands))) && windowCommands)
       windowCommands->ClearMsgPane();
     // since we are selecting a dummy row, we should also clear out m_currentlyDisplayedMsgUri
@@ -999,20 +996,17 @@ int32_t nsMsgGroupView::FindLevelInThrea
 }
 
 
 nsMsgViewIndex nsMsgGroupView::ThreadIndexOfMsg(nsMsgKey msgKey,
                                             nsMsgViewIndex msgIndex /* = nsMsgViewIndex_None */,
                                             int32_t *pThreadCount /* = NULL */,
                                             uint32_t *pFlags /* = NULL */)
 {
-  if (!IsValidIndex(msgIndex))
-    return nsMsgViewIndex_None;
-
-  if (GroupViewUsesDummyRow())
+  if (msgIndex != nsMsgViewIndex_None && GroupViewUsesDummyRow())
   {
     // this case is all we care about at this point.
     if (m_flags[msgIndex] & MSG_VIEW_FLAG_ISTHREAD)
       return msgIndex;
   }
   return nsMsgDBView::ThreadIndexOfMsg(msgKey, msgIndex, pThreadCount, pFlags);
 }