Replace StyleRange with BreakList; update RenderText, etc.

ui/views/controls/link.cc

Index: ui/views/controls/link.cc
diff --git a/ui/views/controls/link.cc b/ui/views/controls/link.cc
index 04c83ac3af628bce83147af1514656a4ca576ae8..1397e38471db0f34dd187d06fef5ae69b5d1a17f 100644
--- a/ui/views/controls/link.cc
+++ b/ui/views/controls/link.cc
@@ -204,13 +204,11 @@ void Link::SetPressed(bool pressed) {
 }
 
 void Link::RecalculateFont() {
-  // The font should be underlined iff the link is enabled and |underline_| is
-  // true.
-  if ((enabled() && underline_) ==
-      !(font().GetStyle() & gfx::Font::UNDERLINED)) {
+  // Set an underline iff the link is enabled and |underline_| is true.
+  if ((enabled() && underline_) != (font().GetStyle() & gfx::Font::UNDERLINE)) {

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

This is not correct.

The result of (font().GetStyle() & gfx::Font::UNDERLINE) will either be 0 or
gfx::Font::UNDERLINE.

The result of (enabled() && underline_) will either be true (1) or false (0).

Your new logic will only work if 1 == gfx::Font::UNDERLINE, which is a bad
assumption to make (and false, I think).

You can do this instead:

const bool is_underline = (font().GetStyle() & gfx::Font::UNDERLINE) ? true :
false;
if ((enabled() && underline_) != is_underline) {
  ...
}

It also sounds like this should have a test, since I assume the logic breakage
wasn't caught by any test...

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

Adjusted, thanks for the catch (worked trivially in my use).

     Label::SetFont(font().DeriveFont(0, enabled() && underline_ ?
-        (font().GetStyle() | gfx::Font::UNDERLINED) :
-        (font().GetStyle() & ~gfx::Font::UNDERLINED)));
+        (font().GetStyle() | gfx::Font::UNDERLINE) :
+        (font().GetStyle() & ~gfx::Font::UNDERLINE)));
   }
 }