Omnibox: Highlight Matches in URLs Properly

chrome/browser/history/scored_history_match.cc

 // Copyright (c) 2012 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/history/scored_history_match.h"
 
 #include <algorithm>
 #include <functional>
 #include <iterator>
 #include <numeric>
@@ skipping 50 matching lines @@
       raw_score_(0),
       can_inline_(false) {
   Init();
 
   GURL gurl = row.url();
   if (!gurl.is_valid())
     return;
 
   // Figure out where each search term appears in the URL and/or page title
   // so that we can score as well as provide autocomplete highlighting.
-  base::string16 url = bookmark_utils::CleanUpUrlForMatching(gurl, languages);
+  base::OffsetAdjuster::Adjustments adjustments;
+  base::string16 url =
+      bookmark_utils::CleanUpUrlForMatching(gurl, languages, &adjustments);
   base::string16 title = bookmark_utils::CleanUpTitleForMatching(row.title());
   int term_num = 0;
   for (String16Vector::const_iterator iter = terms.begin(); iter != terms.end();
        ++iter, ++term_num) {
     base::string16 term = *iter;
     TermMatches url_term_matches = MatchTermInString(term, url, term_num);
     TermMatches title_term_matches = MatchTermInString(term, title, term_num);
     if (url_term_matches.empty() && title_term_matches.empty())
       return;  // A term was not found in either URL or title - reject.
     url_matches_.insert(url_matches_.end(), url_term_matches.begin(),
@@ skipping 118 matching lines @@
     // Incorporate hup_like_score into raw_score.
     raw_score_ = std::max(raw_score_, hup_like_score);
   }
 
   // If this match is not inlineable and there's a cap on the maximum
   // score that can be given to non-inlineable matches, apply the cap.
   if (!can_inline_ && (max_assigned_score_for_non_inlineable_matches_ != -1)) {
     raw_score_ = std::min(max_assigned_score_for_non_inlineable_matches_,
                           raw_score_);
   }
+
+  // Now that we're done processing this entry, correct the offsets of the
+  // matches in |url_matches_| so they point to offsets in the original URL
+  // spec, not the cleaned-up URL string that we used for matching.
+  std::vector<size_t> offsets = OffsetsFromTermMatches(url_matches_);
+  base::OffsetAdjuster::UnadjustOffsets(adjustments, &offsets);
+  url_matches_ = ReplaceOffsetsInTermMatches(url_matches_, offsets);
 }
 
 ScoredHistoryMatch::~ScoredHistoryMatch() {}
 
 // Comparison function for sorting ScoredMatches by their scores with
 // intelligent tie-breaking.
 bool ScoredHistoryMatch::MatchScoreGreater(const ScoredHistoryMatch& m1,
                                            const ScoredHistoryMatch& m2) {
   if (m1.raw_score_ != m2.raw_score_)
     return m1.raw_score_ > m2.raw_score_;
@@ skipping 371 matching lines @@
     max_assigned_score_for_non_inlineable_matches_ =
         HistoryURLProvider::kScoreForBestInlineableResult - 1;
   }
   bookmark_value_ = OmniboxFieldTrial::HQPBookmarkValue();
   allow_tld_matches_ = OmniboxFieldTrial::HQPAllowMatchInTLDValue();
   allow_scheme_matches_ = OmniboxFieldTrial::HQPAllowMatchInSchemeValue();
   initialized_ = true;
 }
 
 }  // namespace history