Index: chrome/browser/autocomplete/autocomplete_result.cc |
diff --git a/chrome/browser/autocomplete/autocomplete_result.cc b/chrome/browser/autocomplete/autocomplete_result.cc |
deleted file mode 100644 |
index 0a9424b51fbd762a316d998ca0011974b65b133d..0000000000000000000000000000000000000000 |
--- a/chrome/browser/autocomplete/autocomplete_result.cc |
+++ /dev/null |
@@ -1,466 +0,0 @@ |
-// 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/autocomplete/autocomplete_result.h" |
- |
-#include <algorithm> |
-#include <iterator> |
- |
-#include "base/logging.h" |
-#include "base/metrics/histogram.h" |
-#include "base/strings/utf_string_conversions.h" |
-#include "components/metrics/proto/omnibox_event.pb.h" |
-#include "components/metrics/proto/omnibox_input_type.pb.h" |
-#include "components/omnibox/autocomplete_input.h" |
-#include "components/omnibox/autocomplete_match.h" |
-#include "components/omnibox/autocomplete_provider.h" |
-#include "components/omnibox/omnibox_field_trial.h" |
-#include "components/search/search.h" |
-#include "components/url_fixer/url_fixer.h" |
- |
-using metrics::OmniboxEventProto; |
- |
-namespace { |
- |
-// This class implements a special version of AutocompleteMatch::MoreRelevant |
-// that allows matches of particular types to be demoted in AutocompleteResult. |
-class CompareWithDemoteByType { |
- public: |
- CompareWithDemoteByType( |
- OmniboxEventProto::PageClassification current_page_classification); |
- |
- // Returns the relevance score of |match| demoted appropriately by |
- // |demotions_by_type_|. |
- int GetDemotedRelevance(const AutocompleteMatch& match); |
- |
- // Comparison function. |
- bool operator()(const AutocompleteMatch& elem1, |
- const AutocompleteMatch& elem2); |
- |
- private: |
- OmniboxFieldTrial::DemotionMultipliers demotions_; |
-}; |
- |
-CompareWithDemoteByType::CompareWithDemoteByType( |
- OmniboxEventProto::PageClassification current_page_classification) { |
- OmniboxFieldTrial::GetDemotionsByType(current_page_classification, |
- &demotions_); |
-} |
- |
-int CompareWithDemoteByType::GetDemotedRelevance( |
- const AutocompleteMatch& match) { |
- OmniboxFieldTrial::DemotionMultipliers::const_iterator demotion_it = |
- demotions_.find(match.type); |
- return (demotion_it == demotions_.end()) ? |
- match.relevance : (match.relevance * demotion_it->second); |
-} |
- |
-bool CompareWithDemoteByType::operator()(const AutocompleteMatch& elem1, |
- const AutocompleteMatch& elem2) { |
- // Compute demoted relevance scores for each match. |
- const int demoted_relevance1 = GetDemotedRelevance(elem1); |
- const int demoted_relevance2 = GetDemotedRelevance(elem2); |
- // For equal-relevance matches, we sort alphabetically, so that providers |
- // who return multiple elements at the same priority get a "stable" sort |
- // across multiple updates. |
- return (demoted_relevance1 == demoted_relevance2) ? |
- (elem1.contents < elem2.contents) : |
- (demoted_relevance1 > demoted_relevance2); |
-} |
- |
-class DestinationSort { |
- public: |
- DestinationSort( |
- OmniboxEventProto::PageClassification current_page_classification); |
- bool operator()(const AutocompleteMatch& elem1, |
- const AutocompleteMatch& elem2); |
- |
- private: |
- CompareWithDemoteByType demote_by_type_; |
-}; |
- |
-DestinationSort::DestinationSort( |
- OmniboxEventProto::PageClassification current_page_classification) : |
- demote_by_type_(current_page_classification) {} |
- |
-bool DestinationSort::operator()(const AutocompleteMatch& elem1, |
- const AutocompleteMatch& elem2) { |
- // Sort identical destination_urls together. Place the most relevant matches |
- // first, so that when we call std::unique(), these are the ones that get |
- // preserved. |
- if (AutocompleteMatch::DestinationsEqual(elem1, elem2) || |
- (elem1.stripped_destination_url.is_empty() && |
- elem2.stripped_destination_url.is_empty())) { |
- return demote_by_type_(elem1, elem2); |
- } |
- return elem1.stripped_destination_url < elem2.stripped_destination_url; |
-} |
- |
-// Returns true if |match| is allowed to the default match taking into account |
-// whether we're supposed to (and able to) demote all matches with inline |
-// autocompletions. |
-bool AllowedToBeDefaultMatchAccountingForDisableInliningExperiment( |
- const AutocompleteMatch& match, |
- const bool has_legal_default_match_without_completion) { |
- return match.allowed_to_be_default_match && |
- (!OmniboxFieldTrial::DisableInlining() || |
- !has_legal_default_match_without_completion || |
- match.inline_autocompletion.empty()); |
-} |
- |
-}; // namespace |
- |
-// static |
-const size_t AutocompleteResult::kMaxMatches = 6; |
- |
-void AutocompleteResult::Selection::Clear() { |
- destination_url = GURL(); |
- provider_affinity = NULL; |
- is_history_what_you_typed_match = false; |
-} |
- |
-AutocompleteResult::AutocompleteResult() { |
- // Reserve space for the max number of matches we'll show. |
- matches_.reserve(kMaxMatches); |
- |
- // It's probably safe to do this in the initializer list, but there's little |
- // penalty to doing it here and it ensures our object is fully constructed |
- // before calling member functions. |
- default_match_ = end(); |
-} |
- |
-AutocompleteResult::~AutocompleteResult() {} |
- |
-void AutocompleteResult::CopyOldMatches( |
- const AutocompleteInput& input, |
- const AutocompleteResult& old_matches, |
- TemplateURLService* template_url_service) { |
- if (old_matches.empty()) |
- return; |
- |
- if (empty()) { |
- // If we've got no matches we can copy everything from the last result. |
- CopyFrom(old_matches); |
- for (ACMatches::iterator i(begin()); i != end(); ++i) |
- i->from_previous = true; |
- return; |
- } |
- |
- // In hopes of providing a stable popup we try to keep the number of matches |
- // per provider consistent. Other schemes (such as blindly copying the most |
- // relevant matches) typically result in many successive 'What You Typed' |
- // results filling all the matches, which looks awful. |
- // |
- // Instead of starting with the current matches and then adding old matches |
- // until we hit our overall limit, we copy enough old matches so that each |
- // provider has at least as many as before, and then use SortAndCull() to |
- // clamp globally. This way, old high-relevance matches will starve new |
- // low-relevance matches, under the assumption that the new matches will |
- // ultimately be similar. If the assumption holds, this prevents seeing the |
- // new low-relevance match appear and then quickly get pushed off the bottom; |
- // if it doesn't, then once the providers are done and we expire the old |
- // matches, the new ones will all become visible, so we won't have lost |
- // anything permanently. |
- ProviderToMatches matches_per_provider, old_matches_per_provider; |
- BuildProviderToMatches(&matches_per_provider); |
- old_matches.BuildProviderToMatches(&old_matches_per_provider); |
- for (ProviderToMatches::const_iterator i(old_matches_per_provider.begin()); |
- i != old_matches_per_provider.end(); ++i) { |
- MergeMatchesByProvider(input.current_page_classification(), |
- i->second, matches_per_provider[i->first]); |
- } |
- |
- SortAndCull(input, template_url_service); |
-} |
- |
-void AutocompleteResult::AppendMatches(const ACMatches& matches) { |
-#ifndef NDEBUG |
- for (ACMatches::const_iterator i(matches.begin()); i != matches.end(); ++i) { |
- DCHECK_EQ(AutocompleteMatch::SanitizeString(i->contents), i->contents); |
- DCHECK_EQ(AutocompleteMatch::SanitizeString(i->description), |
- i->description); |
- } |
-#endif |
- std::copy(matches.begin(), matches.end(), std::back_inserter(matches_)); |
- default_match_ = end(); |
- alternate_nav_url_ = GURL(); |
-} |
- |
-void AutocompleteResult::SortAndCull( |
- const AutocompleteInput& input, |
- TemplateURLService* template_url_service) { |
- for (ACMatches::iterator i(matches_.begin()); i != matches_.end(); ++i) |
- i->ComputeStrippedDestinationURL(template_url_service); |
- |
- DedupMatchesByDestination(input.current_page_classification(), true, |
- &matches_); |
- |
- // If the result set has at least one legal default match without an inline |
- // autocompletion, then in the disable inlining experiment it will be okay |
- // to demote all matches with inline autocompletions. On the other hand, if |
- // the experiment is active but there is no legal match without an inline |
- // autocompletion, then we'll pretend the experiment is not active and not |
- // demote the matches with an inline autocompletion. In other words, an |
- // alternate name for this variable is |
- // allowed_to_demote_matches_with_inline_autocompletion. |
- bool has_legal_default_match_without_completion = false; |
- for (AutocompleteResult::iterator it = matches_.begin(); |
- (it != matches_.end()) && !has_legal_default_match_without_completion; |
- ++it) { |
- if (it->allowed_to_be_default_match && it->inline_autocompletion.empty()) |
- has_legal_default_match_without_completion = true; |
- } |
- UMA_HISTOGRAM_BOOLEAN("Omnibox.HasLegalDefaultMatchWithoutCompletion", |
- has_legal_default_match_without_completion); |
- |
- // Sort and trim to the most relevant kMaxMatches matches. |
- size_t max_num_matches = std::min(kMaxMatches, matches_.size()); |
- CompareWithDemoteByType comparing_object(input.current_page_classification()); |
- std::sort(matches_.begin(), matches_.end(), comparing_object); |
- if (!matches_.empty() && |
- !AllowedToBeDefaultMatchAccountingForDisableInliningExperiment( |
- *matches_.begin(), has_legal_default_match_without_completion)) { |
- // Top match is not allowed to be the default match. Find the most |
- // relevant legal match and shift it to the front. |
- for (AutocompleteResult::iterator it = matches_.begin() + 1; |
- it != matches_.end(); ++it) { |
- if (AllowedToBeDefaultMatchAccountingForDisableInliningExperiment( |
- *it, has_legal_default_match_without_completion)) { |
- std::rotate(matches_.begin(), it, it + 1); |
- break; |
- } |
- } |
- } |
- // In the process of trimming, drop all matches with a demoted relevance |
- // score of 0. |
- size_t num_matches; |
- for (num_matches = 0u; (num_matches < max_num_matches) && |
- (comparing_object.GetDemotedRelevance(*match_at(num_matches)) > 0); |
- ++num_matches) {} |
- matches_.resize(num_matches); |
- |
- default_match_ = matches_.begin(); |
- |
- if (default_match_ != matches_.end()) { |
- const base::string16 debug_info = |
- base::ASCIIToUTF16("fill_into_edit=") + |
- default_match_->fill_into_edit + |
- base::ASCIIToUTF16(", provider=") + |
- ((default_match_->provider != NULL) |
- ? base::ASCIIToUTF16(default_match_->provider->GetName()) |
- : base::string16()) + |
- base::ASCIIToUTF16(", input=") + |
- input.text(); |
- DCHECK(default_match_->allowed_to_be_default_match) << debug_info; |
- // If the default match is valid (i.e., not a prompt/placeholder), make |
- // sure the type of destination is what the user would expect given the |
- // input. |
- if (default_match_->destination_url.is_valid()) { |
- // We shouldn't get query matches for URL inputs, or non-query matches |
- // for query inputs. |
- if (AutocompleteMatch::IsSearchType(default_match_->type)) { |
- DCHECK_NE(metrics::OmniboxInputType::URL, input.type()) << debug_info; |
- } else { |
- DCHECK_NE(metrics::OmniboxInputType::FORCED_QUERY, input.type()) |
- << debug_info; |
- // If the user explicitly typed a scheme, the default match should |
- // have the same scheme. |
- if ((input.type() == metrics::OmniboxInputType::URL) && |
- input.parts().scheme.is_nonempty()) { |
- const std::string& in_scheme = base::UTF16ToUTF8(input.scheme()); |
- const std::string& dest_scheme = |
- default_match_->destination_url.scheme(); |
- DCHECK(url_fixer::IsEquivalentScheme(in_scheme, dest_scheme)) |
- << debug_info; |
- } |
- } |
- } |
- } |
- |
- // Set the alternate nav URL. |
- alternate_nav_url_ = (default_match_ == matches_.end()) ? |
- GURL() : ComputeAlternateNavUrl(input, *default_match_); |
-} |
- |
-bool AutocompleteResult::HasCopiedMatches() const { |
- for (ACMatches::const_iterator i(begin()); i != end(); ++i) { |
- if (i->from_previous) |
- return true; |
- } |
- return false; |
-} |
- |
-size_t AutocompleteResult::size() const { |
- return matches_.size(); |
-} |
- |
-bool AutocompleteResult::empty() const { |
- return matches_.empty(); |
-} |
- |
-AutocompleteResult::const_iterator AutocompleteResult::begin() const { |
- return matches_.begin(); |
-} |
- |
-AutocompleteResult::iterator AutocompleteResult::begin() { |
- return matches_.begin(); |
-} |
- |
-AutocompleteResult::const_iterator AutocompleteResult::end() const { |
- return matches_.end(); |
-} |
- |
-AutocompleteResult::iterator AutocompleteResult::end() { |
- return matches_.end(); |
-} |
- |
-// Returns the match at the given index. |
-const AutocompleteMatch& AutocompleteResult::match_at(size_t index) const { |
- DCHECK_LT(index, matches_.size()); |
- return matches_[index]; |
-} |
- |
-AutocompleteMatch* AutocompleteResult::match_at(size_t index) { |
- DCHECK_LT(index, matches_.size()); |
- return &matches_[index]; |
-} |
- |
-bool AutocompleteResult::ShouldHideTopMatch() const { |
- return chrome::ShouldHideTopVerbatimMatch() && |
- TopMatchIsStandaloneVerbatimMatch(); |
-} |
- |
-bool AutocompleteResult::TopMatchIsStandaloneVerbatimMatch() const { |
- if (empty() || !match_at(0).IsVerbatimType()) |
- return false; |
- |
- // Skip any copied matches, under the assumption that they'll be expired and |
- // disappear. We don't want this disappearance to cause the visibility of the |
- // top match to change. |
- for (const_iterator i(begin() + 1); i != end(); ++i) { |
- if (!i->from_previous) |
- return !i->IsVerbatimType(); |
- } |
- return true; |
-} |
- |
-void AutocompleteResult::Reset() { |
- matches_.clear(); |
- default_match_ = end(); |
-} |
- |
-void AutocompleteResult::Swap(AutocompleteResult* other) { |
- const size_t default_match_offset = default_match_ - begin(); |
- const size_t other_default_match_offset = |
- other->default_match_ - other->begin(); |
- matches_.swap(other->matches_); |
- default_match_ = begin() + other_default_match_offset; |
- other->default_match_ = other->begin() + default_match_offset; |
- alternate_nav_url_.Swap(&(other->alternate_nav_url_)); |
-} |
- |
-#ifndef NDEBUG |
-void AutocompleteResult::Validate() const { |
- for (const_iterator i(begin()); i != end(); ++i) |
- i->Validate(); |
-} |
-#endif |
- |
-// static |
-GURL AutocompleteResult::ComputeAlternateNavUrl( |
- const AutocompleteInput& input, |
- const AutocompleteMatch& match) { |
- return ((input.type() == metrics::OmniboxInputType::UNKNOWN) && |
- (AutocompleteMatch::IsSearchType(match.type)) && |
- (match.transition != content::PAGE_TRANSITION_KEYWORD) && |
- (input.canonicalized_url() != match.destination_url)) ? |
- input.canonicalized_url() : GURL(); |
-} |
- |
-void AutocompleteResult::DedupMatchesByDestination( |
- OmniboxEventProto::PageClassification page_classification, |
- bool set_duplicate_matches, |
- ACMatches* matches) { |
- DestinationSort destination_sort(page_classification); |
- // Sort matches such that duplicate matches are consecutive. |
- std::sort(matches->begin(), matches->end(), destination_sort); |
- |
- if (set_duplicate_matches) { |
- // Set duplicate_matches for the first match before erasing duplicate |
- // matches. |
- for (ACMatches::iterator i(matches->begin()); i != matches->end(); ++i) { |
- for (int j = 1; (i + j != matches->end()) && |
- AutocompleteMatch::DestinationsEqual(*i, *(i + j)); ++j) { |
- AutocompleteMatch& dup_match(*(i + j)); |
- i->duplicate_matches.insert(i->duplicate_matches.end(), |
- dup_match.duplicate_matches.begin(), |
- dup_match.duplicate_matches.end()); |
- dup_match.duplicate_matches.clear(); |
- i->duplicate_matches.push_back(dup_match); |
- } |
- } |
- } |
- |
- // Erase duplicate matches. |
- matches->erase(std::unique(matches->begin(), matches->end(), |
- &AutocompleteMatch::DestinationsEqual), |
- matches->end()); |
-} |
- |
-void AutocompleteResult::CopyFrom(const AutocompleteResult& rhs) { |
- if (this == &rhs) |
- return; |
- |
- matches_ = rhs.matches_; |
- // Careful! You can't just copy iterators from another container, you have to |
- // reconstruct them. |
- default_match_ = (rhs.default_match_ == rhs.end()) ? |
- end() : (begin() + (rhs.default_match_ - rhs.begin())); |
- |
- alternate_nav_url_ = rhs.alternate_nav_url_; |
-} |
- |
-void AutocompleteResult::BuildProviderToMatches( |
- ProviderToMatches* provider_to_matches) const { |
- for (ACMatches::const_iterator i(begin()); i != end(); ++i) |
- (*provider_to_matches)[i->provider].push_back(*i); |
-} |
- |
-// static |
-bool AutocompleteResult::HasMatchByDestination(const AutocompleteMatch& match, |
- const ACMatches& matches) { |
- for (ACMatches::const_iterator i(matches.begin()); i != matches.end(); ++i) { |
- if (i->destination_url == match.destination_url) |
- return true; |
- } |
- return false; |
-} |
- |
-void AutocompleteResult::MergeMatchesByProvider( |
- OmniboxEventProto::PageClassification page_classification, |
- const ACMatches& old_matches, |
- const ACMatches& new_matches) { |
- if (new_matches.size() >= old_matches.size()) |
- return; |
- |
- size_t delta = old_matches.size() - new_matches.size(); |
- const int max_relevance = (new_matches.empty() ? |
- matches_.front().relevance : new_matches[0].relevance) - 1; |
- // Because the goal is a visibly-stable popup, rather than one that preserves |
- // the highest-relevance matches, we copy in the lowest-relevance matches |
- // first. This means that within each provider's "group" of matches, any |
- // synchronous matches (which tend to have the highest scores) will |
- // "overwrite" the initial matches from that provider's previous results, |
- // minimally disturbing the rest of the matches. |
- for (ACMatches::const_reverse_iterator i(old_matches.rbegin()); |
- i != old_matches.rend() && delta > 0; ++i) { |
- if (!HasMatchByDestination(*i, new_matches)) { |
- AutocompleteMatch match = *i; |
- match.relevance = std::min(max_relevance, match.relevance); |
- match.from_previous = true; |
- matches_.push_back(match); |
- delta--; |
- } |
- } |
-} |