Replace StyleRange with BreakList; update RenderText, etc.

chrome/browser/ui/views/omnibox/omnibox_view_views.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 "chrome/browser/ui/views/omnibox/omnibox_view_views.h"
 
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
@@ skipping 63 matching lines @@
                         const ViewState& view_state)
       : model_state(model_state),
         view_state(view_state) {
   }
   virtual ~AutocompleteEditState() {}
 
   const OmniboxEditModel::State model_state;
   const ViewState view_state;
 };
 
-// A convenience method for applying URL styles.
-void ApplyURLStyle(views::Textfield* textfield,
-                   size_t start,
-                   size_t end,
-                   SkColor color,
-                   bool diagonal_strike) {
-  gfx::StyleRange style;
-  style.foreground = color;
-  style.range = ui::Range(start, end);
-  style.diagonal_strike = diagonal_strike;
-  textfield->ApplyStyleRange(style);
-}
-
 // The following const value is the same as in browser_defaults.
 const int kAutocompleteEditFontPixelSize = 15;
 // Font size 10px (as defined in browser_defaults) is too small for many
 // non-Latin/Greek/Cyrillic (non-LGC) scripts. For pop-up window, the total
 // rectangle is 21px tall and the height available for "ink" is 17px (please
 // refer to kAutocompleteVerticalMarginInPopup). With 12px font size, the
 // tallest glyphs in UI fonts we're building for ChromeOS (across all scripts)
 // still fit within 17px "ink" height.
 const int kAutocompleteEditFontPixelSizeInPopup = 12;
 
@@ skipping 798 matching lines @@
   // should emphasize.  To check for a URL, rather than using the type returned
   // by Parse(), ask the model, which will check the desired page transition for
   // this input.  This can tell us whether an UNKNOWN input string is going to
   // be treated as a search or a navigation, and is the same method the Paste
   // And Go system uses.
   string16 text = GetText();
   url_parse::Component scheme, host;
   AutocompleteInput::ParseForEmphasizeComponents(text, model()->GetDesiredTLD(),
                                                  &scheme, &host);
   const bool emphasize = model()->CurrentTextIsURL() && (host.len > 0);
-
-  SkColor base_color = location_bar_view_->GetColor(
-      security_level_,
-      emphasize ? LocationBarView::DEEMPHASIZED_TEXT : LocationBarView::TEXT);
-  ApplyURLStyle(textfield_, 0, text.length(), base_color, false);
-
+  textfield_->SetColor(location_bar_view_->GetColor(security_level_,
+      emphasize ? LocationBarView::DEEMPHASIZED_TEXT : LocationBarView::TEXT));
   if (emphasize) {
-    SkColor normal_color = location_bar_view_->GetColor(
-        security_level_, LocationBarView::TEXT);
-    ApplyURLStyle(textfield_, host.begin, host.end(), normal_color, false);
+    textfield_->ApplyColor(
+        location_bar_view_->GetColor(security_level_, LocationBarView::TEXT),
+        ui::Range(host.begin, host.end()));
   }
 
   // Emphasize the scheme for security UI display purposes (if necessary).
   // Note that we check CurrentTextIsURL() because if we're replacing search
   // URLs with search terms, we may have a non-URL even when the user is not
   // editing; and in some cases, e.g. for "site:foo.com" searches, the parser
   // may have incorrectly identified a qualifier as a scheme.
   if (!model()->user_input_in_progress() && model()->CurrentTextIsURL() &&
       scheme.is_nonempty() && (security_level_ != ToolbarModel::NONE)) {
     SkColor security_color = location_bar_view_->GetColor(
         security_level_, LocationBarView::SECURITY_TEXT);
-    bool use_strikethrough = (security_level_ == ToolbarModel::SECURITY_ERROR);
-    ApplyURLStyle(textfield_, scheme.begin, scheme.end(),
-                  security_color, use_strikethrough);
+    const bool strike = (security_level_ == ToolbarModel::SECURITY_ERROR);
+    const ui::Range scheme_range(scheme.begin, scheme.end());
+    textfield_->ApplyColor(security_color, scheme_range);
+    textfield_->ApplyStyle(gfx::DIAGONAL_STRIKE, strike, scheme_range);
   }
 }
 
 void OmniboxViewViews::SetTextAndSelectedRange(const string16& text,
                                                const ui::Range& range) {
   if (text != GetText())
     textfield_->SetText(text);
   textfield_->SelectRange(range);
 }
 
@@ skipping 12 matching lines @@
   if (!text.empty()) {
     // Record this paste, so we can do different behavior.
     model()->on_paste();
     // Force a Paste operation to trigger the text_changed code in
     // OnAfterPossibleChange(), even if identical contents are pasted into the
     // text box.
     text_before_change_.clear();
     textfield_->ReplaceSelection(text);
   }
 }