Replace StyleRange with BreakList; update RenderText, etc.

ui/views/controls/link.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/link.h"
 
 #include "build/build_config.h"
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
@@ skipping 186 matching lines @@
   if (pressed_ != pressed) {
     pressed_ = pressed;
     Label::SetEnabledColor(pressed_ ?
         requested_pressed_color_ : requested_enabled_color_);
     RecalculateFont();
     SchedulePaint();
   }
 }
 
 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)));
   }
 }
 
 }  // namespace views