Replace StyleRange with BreakList; update RenderText, etc.

ui/app_list/views/search_result_view.cc

 // 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 "ui/app_list/views/search_result_view.h"
 
 #include "ui/app_list/app_list_constants.h"
 #include "ui/app_list/search_result.h"
 #include "ui/app_list/views/search_result_list_view.h"
 #include "ui/gfx/canvas.h"
@@ skipping 46 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(IconView);
 };
 
 // Creates a RenderText of given |text| and |styles|. Caller takes ownership
 // of returned RenderText.
 gfx::RenderText* CreateRenderText(const string16& text,
                                   const app_list::SearchResult::Tags& tags) {
   gfx::RenderText* render_text = gfx::RenderText::CreateInstance();
   render_text->SetText(text);
-
-  gfx::StyleRange default_style;
-  default_style.foreground = kDefaultTextColor;
-  render_text->set_default_style(default_style);
-  render_text->ApplyDefaultStyle();
+  render_text->SetColor(kDefaultTextColor);
 
   for (app_list::SearchResult::Tags::const_iterator it = tags.begin();
        it != tags.end();
        ++it) {
     // NONE means default style so do nothing.
     if (it->styles == app_list::SearchResult::Tag::NONE)
       continue;
 
-    gfx::StyleRange style;
-    style.range = it->range;
-
     if (it->styles & app_list::SearchResult::Tag::MATCH)
-      style.font_style = gfx::Font::BOLD;
+      render_text->ApplyStyle(gfx::BOLD, true, it->range);
     if (it->styles & app_list::SearchResult::Tag::URL)
-      style.foreground = kURLTextColor;
+      render_text->ApplyColor(kURLTextColor, it->range);
     if (it->styles & app_list::SearchResult::Tag::DIM)

[Alexei Svitkine (slow), 2013/01/22 19:20:21]

Can you make the last two if statements an "if else". (and switch the order, so
to ensure DIM continues to take precedence).

[msw, 2013/01/22 22:27:24]

Done.

-      style.foreground = kDimmedTextColor;
-
-    render_text->ApplyStyleRange(style);
+      render_text->ApplyColor(kDimmedTextColor, it->range);
   }
 
   return render_text;
 }
 
 }  // namespace
 
 namespace app_list {
 
 // static
@@ skipping 199 matching lines @@
       views::ImageButton* button = action_buttons_[i];
       button->SetImage(views::CustomButton::STATE_NORMAL, &icon.base_image);
       button->SetImage(views::CustomButton::STATE_HOVERED, &icon.hover_image);
       button->SetImage(views::CustomButton::STATE_PRESSED, &icon.pressed_image);
       button->SetTooltipText(icon.tooltip_text);
     }
   }
 }
 
 }  // namespace app_list