Omnibox: Better Enforce Suggest Relevance Constraints in Keyword Mode

chrome/browser/autocomplete/search_provider.cc

 // Copyright 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/search_provider.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/callback.h"
@@ skipping 828 matching lines @@
     AutocompleteMatch match = HistoryURLProvider::SuggestExactInput(
         this, input_, !HasHTTPScheme(input_.text()));
     match.relevance = matches_.front().relevance + 1;
     matches_.insert(matches_.begin(), match);
   }
 
   if (matches_.size() > max_total_matches)
     matches_.resize(max_total_matches);
 }
 
-bool SearchProvider::IsTopMatchScoreTooLow() const {
-  return matches_.front().relevance < CalculateRelevanceForVerbatim();
+bool SearchProvider::IsTopMatchScoreTooLow(
+    int keyword_search_what_you_typed_relevance) const {
+  return std::max(matches_.front().relevance,
+                  keyword_search_what_you_typed_relevance) <
+         CalculateRelevanceForVerbatim();

[Peter Kasting, 2013/01/21 20:22:57]

Nit: Indent 4

[Mark P, 2013/01/21 20:57:45]

Done.

 }
 
-bool SearchProvider::IsTopMatchHighRankSearchForURL() const {
+bool SearchProvider::IsTopMatchHighRankSearchForURL(
+    int keyword_search_what_you_typed_relevance) const {
   return input_.type() == AutocompleteInput::URL &&
-         matches_.front().relevance > CalculateRelevanceForVerbatim() &&
-         (matches_.front().type == AutocompleteMatch::SEARCH_SUGGEST ||
-          matches_.front().type == AutocompleteMatch::SEARCH_WHAT_YOU_TYPED);
+         ((keyword_search_what_you_typed_relevance >
+           matches_.front().relevance) ||
+          (matches_.front().relevance > CalculateRelevanceForVerbatim() &&
+           (matches_.front().type == AutocompleteMatch::SEARCH_SUGGEST ||
+            matches_.front().type ==
+            AutocompleteMatch::SEARCH_WHAT_YOU_TYPED)));
 }
 
-bool SearchProvider::IsTopMatchNotInlinable() const {
-  return matches_.front().type != AutocompleteMatch::SEARCH_WHAT_YOU_TYPED &&
+bool SearchProvider::IsTopMatchNotInlinable(
+    int keyword_search_what_you_typed_relevance) const {
+  return (keyword_search_what_you_typed_relevance <
+          matches_.front().relevance) &&
+         matches_.front().type != AutocompleteMatch::SEARCH_WHAT_YOU_TYPED &&
          matches_.front().type != AutocompleteMatch::URL_WHAT_YOU_TYPED &&
          matches_.front().inline_autocomplete_offset == string16::npos &&
          matches_.front().fill_into_edit != input_.text();
 }
 
 void SearchProvider::UpdateMatches() {
   ConvertResultsToAutocompleteMatches();
 
+  const int keyword_search_what_you_typed_relevance =
+      providers_.keyword_provider().empty() ? 0 :
+      KeywordProvider::CalculateRelevance(input_.type(), true, true,
+          input_.prefer_keyword(), input_.allow_exact_keyword_match());
+
   // Check constraints that may be violated by suggested relevances.
   if (!matches_.empty() &&
       (has_suggested_relevance_ || verbatim_relevance_ >= 0)) {
     // These two blocks attempt to repair undesriable behavior by suggested
     // relevances with minimal impact, preserving other suggested relevances.
-    if (IsTopMatchScoreTooLow()) {
+    if (IsTopMatchScoreTooLow(keyword_search_what_you_typed_relevance)) {
       // Disregard the suggested verbatim relevance if the top score is below
       // the usual verbatim value. For example, a BarProvider may rely on
       // SearchProvider's verbatim or inlineable matches for input "foo" to
       // always outrank its own lowly-ranked non-inlineable "bar" match.
       verbatim_relevance_ = -1;
       ConvertResultsToAutocompleteMatches();
     }
-    if (IsTopMatchHighRankSearchForURL()) {
+    if (IsTopMatchHighRankSearchForURL(
+        keyword_search_what_you_typed_relevance)) {
       // Disregard the suggested search and verbatim relevances if the input
       // type is URL and the top match is a highly-ranked search suggestion.
       // For example, prevent a search for "foo.com" from outranking another
       // provider's navigation for "foo.com" or "foo.com/url_from_history".
       ApplyCalculatedSuggestRelevance(&keyword_suggest_results_, true);
       ApplyCalculatedSuggestRelevance(&default_suggest_results_, false);
       verbatim_relevance_ = -1;
       ConvertResultsToAutocompleteMatches();
     }
-    if (IsTopMatchNotInlinable()) {
+    if (IsTopMatchNotInlinable(keyword_search_what_you_typed_relevance)) {
       // Disregard suggested relevances if the top match is not SWYT, inlinable,
       // or URL_WHAT_YOU_TYPED (which may be top match regardless of inlining).
       // For example, input "foo" should not invoke a search for "bar", which
       // would happen if the "bar" search match outranked all other matches.
       ApplyCalculatedRelevance();
       ConvertResultsToAutocompleteMatches();
     }
-    DCHECK(!IsTopMatchScoreTooLow());
-    DCHECK(!IsTopMatchHighRankSearchForURL());
-    DCHECK(!IsTopMatchNotInlinable());
+    DCHECK(!IsTopMatchScoreTooLow(keyword_search_what_you_typed_relevance));
+    DCHECK(!IsTopMatchHighRankSearchForURL(
+        keyword_search_what_you_typed_relevance));
+    DCHECK(!IsTopMatchNotInlinable(keyword_search_what_you_typed_relevance));
   }
 
   UpdateStarredStateOfMatches();
   UpdateDone();
 }
 
 void SearchProvider::AddNavigationResultsToMatches(
     const NavigationResults& navigation_results,
     bool is_keyword) {
   if (navigation_results.empty())
@@ skipping 376 matching lines @@
 }
 
 void SearchProvider::UpdateDone() {
   // We're done when the timer isn't running, there are no suggest queries
   // pending, and we're not waiting on instant.
   done_ = (!timer_.IsRunning() && (suggest_results_pending_ == 0) &&
            (instant_finalized_ ||
             (!chrome::BrowserInstantController::IsInstantEnabled(profile_) &&
              !chrome::search::IsInstantExtendedAPIEnabled(profile_))));
 }