Prepare to use gfx::RenderText in views::Label.

ui/views/controls/label.cc

Index: ui/views/controls/label.cc
diff --git a/ui/views/controls/label.cc b/ui/views/controls/label.cc
index 368f1d8e3dfc09da438d2e9eb3a851520235ff3b..c0bbe667764bcb4e5d21780b154b50ab9a8a8c65 100644
--- a/ui/views/controls/label.cc
+++ b/ui/views/controls/label.cc
@@ -12,25 +12,13 @@
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
 #include "base/strings/string_split.h"
-#include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_utils.h"
-#include "ui/gfx/insets.h"
 #include "ui/gfx/text_elider.h"
-#include "ui/gfx/text_utils.h"
-#include "ui/gfx/utf16_indexing.h"
 #include "ui/native_theme/native_theme.h"
-#include "ui/views/background.h"
-
-namespace {
-
-const int kCachedSizeLimit = 10;
-const base::char16 kPasswordReplacementChar = '*';
-
-}  // namespace
 
 namespace views {
 
@@ -54,31 +42,13 @@ Label::~Label() {
 }
 
 void Label::SetFontList(const gfx::FontList& font_list) {
-  font_list_ = font_list;
-  ResetCachedSize();
-  PreferredSizeChanged();
-  SchedulePaint();
+  render_text_->SetFontList(font_list);
+  ResetLayout();
 }
 
 void Label::SetText(const base::string16& text) {
-  if (text != text_)
-    SetTextInternal(text);
-}
-
-void Label::SetTextInternal(const base::string16& text) {
-  text_ = text;
-
-  if (is_obscured_) {
-    size_t obscured_text_length =
-        static_cast<size_t>(gfx::UTF16IndexToOffset(text_, 0, text_.length()));
-    layout_text_.assign(obscured_text_length, kPasswordReplacementChar);
-  } else {
-    layout_text_ = text_;
-  }
-
-  ResetCachedSize();
-  PreferredSizeChanged();
-  SchedulePaint();
+  render_text_->SetText(text);
+  ResetLayout();
 }
 
 void Label::SetAutoColorReadabilityEnabled(bool enabled) {
@@ -104,6 +74,16 @@ void Label::SetBackgroundColor(SkColor color) {
   RecalculateColors();
 }
 
+void Label::SetShadows(const gfx::ShadowValues& shadows) {
+  render_text_->set_shadows(shadows);
+  ResetLayout();
+}
+
+void Label::SetSubpixelRenderingEnabled(bool subpixel_rendering_enabled) {
+  subpixel_rendering_enabled_ = subpixel_rendering_enabled;
+  RecalculateColors();
+}
+
 void Label::SetHorizontalAlignment(gfx::HorizontalAlignment alignment) {
   // If the UI layout is right-to-left, flip the alignment direction.
   if (base::i18n::IsRTL() &&
@@ -111,66 +91,46 @@ void Label::SetHorizontalAlignment(gfx::HorizontalAlignment alignment) {
     alignment = (alignment == gfx::ALIGN_LEFT) ?
         gfx::ALIGN_RIGHT : gfx::ALIGN_LEFT;
   }
-  if (horizontal_alignment_ != alignment) {
-    horizontal_alignment_ = alignment;
-    SchedulePaint();
-  }
-}
-
-gfx::HorizontalAlignment Label::GetHorizontalAlignment() const {
-  if (horizontal_alignment_ != gfx::ALIGN_TO_HEAD)
-    return horizontal_alignment_;
-
-  const base::i18n::TextDirection dir =
-      base::i18n::GetFirstStrongCharacterDirection(layout_text());
-  return dir == base::i18n::RIGHT_TO_LEFT ? gfx::ALIGN_RIGHT : gfx::ALIGN_LEFT;
+  render_text_->SetHorizontalAlignment(alignment);
+  ResetLayout();
 }
 
 void Label::SetLineHeight(int height) {
-  if (height != line_height_) {
-    line_height_ = height;
-    ResetCachedSize();
-    PreferredSizeChanged();
-    SchedulePaint();
-  }
+  if (line_height_ == height)
+    return;
+
+  line_height_ = height;
+  ResetLayout();
 }
 
 void Label::SetMultiLine(bool multi_line) {
-  DCHECK(!multi_line || (elide_behavior_ == gfx::ELIDE_TAIL ||
-                         elide_behavior_ == gfx::NO_ELIDE));
-  if (multi_line != is_multi_line_) {
-    is_multi_line_ = multi_line;
-    ResetCachedSize();
-    PreferredSizeChanged();
-    SchedulePaint();
-  }
+  if (multi_line_ == multi_line)
+    return;
+
+  multi_line_ = multi_line;
+  render_text_->SetReplaceNewlineCharsWithSymbols(!multi_line);
+  ResetLayout();
 }
 
 void Label::SetObscured(bool obscured) {
-  if (obscured != is_obscured_) {
-    is_obscured_ = obscured;
-    SetTextInternal(text_);
-  }
+  render_text_->SetObscured(obscured);
+  ResetLayout();
 }
 
 void Label::SetAllowCharacterBreak(bool allow_character_break) {
-  if (allow_character_break != allow_character_break_) {
-    allow_character_break_ = allow_character_break;
-    ResetCachedSize();
-    PreferredSizeChanged();
-    SchedulePaint();
-  }
+  if (allow_character_break_ == allow_character_break)
+    return;
+
+  allow_character_break_ = allow_character_break;
+  ResetLayout();
 }
 
 void Label::SetElideBehavior(gfx::ElideBehavior elide_behavior) {
-  DCHECK(!is_multi_line_ || (elide_behavior_ == gfx::ELIDE_TAIL ||
-                             elide_behavior_ == gfx::NO_ELIDE));
-  if (elide_behavior != elide_behavior_) {
-    elide_behavior_ = elide_behavior;
-    ResetCachedSize();
-    PreferredSizeChanged();
-    SchedulePaint();
-  }
+  if (elide_behavior_ == elide_behavior)
+    return;
+
+  elide_behavior_ = elide_behavior;
+  ResetLayout();
 }
 
 void Label::SetTooltipText(const base::string16& tooltip_text) {
@@ -178,26 +138,15 @@ void Label::SetTooltipText(const base::string16& tooltip_text) {
 }
 
 void Label::SizeToFit(int max_width) {
-  DCHECK(is_multi_line_);
-
-  std::vector<base::string16> lines;
-  base::SplitString(layout_text(), '\n', &lines);
-
-  int label_width = 0;
-  for (std::vector<base::string16>::const_iterator iter = lines.begin();
-       iter != lines.end(); ++iter) {
-    label_width = std::max(label_width, gfx::GetStringWidth(*iter, font_list_));
-  }
-
-  label_width += GetInsets().width();
-
-  if (max_width > 0)
-    label_width = std::min(label_width, max_width);
-
-  SetBounds(x(), y(), label_width, 0);
+  DCHECK(multi_line_);
+  max_width_ = max_width;
   SizeToPreferredSize();
 }
 
+const base::string16& Label::GetLayoutTextForTesting() const {
+  return render_text_->layout_text();
+}
+
 gfx::Insets Label::GetInsets() const {
   gfx::Insets insets = View::GetInsets();
   if (focusable()) {
@@ -208,59 +157,90 @@ gfx::Insets Label::GetInsets() const {
 }
 
 int Label::GetBaseline() const {
-  return GetInsets().top() + font_list_.GetBaseline();
+  return GetInsets().top() + font_list().GetBaseline();
 }
 
 gfx::Size Label::GetPreferredSize() const {
-  // Return a size of (0, 0) if the label is not visible and if the
-  // collapse_when_hidden_ flag is set.
-  // TODO(munjal): This logic probably belongs to the View class. But for now,
-  // put it here since putting it in View class means all inheriting classes
-  // need ot respect the collapse_when_hidden_ flag.
   if (!visible() && collapse_when_hidden_)
     return gfx::Size();
 
+  if (multi_line_ && max_width_ != 0)
+    return gfx::Size(max_width_, GetHeightForWidth(max_width_));
+
   gfx::Size size(GetTextSize());
-  gfx::Insets insets = GetInsets();
-  size.Enlarge(insets.width(), insets.height());
+  size.Enlarge(GetInsets().width(), GetInsets().height());
   return size;
 }
 
 gfx::Size Label::GetMinimumSize() const {
-  gfx::Size text_size(GetTextSize());
-  if ((!visible() && collapse_when_hidden_) || text_size.IsEmpty())

[sky, 2014/07/14 21:49:56]

Does empty text still get a pref of 0x0?

[msw, 2014/07/14 23:41:36]

Label used to return (0 x <font height>) for empty text. I restored that
behavior (needed for BoundedLabel, perhaps other users, at least for now) and
added a unit test.

+  if (!visible() && collapse_when_hidden_)
     return gfx::Size();
 
-  gfx::Size size(gfx::GetStringWidth(base::string16(gfx::kEllipsisUTF16),
-                                     font_list_),
-                 font_list_.GetHeight());
-  size.SetToMin(text_size);  // The actual text may be shorter than an ellipsis.
-  gfx::Insets insets = GetInsets();
-  size.Enlarge(insets.width(), insets.height());
+  gfx::Size size(0, font_list().GetHeight());
+  if (elide_behavior_ == gfx::ELIDE_HEAD ||
+      elide_behavior_ == gfx::ELIDE_MIDDLE ||
+      elide_behavior_ == gfx::ELIDE_TAIL ||
+      elide_behavior_ == gfx::ELIDE_EMAIL) {
+    size.set_width(gfx::Canvas::GetStringWidth(
+        base::string16(gfx::kEllipsisUTF16), font_list()));
+  }
+  if (!multi_line_)
+    size.SetToMin(GetTextSize());
+  size.Enlarge(GetInsets().width(), GetInsets().height());
   return size;
 }
 
 int Label::GetHeightForWidth(int w) const {
-  if (!is_multi_line_)
-    return View::GetHeightForWidth(w);
+  w -= GetInsets().width();
+  if (!multi_line_ || text().empty() || w <= 0)
+    return std::max(line_height_, font_list().GetHeight());
 
-  w = std::max(0, w - GetInsets().width());
+  std::vector<base::string16> lines = GetLinesForWidth(w);
+  int height = lines.size() * std::max(line_height_, font_list().GetHeight());
+  height -= gfx::ShadowValue::GetMargin(render_text_->shadows()).height();
+  return height + GetInsets().height();
+}
 
-  for (size_t i = 0; i < cached_heights_.size(); ++i) {
-    const gfx::Size& s = cached_heights_[i];
-    if (s.width() == w)
-      return s.height() + GetInsets().height();
-  }
+void Label::Layout() {
+  lines_.clear();
+  gfx::Rect rect = GetContentsBounds();
+  if (rect.width() == 0 || rect.height() == 0)
+    return;
 
-  int cache_width = w;
+  std::vector<base::string16> lines;
+  gfx::HorizontalAlignment alignment = horizontal_alignment();
+  gfx::DirectionalityMode directionality = render_text_->directionality_mode();
+  if (multi_line_) {
+    // Force the directionality and alignment of the first line on other lines.
+    bool rtl = render_text_->GetTextDirection() == base::i18n::RIGHT_TO_LEFT;
+    if (alignment == gfx::ALIGN_TO_HEAD)
+      alignment = rtl ? gfx::ALIGN_RIGHT : gfx::ALIGN_LEFT;
+    directionality =
+        rtl ? gfx::DIRECTIONALITY_FORCE_RTL : gfx::DIRECTIONALITY_FORCE_LTR;
+    lines = GetLinesForWidth(rect.width());
+    if (lines.size() > 1)
+      rect.set_height(std::max(line_height_, font_list().GetHeight()));
+  } else {
+    lines.push_back(render_text_->layout_text());
+  }
 
-  int h = font_list_.GetHeight();
-  const int flags = ComputeDrawStringFlags();
-  gfx::Canvas::SizeStringInt(
-      layout_text(), font_list_, &w, &h, line_height_, flags);
-  cached_heights_[cached_heights_cursor_] = gfx::Size(cache_width, h);
-  cached_heights_cursor_ = (cached_heights_cursor_ + 1) % kCachedSizeLimit;
-  return h + GetInsets().height();
+  const int bottom = GetContentsBounds().bottom();
+  for (size_t i = 0; i < lines.size() && rect.y() <= bottom; ++i) {
+    scoped_ptr<gfx::RenderText> line(gfx::RenderText::CreateInstance());
+    line->SetHorizontalAlignment(alignment);
+    line->SetDirectionalityMode(directionality);
+    line->SetElideBehavior(elide_behavior_);
+    line->SetFontList(font_list());
+    line->set_shadows(shadows());
+    line->SetCursorEnabled(false);
+    line->SetText(lines[i]);
+    line->SetDisplayRect(rect);
+    lines_.push_back(line.release());
+    rect.set_y(rect.y() + rect.height());
+  }
+  for (size_t i = lines_.size(); i < lines.size(); ++i)
+    lines_.back()->SetText(lines_.back()->text() + lines[i]);
+  RecalculateColors();
 }
 
 const char* Label::GetClassName() const {
@@ -268,18 +248,10 @@ const char* Label::GetClassName() const {
 }
 
 View* Label::GetTooltipHandlerForPoint(const gfx::Point& point) {
-  // Bail out if the label does not contain the point.
-  // Note that HitTestPoint() cannot be used here as it uses
-  // Label::HitTestRect() to determine if the point hits the label; and
-  // Label::HitTestRect() always fails. Instead, default HitTestRect()
-  // implementation should be used.
-  if (!View::HitTestRect(gfx::Rect(point, gfx::Size(1, 1))))
-    return NULL;
-
   if (tooltip_text_.empty() && !ShouldShowDefaultTooltip())
     return NULL;
 
-  return this;
+  return HitTestPoint(point) ? this : NULL;
 }
 
 bool Label::CanProcessEventsWithinSubtree() const {
@@ -287,90 +259,48 @@ bool Label::CanProcessEventsWithinSubtree() const {
   return false;
 }
 
-bool Label::GetTooltipText(const gfx::Point& p, base::string16* tooltip) const {
-  DCHECK(tooltip);
+void Label::GetAccessibleState(ui::AXViewState* state) {
+  state->role = ui::AX_ROLE_STATIC_TEXT;
+  state->AddStateFlag(ui::AX_STATE_READ_ONLY);
+  state->name = render_text_->layout_text();
+}
 
-  // If a tooltip has been explicitly set, use it.
+bool Label::GetTooltipText(const gfx::Point& p, base::string16* tooltip) const {
   if (!tooltip_text_.empty()) {
     tooltip->assign(tooltip_text_);
     return true;
   }
 
-  // Show the full text if the text does not fit.
   if (ShouldShowDefaultTooltip()) {
-    *tooltip = layout_text();
+    tooltip->assign(render_text_->layout_text());
     return true;
   }
 
   return false;
 }
 
-void Label::GetAccessibleState(ui::AXViewState* state) {
-  state->role = ui::AX_ROLE_STATIC_TEXT;
-  state->AddStateFlag(ui::AX_STATE_READ_ONLY);
-  state->name = layout_text();
-}
-
-void Label::PaintText(gfx::Canvas* canvas,
-                      const base::string16& text,
-                      const gfx::Rect& text_bounds,
-                      int flags) {
-  SkColor color = enabled() ? actual_enabled_color_ : actual_disabled_color_;
-  if (elide_behavior_ == gfx::FADE_TAIL) {
-    canvas->DrawFadedString(text, font_list_, color, text_bounds, flags);
-  } else {
-    canvas->DrawStringRectWithShadows(text, font_list_, color, text_bounds,
-                                      line_height_, flags, shadows_);
-  }
-
-  if (HasFocus()) {
-    gfx::Rect focus_bounds = text_bounds;
-    focus_bounds.Inset(-kFocusBorderPadding, -kFocusBorderPadding);
-    canvas->DrawFocusRect(focus_bounds);
-  }
+void Label::OnEnabledChanged() {
+  RecalculateColors();
 }
 
-gfx::Size Label::GetTextSize() const {
-  if (!text_size_valid_) {
-    // For single-line strings, we supply the largest possible width, because
-    // while adding NO_ELLIPSIS to the flags works on Windows for forcing
-    // SizeStringInt() to calculate the desired width, it doesn't seem to work
-    // on Linux.
-    int w = is_multi_line_ ?
-        GetAvailableRect().width() : std::numeric_limits<int>::max();
-    int h = font_list_.GetHeight();
-    // For single-line strings, ignore the available width and calculate how
-    // wide the text wants to be.
-    int flags = ComputeDrawStringFlags();
-    if (!is_multi_line_)
-      flags |= gfx::Canvas::NO_ELLIPSIS;
-    gfx::Canvas::SizeStringInt(
-        layout_text(), font_list_, &w, &h, line_height_, flags);
-    text_size_.SetSize(w, h);
-    const gfx::Insets shadow_margin = -gfx::ShadowValue::GetMargin(shadows_);
-    text_size_.Enlarge(shadow_margin.width(), shadow_margin.height());
-    text_size_valid_ = true;
-  }
-
-  return text_size_;
+void Label::PaintText(gfx::Canvas* canvas) {
+  for (size_t i = 0; i < lines_.size(); ++i)
+    lines_[i]->Draw(canvas);
 }
 
 void Label::OnBoundsChanged(const gfx::Rect& previous_bounds) {
-  text_size_valid_ &= !is_multi_line_;
+  if (previous_bounds.size() != size())
+    Layout();

[sky, 2014/07/14 21:49:56]

Seems better to me to delay layout. Is there a reason you need to layout
immediately.

[msw, 2014/07/14 23:41:35]

I changed this to call ResetLayout(), which no longer calls Layout().

[msw, 2014/07/15 02:11:17]

Actually, I changed this to InvalidateLayout as you suggested. We shouldn't call
PreferredSizeChanged when the bounds change (unless perhaps the Label is
multi-line and the change of width causes a change of preferred height), but
LabelExample's multi-line label handles width changes correctly as-is.

 }
 
 void Label::OnPaint(gfx::Canvas* canvas) {
-  OnPaintBackground(canvas);
-  // We skip painting the focus border because it is being handled seperately by
-  // some subclasses of Label. We do not want View's focus border painting to
-  // interfere with that.
-  OnPaintBorder(canvas);
-
-  base::string16 paint_text;
-  gfx::Rect text_bounds;
-  int flags = 0;
-  CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
-  PaintText(canvas, paint_text, text_bounds, flags);
+  View::OnPaint(canvas);
+  if (HasFocus()) {
+    gfx::Rect focus_bounds = GetLocalBounds();
+    focus_bounds.Inset(-kFocusBorderPadding, -kFocusBorderPadding);
+    canvas->DrawFocusRect(focus_bounds);
+  }
+  PaintText(canvas);

[sky, 2014/07/14 21:49:56]

Do any subclasses completely overriding PaintText so that they might now get a
double focus border?

[msw, 2014/07/14 23:41:36]

Nope, there are no Label::PaintText overrides. This also shouldn't causes issues
with Label::OnPaint overrides, but I'll handle any fallout if I'm wrong.

 }
 
 void Label::OnNativeThemeChanged(const ui::NativeTheme* theme) {
@@ -378,25 +308,68 @@ void Label::OnNativeThemeChanged(const ui::NativeTheme* theme) {
 }
 
 void Label::Init(const base::string16& text, const gfx::FontList& font_list) {
-  font_list_ = font_list;
+  render_text_.reset(gfx::RenderText::CreateInstance());
+  render_text_->SetHorizontalAlignment(gfx::ALIGN_CENTER);
+  render_text_->SetDirectionalityMode(gfx::DIRECTIONALITY_FROM_TEXT);
+  render_text_->SetElideBehavior(gfx::NO_ELIDE);
+  render_text_->SetFontList(font_list);
+  render_text_->SetCursorEnabled(false);
+
+  elide_behavior_ = gfx::ELIDE_TAIL;
   enabled_color_set_ = disabled_color_set_ = background_color_set_ = false;
   subpixel_rendering_enabled_ = true;
   auto_color_readability_ = true;
   UpdateColorsFromTheme(ui::NativeTheme::instance());
-  horizontal_alignment_ = gfx::ALIGN_CENTER;
-  line_height_ = 0;
-  is_multi_line_ = false;
-  is_obscured_ = false;
-  allow_character_break_ = false;
-  elide_behavior_ = gfx::ELIDE_TAIL;
   collapse_when_hidden_ = false;
-  directionality_mode_ = gfx::DIRECTIONALITY_FROM_UI;
-  cached_heights_.resize(kCachedSizeLimit);
-  ResetCachedSize();
-
+  allow_character_break_ = false;
+  multi_line_ = false;
+  line_height_ = 0;
+  max_width_ = 0;
   SetText(text);
 }
 
+void Label::ResetLayout() {
+  PreferredSizeChanged();
+  InvalidateLayout();

[sky, 2014/07/14 21:49:56]

I think you should InvalidateLayout() first. That way if an ancestor triggers a
layout during PreferredSizeChanged() this is layed out correctly. Similarly I
would only Layout() if still invalid.

[msw, 2014/07/14 23:41:35]

Done. I reordered InvalidateLayout() and removed the Layout() call.
(Layout seemed necessary in earlier iterations, but not now; huzzah!)

+  Layout();
+  SchedulePaint();
+}
+
+std::vector<base::string16> Label::GetLinesForWidth(int width) const {
+  std::vector<base::string16> lines;
+  const gfx::WordWrapBehavior wrap =
+      allow_character_break_ ? gfx::WRAP_LONG_WORDS : gfx::TRUNCATE_LONG_WORDS;
+  gfx::ElideRectangleText(render_text_->layout_text(),
+                          font_list(),
+                          width,
+                          std::numeric_limits<int>::max(),
+                          wrap,
+                          &lines);
+  return lines;
+}
+
+gfx::Size Label::GetTextSize() const {
+  gfx::Size size;
+  if (!multi_line_) {
+    size = render_text_->GetStringSize();
+  } else {
+    // Get the natural text size, unelided and only wrapped on newlines.
+    std::vector<base::string16> lines;
+    base::SplitString(render_text_->layout_text(), '\n', &lines);
+    scoped_ptr<gfx::RenderText> render_text(gfx::RenderText::CreateInstance());
+    render_text->SetFontList(font_list());
+    for (size_t i = 0; i < lines.size(); ++i) {
+      render_text->SetText(lines[i]);
+      const gfx::Size line = render_text->GetStringSize();
+      size.set_width(std::max(size.width(), line.width()));
+      size.set_height(size.height() + std::max(line_height_, line.height()));
+    }
+  }
+  const gfx::Insets shadow_margin = -gfx::ShadowValue::GetMargin(shadows());
+  size.Enlarge(shadow_margin.width(), shadow_margin.height());
+  return size;
+}
+
 void Label::RecalculateColors() {
   actual_enabled_color_ = auto_color_readability_ ?
       color_utils::GetReadableColor(requested_enabled_color_,
@@ -406,110 +379,15 @@ void Label::RecalculateColors() {
       color_utils::GetReadableColor(requested_disabled_color_,
                                     background_color_) :
       requested_disabled_color_;
-}
-
-gfx::Rect Label::GetTextBounds() const {
-  gfx::Rect available(GetAvailableRect());
-  gfx::Size text_size(GetTextSize());
-  text_size.set_width(std::min(available.width(), text_size.width()));
-  gfx::Point origin(GetInsets().left(), GetInsets().top());
-  switch (GetHorizontalAlignment()) {
-    case gfx::ALIGN_LEFT:
-      break;
-    case gfx::ALIGN_CENTER:
-      // Put any extra margin pixel on the left to match the legacy behavior
-      // from the use of GetTextExtentPoint32() on Windows.
-      origin.Offset((available.width() + 1 - text_size.width()) / 2, 0);
-      break;
-    case gfx::ALIGN_RIGHT:
-      origin.set_x(available.right() - text_size.width());
-      break;
-    default:
-      NOTREACHED();
-      break;
-  }
-  origin.Offset(0, std::max(0, (available.height() - text_size.height())) / 2);
-  return gfx::Rect(origin, text_size);
-}
-
-int Label::ComputeDrawStringFlags() const {
-  int flags = 0;
-
-  // We can't use subpixel rendering if the background is non-opaque.
-  if (SkColorGetA(background_color_) != 0xFF || !subpixel_rendering_enabled_)
-    flags |= gfx::Canvas::NO_SUBPIXEL_RENDERING;
-
-  if (directionality_mode_ == gfx::DIRECTIONALITY_FORCE_LTR) {
-    flags |= gfx::Canvas::FORCE_LTR_DIRECTIONALITY;
-  } else if (directionality_mode_ == gfx::DIRECTIONALITY_FORCE_RTL) {
-    flags |= gfx::Canvas::FORCE_RTL_DIRECTIONALITY;
-  } else if (directionality_mode_ == gfx::DIRECTIONALITY_FROM_TEXT) {
-    base::i18n::TextDirection direction =
-        base::i18n::GetFirstStrongCharacterDirection(layout_text());
-    if (direction == base::i18n::RIGHT_TO_LEFT)
-      flags |= gfx::Canvas::FORCE_RTL_DIRECTIONALITY;
-    else
-      flags |= gfx::Canvas::FORCE_LTR_DIRECTIONALITY;
-  }
 
-  switch (GetHorizontalAlignment()) {
-    case gfx::ALIGN_LEFT:
-      flags |= gfx::Canvas::TEXT_ALIGN_LEFT;
-      break;
-    case gfx::ALIGN_CENTER:
-      flags |= gfx::Canvas::TEXT_ALIGN_CENTER;
-      break;
-    case gfx::ALIGN_RIGHT:
-      flags |= gfx::Canvas::TEXT_ALIGN_RIGHT;
-      break;
-    default:
-      NOTREACHED();
-      break;
-  }
-
-  if (!is_multi_line_)
-    return flags;
-
-  flags |= gfx::Canvas::MULTI_LINE;
-#if !defined(OS_WIN)
-    // Don't elide multiline labels on Linux.
-    // Todo(davemoore): Do we depend on eliding multiline text?
-    // Pango insists on limiting the number of lines to one if text is
-    // elided. You can get around this if you can pass a maximum height
-    // but we don't currently have that data when we call the pango code.
-    flags |= gfx::Canvas::NO_ELLIPSIS;
-#endif
-  if (allow_character_break_)
-    flags |= gfx::Canvas::CHARACTER_BREAK;
-
-  return flags;
-}
-
-gfx::Rect Label::GetAvailableRect() const {
-  gfx::Rect bounds(size());
-  bounds.Inset(GetInsets());
-  return bounds;
-}
-
-void Label::CalculateDrawStringParams(base::string16* paint_text,
-                                      gfx::Rect* text_bounds,
-                                      int* flags) const {
-  DCHECK(paint_text && text_bounds && flags);
-
-  const bool forbid_ellipsis = elide_behavior_ == gfx::NO_ELIDE ||
-                               elide_behavior_ == gfx::FADE_TAIL;
-  if (is_multi_line_ || forbid_ellipsis) {
-    *paint_text = layout_text();
-  } else {
-    *paint_text = gfx::ElideText(layout_text(), font_list_,
-                                 GetAvailableRect().width(), elide_behavior_);
+  SkColor color = enabled() ? actual_enabled_color_ : actual_disabled_color_;
+  bool background_is_transparent =
+      SkColorGetA(background_color_) != 0xFF && !subpixel_rendering_enabled_;
+  for (size_t i = 0; i < lines_.size(); ++i) {
+    lines_[i]->SetColor(color);
+    lines_[i]->set_background_is_transparent(background_is_transparent);
   }
-
-  *text_bounds = GetTextBounds();
-  *flags = ComputeDrawStringFlags();
-  // TODO(msw): Elide multi-line text with ElideRectangleText instead.
-  if (!is_multi_line_ || forbid_ellipsis)
-    *flags |= gfx::Canvas::NO_ELLIPSIS;
+  SchedulePaint();
 }
 
 void Label::UpdateColorsFromTheme(const ui::NativeTheme* theme) {
@@ -528,17 +406,11 @@ void Label::UpdateColorsFromTheme(const ui::NativeTheme* theme) {
   RecalculateColors();
 }
 
-void Label::ResetCachedSize() {
-  text_size_valid_ = false;
-  cached_heights_cursor_ = 0;
-  for (int i = 0; i < kCachedSizeLimit; ++i)
-    cached_heights_[i] = gfx::Size();
-}
-
 bool Label::ShouldShowDefaultTooltip() const {
-  return !is_multi_line_ && !is_obscured_ &&
-         gfx::GetStringWidth(layout_text(), font_list_) >
-             GetAvailableRect().width();
+  const gfx::Size text_size = GetTextSize();
+  const gfx::Size size = GetContentsBounds().size();
+  return !obscured() && (text_size.width() > size.width() ||
+                         text_size.height() > size.height());
 }
 
 }  // namespace views