views: recompute omnibox text colors

Resetting the text to the default color is incorrect - OmniboxTextView::SetText
contains logic to apply special colors depending on the type of result. This
change adds a method to OmniboxTextView called ReapplyStyling() which causes
OmniboxTextView to recompute and reapply this text styling.  This is necessary
in high contrast modes because these use different text styling for the selected
or hovered result.

Bug: 865918
Change-Id: Ia2c68e6cb3329b1d58d86dc9f6999420810a9d6d
Reviewed-on: https://chromium-review.googlesource.com/1145136Reviewed-by: Leonard Grey <lgrey@chromium.org>
Commit-Queue: Elly Fong-Jones <ellyjones@chromium.org>
Cr-Commit-Position: refs/heads/master@{#577519}

chrome/browser/ui/views/omnibox/omnibox_result_view.cc

@@ -178,12 +178,14 @@ void OmniboxResultView::Invalidate() {
                                          match_.contents_class);
     suggestion_view_->description()->SetText(match_.description,
                                              match_.description_class);
-    // Explicitly re-apply default styling - high contrast modes use different
-    // text colors depending on selection state.
-    suggestion_view_->content()->ApplyTextColor(
-        OmniboxPart::RESULTS_TEXT_DEFAULT);
-    suggestion_view_->description()->ApplyTextColor(
-        OmniboxPart::RESULTS_TEXT_DEFAULT);
+
+    // Normally, OmniboxTextView caches its appearance, but in high contrast
+    // selected-ness changes the text colors, so the styling of the text part of
+    // the results needs to be recomputed.
+    if (high_contrast) {
+      suggestion_view_->content()->ReapplyStyling();
+      suggestion_view_->description()->ReapplyStyling();
+    }
   }
 
   AutocompleteMatch* keyword_match = match_.associated_keyword.get();

chrome/browser/ui/views/omnibox/omnibox_text_view.cc

@@ -224,36 +224,7 @@ void OmniboxTextView::SetText(const base::string16& text,
       std::make_unique<ACMatchClassifications>(classifications);
   render_text_ = CreateRenderText(text);
 
-  const size_t text_length = render_text_->text().length();
-  for (size_t i = 0; i < classifications.size(); ++i) {
-    const size_t text_start = classifications[i].offset;
-    if (text_start >= text_length)
-      break;
-
-    const size_t text_end =
-        (i < (classifications.size() - 1))
-            ? std::min(classifications[i + 1].offset, text_length)
-            : text_length;
-    const gfx::Range current_range(text_start, text_end);
-
-    // Calculate style-related data.
-    if (classifications[i].style & ACMatchClassification::MATCH)
-      render_text_->ApplyWeight(gfx::Font::Weight::BOLD, current_range);
-
-    OmniboxPart part = OmniboxPart::RESULTS_TEXT_DEFAULT;
-    if (classifications[i].style & ACMatchClassification::URL) {
-      part = OmniboxPart::RESULTS_TEXT_URL;
-      render_text_->SetDirectionalityMode(gfx::DIRECTIONALITY_AS_URL);
-    } else if (classifications[i].style & ACMatchClassification::DIM) {
-      part = OmniboxPart::RESULTS_TEXT_DIMMED;
-    } else if (classifications[i].style & ACMatchClassification::INVISIBLE) {
-      part = OmniboxPart::RESULTS_TEXT_INVISIBLE;
-    }
-    render_text_->ApplyColor(result_view_->GetColor(part), current_range);
-  }
-
-  UpdateLineHeight();
-  SetPreferredSize(CalculatePreferredSize());
+  ReapplyStyling();
 }
 
 void OmniboxTextView::SetText(const SuggestionAnswer::ImageLine& line,
@@ -309,6 +280,40 @@ int OmniboxTextView::GetLineHeight() const {
   return font_height_;
 }
 
+void OmniboxTextView::ReapplyStyling() {
+  const ACMatchClassifications& classifications = *cached_classifications_;
+  const size_t text_length = render_text_->text().length();
+  for (size_t i = 0; i < classifications.size(); ++i) {
+    const size_t text_start = classifications[i].offset;
+    if (text_start >= text_length)
+      break;
+
+    const size_t text_end =
+        (i < (classifications.size() - 1))
+            ? std::min(classifications[i + 1].offset, text_length)
+            : text_length;
+    const gfx::Range current_range(text_start, text_end);
+
+    // Calculate style-related data.
+    if (classifications[i].style & ACMatchClassification::MATCH)
+      render_text_->ApplyWeight(gfx::Font::Weight::BOLD, current_range);
+
+    OmniboxPart part = OmniboxPart::RESULTS_TEXT_DEFAULT;
+    if (classifications[i].style & ACMatchClassification::URL) {
+      part = OmniboxPart::RESULTS_TEXT_URL;
+      render_text_->SetDirectionalityMode(gfx::DIRECTIONALITY_AS_URL);
+    } else if (classifications[i].style & ACMatchClassification::DIM) {
+      part = OmniboxPart::RESULTS_TEXT_DIMMED;
+    } else if (classifications[i].style & ACMatchClassification::INVISIBLE) {
+      part = OmniboxPart::RESULTS_TEXT_INVISIBLE;
+    }
+    render_text_->ApplyColor(result_view_->GetColor(part), current_range);
+  }
+
+  UpdateLineHeight();
+  SetPreferredSize(CalculatePreferredSize());
+}
+
 std::unique_ptr<gfx::RenderText> OmniboxTextView::CreateRenderText(
     const base::string16& text) const {
   auto render_text = gfx::RenderText::CreateHarfBuzzInstance();

chrome/browser/ui/views/omnibox/omnibox_text_view.h

@@ -63,6 +63,10 @@ class OmniboxTextView : public views::View {
   // multiple lines.
   int GetLineHeight() const;
 
+  // Reapplies text styling to the results text, based on the types of the match
+  // parts.
+  void ReapplyStyling();
+
  private:
   std::unique_ptr<gfx::RenderText> CreateRenderText(
       const base::string16& text) const;