Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(387)

Unified Diff: components/omnibox/browser/match_compare.h

Issue 1877833002: Optimize shortcuts provider (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Reverted rename of ShortcutMatchToACMatch to ShortcutToACMatch Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/omnibox/browser/match_compare.h
diff --git a/components/omnibox/browser/match_compare.h b/components/omnibox/browser/match_compare.h
new file mode 100644
index 0000000000000000000000000000000000000000..80330cffbb4c4a96fa07c9404f5e2ec4cb19c4e8
--- /dev/null
+++ b/components/omnibox/browser/match_compare.h
@@ -0,0 +1,63 @@
+// Copyright 2016 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.
+
+#ifndef COMPONENTS_OMNIBOX_BROWSER_MATCH_COMPARE_H_
+#define COMPONENTS_OMNIBOX_BROWSER_MATCH_COMPARE_H_
+
+#include "components/omnibox/browser/omnibox_field_trial.h"
+
+// This class implements a special version of AutocompleteMatch::MoreRelevant
+// that allows matches of particular types to be demoted in AutocompleteResult.
+template <class Match> class CompareWithDemoteByType {
+ public:
+ CompareWithDemoteByType(
+ metrics::OmniboxEventProto::PageClassification page_classification) {
+ OmniboxFieldTrial::GetDemotionsByType(page_classification, &demotions_);
+ }
+
+ // Returns the relevance score of |match| demoted appropriately by
+ // |demotions_by_type_|.
+ int GetDemotedRelevance(const Match& match) const {
+ OmniboxFieldTrial::DemotionMultipliers::const_iterator demotion_it =
+ demotions_.find(match.type);
+ return (demotion_it == demotions_.end()) ?
+ match.relevance : (match.relevance * demotion_it->second);
+ }
+
+ // Comparison function.
+ bool operator()(const Match& elem1, const Match& 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);
Peter Kasting 2016/04/15 20:23:44 Not sure this indentation is correct for the ?: op
Alexander Yashkin 2016/04/16 05:18:17 Sorry, I completely forgot about git cl format com
+ }
+
+ private:
+ OmniboxFieldTrial::DemotionMultipliers demotions_;
+};
+
+template<class Match> class DestinationSort {
+ public:
+ DestinationSort(
+ metrics::OmniboxEventProto::PageClassification page_classification)
+ : demote_by_type_(page_classification) {}
+ bool operator()(const Match& elem1, const Match& 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.
+ return (elem1.stripped_destination_url == elem2.stripped_destination_url) ?
+ demote_by_type_(elem1, elem2) :
+ (elem1.stripped_destination_url < elem2.stripped_destination_url);
+ }
+
+ private:
+ CompareWithDemoteByType<Match> demote_by_type_;
+};
+
+#endif // COMPONENTS_OMNIBOX_BROWSER_MATCH_COMPARE_H_

Powered by Google App Engine
This is Rietveld 408576698