Bug 1637043 - Stop highlighting the heuristic search result. r=dao
☠☠ backed out by 40835aba2708 ☠ ☠
authorHarry Twyford <htwyford@mozilla.com>
Tue, 12 May 2020 00:08:16 +0000
changeset 529271 de6d1c1375eebf27d9e52aafba5b4138581e35c0
parent 529270 3dfc4d905e23be7412a11024cc5788690ac0e1c1
child 529272 3a50d857d0979b25bf7f9fe24234bc6b3d9fb464
push id37406
push userdluca@mozilla.com
push dateTue, 12 May 2020 09:34:21 +0000
treeherdermozilla-central@1706d4d54ec6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdao
bugs1637043
milestone78.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1637043 - Stop highlighting the heuristic search result. r=dao Differential Revision: https://phabricator.services.mozilla.com/D74739
browser/components/urlbar/UrlbarProviderPrivateSearch.jsm
browser/components/urlbar/UrlbarProviderSearchSuggestions.jsm
browser/components/urlbar/UrlbarProviderUnifiedComplete.jsm
browser/themes/linux/browser.css
browser/themes/osx/browser.css
--- a/browser/components/urlbar/UrlbarProviderPrivateSearch.jsm
+++ b/browser/components/urlbar/UrlbarProviderPrivateSearch.jsm
@@ -131,17 +131,17 @@ class ProviderPrivateSearch extends Urlb
       logger,
     }).promise;
 
     let result = new UrlbarResult(
       UrlbarUtils.RESULT_TYPE.SEARCH,
       UrlbarUtils.RESULT_SOURCE.SEARCH,
       ...UrlbarResult.payloadAndSimpleHighlights(queryContext.tokens, {
         engine: [engine.name, UrlbarUtils.HIGHLIGHT.TYPED],
-        query: [searchString, UrlbarUtils.HIGHLIGHT.TYPED],
+        query: [searchString, UrlbarUtils.HIGHLIGHT.NONE],
         icon: [engine.iconURI ? engine.iconURI.spec : null],
         inPrivateWindow: true,
         isPrivateEngine,
       })
     );
     result.suggestedIndex = 1;
     addCallback(this, result);
     this.queries.delete(queryContext);
--- a/browser/components/urlbar/UrlbarProviderSearchSuggestions.jsm
+++ b/browser/components/urlbar/UrlbarProviderSearchSuggestions.jsm
@@ -352,17 +352,17 @@ class ProviderSearchSuggestions extends 
         results.push(
           new UrlbarResult(
             UrlbarUtils.RESULT_TYPE.SEARCH,
             UrlbarUtils.RESULT_SOURCE.SEARCH,
             ...UrlbarResult.payloadAndSimpleHighlights(queryContext.tokens, {
               engine: [engine.name, UrlbarUtils.HIGHLIGHT.TYPED],
               suggestion: [result.suggestion, UrlbarUtils.HIGHLIGHT.SUGGESTED],
               keyword: [alias ? alias : undefined, UrlbarUtils.HIGHLIGHT.TYPED],
-              query: [searchString.trim(), UrlbarUtils.HIGHLIGHT.TYPED],
+              query: [searchString.trim(), UrlbarUtils.HIGHLIGHT.NONE],
               isSearchHistory: false,
               icon: [
                 engine.iconURI && !result.suggestion ? engine.iconURI.spec : "",
               ],
               keywordOffer: UrlbarUtils.KEYWORD_OFFER.NONE,
             })
           )
         );
--- a/browser/components/urlbar/UrlbarProviderUnifiedComplete.jsm
+++ b/browser/components/urlbar/UrlbarProviderUnifiedComplete.jsm
@@ -206,17 +206,17 @@ function makeUrlbarResult(tokens, info) 
             engine: [action.params.engineName, UrlbarUtils.HIGHLIGHT.TYPED],
             suggestion: [
               action.params.searchSuggestion,
               UrlbarUtils.HIGHLIGHT.SUGGESTED,
             ],
             keyword: [action.params.alias, UrlbarUtils.HIGHLIGHT.TYPED],
             query: [
               action.params.searchQuery.trim(),
-              UrlbarUtils.HIGHLIGHT.TYPED,
+              UrlbarUtils.HIGHLIGHT.NONE,
             ],
             isSearchHistory: !!action.params.isSearchHistory,
             icon: [info.icon],
             keywordOffer,
           })
         );
       }
       case "keyword": {
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -269,25 +269,22 @@ notification[value="translation"] menuli
 
 %include ../shared/urlbar-autocomplete.inc.css
 
 :root {
   --urlbar-popup-url-color: -moz-nativehyperlinktext;
   --urlbar-popup-action-color: -moz-nativehyperlinktext;
 }
 
-.urlbarView {
+#urlbar,
+#searchbar {
   font-size: 1.05em;
 }
 
 @supports -moz-bool-pref("browser.urlbar.update2.expandTextOnFocus") {
-  .urlbarView {
-    font-size: inherit;
-  }
-
   #urlbar[breakout-extend] {
     font-size: 1.14em;
   }
 }
 
 /* Bookmarking panel */
 
 %include ../shared/places/editBookmarkPanel.inc.css
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -275,25 +275,17 @@
 }
 
 .urlbarView:not(:-moz-lwtheme),
 #PopupSearchAutoComplete:not(:-moz-lwtheme) {
   /* Set custom disabled text color since native graytext is too faint on macOS 10.14+. */
   --panel-disabled-color: #737373;
 }
 
-.urlbarView {
-  font-size: 14px;
-}
-
 @supports -moz-bool-pref("browser.urlbar.update2.expandTextOnFocus") {
-  .urlbarView {
-    font-size: inherit;
-  }
-
   #urlbar[breakout-extend] {
     font-size: 1.36em;
   }
 }
 
 #BMB_bookmarksPopup[side="top"],
 #BMB_bookmarksPopup[side="bottom"] {
   margin-inline: -26px;