Autocomplete suggestions for bookmark TitleMatch's does not order matching bo...

chrome/browser/autocomplete/history_contents_provider.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/autocomplete/history_contents_provider.h"
 
 #include "base/histogram.h"
 #include "base/string_util.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/history/query_parser.h"
@@ skipping 53 matching lines @@
   // (REQUESTED_URL or UNKNOWN with dots) because we get poor results for it,
   // but we could get better results if we did better tokenizing instead.
   if ((input.type() == AutocompleteInput::URL) ||
       (((input.type() == AutocompleteInput::REQUESTED_URL) ||
         (input.type() == AutocompleteInput::UNKNOWN)) &&
        (input.text().find('.') != std::wstring::npos))) {
     Stop();
     return;
   }
 
-  // Change input type and reset relevance counters, so matches will be marked
-  // up properly.
+  // Change input type so matches will be marked up properly.
   input_type_ = input.type();
   trim_http_ = !url_util::FindAndCompareScheme(WideToUTF8(input.text()),
                                                chrome::kHttpScheme, NULL);
-  star_title_count_ = star_contents_count_ = title_count_ = contents_count_ = 0;
 
   // Decide what to do about any previous query/results.
   if (!minimal_changes) {
     // Any in-progress request is irrelevant, cancel it.
     Stop();
   } else if (have_results_) {
     // We finished the previous query and still have its results.  Mark them up
     // again for the new input.
     ConvertResults();
     return;
@@ skipping 53 matching lines @@
   results_.AppendResultsBySwapping(results, true);
   have_results_ = true;
   ConvertResults();
 
   done_ = true;
   if (listener_)
     listener_->OnProviderUpdate(!matches_.empty());
 }
 
 void HistoryContentsProvider::ConvertResults() {
+  // Reset the relevance counters so that result relevance won't vary on
+  // subsequent passes of ConvertResults.
+  star_title_count_ = star_contents_count_ = title_count_ = contents_count_ = 0;
+
   // Make the result references and score the results.
   std::vector<MatchReference> result_refs;
   result_refs.reserve(results_.size());
-  for (size_t i = 0; i < results_.size(); i++) {
-    MatchReference ref(&results_[i], CalculateRelevance(results_[i]));
+
+  // Results are sorted in decreasing order so we run the loop backwards so that
+  // the relevance increment favors the higher ranked results.
+  for (std::vector<history::URLResult*>::const_reverse_iterator i =
+       results_.rbegin(); i != results_.rend(); ++i) {
+    history::URLResult* result = *i;
+    MatchReference ref(result, CalculateRelevance(*result));
     result_refs.push_back(ref);
   }
 
   // Get the top matches and add them. Always do max number of matches the popup
   // will show plus one. This ensures that if the other providers provide the
   // exact same set of results, and the db only has max_matches + 1 results
   // available for this query, we know the last one.
   //
   // This is done to avoid having the history search shortcut show
   // 'See 1 previously viewed ...'.
@@ skipping 100 matching lines @@
       NOTREACHED();
       return 0;
   }
 }
 
 void HistoryContentsProvider::QueryBookmarks(const AutocompleteInput& input) {
   BookmarkModel* bookmark_model = profile_->GetBookmarkModel();
   if (!bookmark_model)
     return;
 
-  DCHECK(results_.size() == 0);  // When we get here the results should be
-                                 // empty.
+  DCHECK(results_.empty());
 
   TimeTicks start_time = TimeTicks::Now();
   std::vector<bookmark_utils::TitleMatch> matches;
   bookmark_model->GetBookmarksWithTitlesMatching(input.text(), max_matches(),
                                                  &matches);
   for (size_t i = 0; i < matches.size(); ++i)
     AddBookmarkTitleMatchToResults(matches[i]);
   UMA_HISTOGRAM_TIMES("Omnibox.QueryBookmarksTime",
                       TimeTicks::Now() - start_time);
 }
 
 void HistoryContentsProvider::AddBookmarkTitleMatchToResults(
     const bookmark_utils::TitleMatch& match) {
   history::URLResult url_result(match.node->GetURL(), match.match_positions);
   url_result.set_title(match.node->GetTitle());
   results_.AppendURLBySwapping(&url_result);
 }