From 54ca9b0a7158d84fbe5f061231ebef4f8e34fe3e Mon Sep 17 00:00:00 2001
From: "dietrich%mozilla.com"
 <dietrich%mozilla.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 18 Jul 2006 21:43:10 +0000
Subject: [PATCH] Reverting Bug 258107 Location bar should sort based on order
 visited, to see if fixes orange on Pacifica

git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@203036 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../history/src/nsGlobalHistory.cpp           | 40 +------------------
 .../components/history/src/nsGlobalHistory.h  |  2 -
 2 files changed, 1 insertion(+), 41 deletions(-)

diff --git a/mozilla/toolkit/components/history/src/nsGlobalHistory.cpp b/mozilla/toolkit/components/history/src/nsGlobalHistory.cpp
index c04ef90238b..852867a5a27 100644
--- a/mozilla/toolkit/components/history/src/nsGlobalHistory.cpp
+++ b/mozilla/toolkit/components/history/src/nsGlobalHistory.cpp
@@ -4265,9 +4265,6 @@ nsGlobalHistory::AutoCompleteTypedSearch(nsIAutoCompleteMdbResult2 **aResult)
   result->SetTokens(kToken_URLColumn, nsIAutoCompleteMdbResult2::kCharType, kToken_NameColumn, nsIAutoCompleteMdbResult2::kUnicharType);
   result->SetReverseByteOrder(mReverseByteOrder);
 
-  // Store hits in an nsIArray initially
-  nsCOMArray<nsIMdbRow> resultArray;
-
   nsCOMPtr<nsIMdbRow> row;
   mdb_pos pos;
   do {
@@ -4275,21 +4272,10 @@ nsGlobalHistory::AutoCompleteTypedSearch(nsIAutoCompleteMdbResult2 **aResult)
     if (!row) break;
     
     if (HasCell(mEnv, row, kToken_TypedColumn)) {
-      resultArray.AppendObject(row);
+      result->AddRow(row);
     }
   } while (row);
 
-  // sort it
-  AutoCompleteSortClosure closure;
-  closure.history = this;
-  resultArray.Sort(TypedSortComparison, NS_STATIC_CAST(void*, &closure));
-
-  // place the sorted array into the autocomplete results
-  count = resultArray.Count();
-  for (PRUint32 i = 0; i < count; ++i) {
-    result->AddRow(resultArray[i]);
-  }
-
   // Determine the result of the search
   PRUint32 matchCount;
   rv = result->GetMatchCount(&matchCount);
@@ -4522,30 +4508,6 @@ nsGlobalHistory::AutoCompleteCompare(nsAString& aHistoryURL,
   return Substring(aHistoryURL, 0, aUserURL.Length()).Equals(aUserURL);
 }
 
-int PR_CALLBACK 
-nsGlobalHistory::TypedSortComparison(nsIMdbRow *row1, nsIMdbRow *row2, 
-                                            void *closureVoid) 
-{
-  // cast our function parameters back into their real form
-  AutoCompleteSortClosure* closure = 
-      NS_STATIC_CAST(AutoCompleteSortClosure*, closureVoid);
-
-  PRInt64 lastVisitedTime1, lastVisitedTime2, diff;
-  closure->history->GetRowValue(row1,
-                                closure->history->kToken_LastVisitDateColumn,
-               &lastVisitedTime1);
-  closure->history->GetRowValue(row2,
-                                closure->history->kToken_LastVisitDateColumn,
-               &lastVisitedTime2);
-
-  LL_SUB(diff, lastVisitedTime2, lastVisitedTime1);
-  if(LL_CMP(diff, >, 0))
-    return 1;
-  else  if(LL_CMP(diff, <, 0))
-    return -1;
-  return 0;
-}
-
 int PR_CALLBACK 
 nsGlobalHistory::AutoCompleteSortComparison(nsIMdbRow *row1, nsIMdbRow *row2, 
                                             void *closureVoid) 
diff --git a/mozilla/toolkit/components/history/src/nsGlobalHistory.h b/mozilla/toolkit/components/history/src/nsGlobalHistory.h
index d326db72651..24fc48b3ecd 100644
--- a/mozilla/toolkit/components/history/src/nsGlobalHistory.h
+++ b/mozilla/toolkit/components/history/src/nsGlobalHistory.h
@@ -226,8 +226,6 @@ protected:
                              AutocompleteExclude* aExclude);
   PR_STATIC_CALLBACK(int)
   AutoCompleteSortComparison(nsIMdbRow *row1, nsIMdbRow *row2, void *closureVoid);
-  PR_STATIC_CALLBACK(int)
-  TypedSortComparison(nsIMdbRow *row1, nsIMdbRow *row2, void *closureVoid);
 
   // AutoCompleteSortClosure - used to pass info into 
   // AutoCompleteSortComparison from the NS_QuickSort() function