Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-04 13:07:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Reverting Bug 258107 Location bar should sort based on order visited, caused problems on branch on Pacifica

Browse Source
This commit is contained in:
dietrich%mozilla.com 2006-07-19 00:04:55 +00:00
parent 8158ab9df0
commit 529a02eb94
2 changed files with 1 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
toolkit/components/history/src/nsGlobalHistory.cpp
View File

@ -4329,9 +4329,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 {
@ -4339,21 +4336,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);
@ -4586,30 +4572,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)

2
toolkit/components/history/src/nsGlobalHistory.h
View File

@ -228,8 +228,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