Replace StyleRange with BreakList; update RenderText, etc.

ui/views/controls/textfield/textfield.h

 // 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.
 
 #ifndef UI_VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_H_
 #define UI_VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/string16.h"
 #include "build/build_config.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/ime/text_input_type.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/native_widget_types.h"
+#include "ui/gfx/text_constants.h"
 #include "ui/views/controls/textfield/native_textfield_wrapper.h"
 #include "ui/views/view.h"
 
 #if !defined(OS_LINUX)
 #include "base/logging.h"
 #endif
 
-namespace gfx {
-struct StyleRange;
-}  // namespace gfx
-
 namespace ui {
 class Range;
 class TextInputClient;
 }  // namespace ui
 
 namespace views {
 
 class TextfieldController;
 
 // This class implements a View that wraps a native text (edit) field.
@@ skipping 162 matching lines @@
   void GetSelectionModel(gfx::SelectionModel* sel) const;
 
   // Selects the text given by |sel|. This is views-implementation only and
   // has to be called after the wrapper is created.
   void SelectSelectionModel(const gfx::SelectionModel& sel);
 
   // Returns the current cursor position. This is views-implementation
   // only and has to be called after the wrapper is created.
   size_t GetCursorPosition() const;
 
-  // Applies |style| to the text specified by its range. The style will be
-  // ignored if range is empty or invalid. This is views-implementation only and
+  // Set the text color over the entire text or a logical character range.
+  // Empty and invalid ranges are ignored. This is views-implementation only and
   // has to be called after the wrapper is created.
-  void ApplyStyleRange(const gfx::StyleRange& style);
+  void SetColor(SkColor value);
+  void ApplyColor(SkColor value, const ui::Range& range);
 
-  // Applies the default style to the textfield. This is views-implementation
-  // only and has to be called after the wrapper is created.
-  void ApplyDefaultStyle();
+  // Set various text styles over the entire text or a logical character range.
+  // Empty and invalid ranges are ignored. This is views-implementation only and
+  // has to be called after the wrapper is created.
+  void SetStyle(gfx::TextStyle style, bool value);

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

Please document the |value| parameter better. It wasn't immediately obvious to
me  that |value| is used to say whether the style is added or removed.

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

Done.

+  void ApplyStyle(gfx::TextStyle style, bool value, const ui::Range& range);
 
   // Clears Edit history.
   void ClearEditHistory();
 
   // Set the accessible name of the text field.
   void SetAccessibleName(const string16& name);
 
   // Performs the action associated with the specified command id.
   void ExecuteCommand(int command_id);
 
@@ skipping 92 matching lines @@
 
   // The input type of this text field.
   ui::TextInputType text_input_type_;
 
   DISALLOW_COPY_AND_ASSIGN(Textfield);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_H_