Replace StyleRange with BreakList; update RenderText, etc.

ui/views/controls/textfield/native_textfield_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 "ui/views/controls/textfield/native_textfield_views.h"
 
 #include <algorithm>
 #include <set>
 
 #include "base/bind.h"
@@ skipping 423 matching lines @@
 void NativeTextfieldViews::UpdateBorderColor() {
   if (textfield_->use_default_border_color())
     text_border_->UseDefaultColor();
   else
     text_border_->SetColor(textfield_->border_color());
 
   SchedulePaint();
 }
 
 void NativeTextfieldViews::UpdateTextColor() {
-  gfx::StyleRange default_style(GetRenderText()->default_style());
-  default_style.foreground = textfield_->GetTextColor();
-  GetRenderText()->set_default_style(default_style);
-  GetRenderText()->ApplyDefaultStyle();
+  GetRenderText()->SetColor(textfield_->GetTextColor());

[Alexei Svitkine (slow), 2013/01/23 16:52:54]

Nit: Just call SetColor(textfield_->GetTextColor()); - which already does a
SchedulePaint().

[msw, 2013/01/25 09:10:02]

Done.

   SchedulePaint();
 }
 
 void NativeTextfieldViews::UpdateBackgroundColor() {
   const SkColor color = textfield_->GetBackgroundColor();
   set_background(Background::CreateSolidBackground(color));
   GetRenderText()->set_background_is_transparent(SkColorGetA(color) != 0xFF);
   SchedulePaint();
 }
 
@@ skipping 233 matching lines @@
         controller->ExecuteCommand(command_id);
         break;
     }
   }
 
   // The cursor must have changed if text changed during cut/paste/delete.
   UpdateAfterChange(text_changed, text_changed);
   OnAfterUserAction();
 }
 
-void NativeTextfieldViews::ApplyStyleRange(const gfx::StyleRange& style) {
-  GetRenderText()->ApplyStyleRange(style);
+void NativeTextfieldViews::SetColor(SkColor value) {
+  GetRenderText()->SetColor(value);
   SchedulePaint();
 }
 
-void NativeTextfieldViews::ApplyDefaultStyle() {
-  GetRenderText()->ApplyDefaultStyle();
+void NativeTextfieldViews::ApplyColor(SkColor value, const ui::Range& range) {
+  GetRenderText()->ApplyColor(value, range);
   SchedulePaint();
 }
 
+void NativeTextfieldViews::SetStyle(gfx::TextStyle style, bool value) {
+  GetRenderText()->SetStyle(style, value);
+  SchedulePaint();
+}
+
+void NativeTextfieldViews::ApplyStyle(gfx::TextStyle style,
+                                      bool value,
+                                      const ui::Range& range) {
+  GetRenderText()->ApplyStyle(style, value, range);
+  SchedulePaint();
+}
+
 void NativeTextfieldViews::OnBoundsChanged(const gfx::Rect& previous_bounds) {
   // Set the RenderText display area.
   gfx::Insets insets = GetInsets();
   gfx::Rect display_rect(insets.left(),
                          insets.top(),
                          width() - insets.width(),
                          height() - insets.height());
   GetRenderText()->SetDisplayRect(display_rect);
   OnCaretBoundsChanged();
 }
@@ skipping 564 matching lines @@
   // Filter out all control characters, including tab and new line characters,
   // and all characters with Alt modifier. But we need to allow characters with
   // AltGr modifier.
   // On Windows AltGr is represented by Alt+Ctrl, and on Linux it's a different
   // flag that we don't care about.
   return ((ch >= 0x20 && ch < 0x7F) || ch > 0x9F) &&
       (flags & ~(ui::EF_SHIFT_DOWN | ui::EF_CAPS_LOCK_DOWN)) != ui::EF_ALT_DOWN;
 }
 
 }  // namespace views