Move allow_character_break property to RenderText.

ui/views/controls/label.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/label.h"
 
 #include <algorithm>
 #include <cmath>
 #include <limits>
 #include <vector>
@@ skipping 132 matching lines @@
 
 void Label::SetObscured(bool obscured) {
   if (this->obscured() == obscured)
     return;
   is_first_paint_text_ = true;
   render_text_->SetObscured(obscured);
   ResetLayout();
 }
 
 void Label::SetAllowCharacterBreak(bool allow_character_break) {
-  if (allow_character_break_ == allow_character_break)
+  if (render_text_->allow_character_break() == allow_character_break)
     return;
   is_first_paint_text_ = true;
-  allow_character_break_ = allow_character_break;
+  render_text_->SetAllowCharacterBreak(allow_character_break);
   ResetLayout();
 }
 
 void Label::SetElideBehavior(gfx::ElideBehavior elide_behavior) {
   DCHECK(!multi_line() || (elide_behavior_ == gfx::ELIDE_TAIL ||
                            elide_behavior_ == gfx::NO_ELIDE));
   if (elide_behavior_ == elide_behavior)
     return;
   is_first_paint_text_ = true;
   elide_behavior_ = elide_behavior;
@@ skipping 84 matching lines @@
 
 int Label::GetHeightForWidth(int w) const {
   if (!visible() && collapse_when_hidden_)
     return 0;
 
   w -= GetInsets().width();
   if (!multi_line() || text().empty() || w <= 0)
     return std::max(line_height(), font_list().GetHeight());
 
   int height = 0;
   // RenderText doesn't support character breaks.

[msw, 2015/03/25 20:54:15]

nit: remove this comment and TODO.

[Jun Mukai, 2015/03/26 01:35:08]

Done.

   // TODO(mukai): remove this restriction.
-  if (render_text_->MultilineSupported() && !allow_character_break_) {
+  if (render_text_->MultilineSupported()) {
     // SetDisplayRect() has a side effect for later calls of GetStringSize().
     // Be careful to invoke |render_text_->SetDisplayRect(gfx::Rect())| to
     // cancel this effect before the next time GetStringSize() is called.
     // It would be beneficial not to cancel here, considering that some layout
     // managers invoke GetHeightForWidth() for the same width multiple times
     // and |render_text_| can cache the height.
     render_text_->SetDisplayRect(gfx::Rect(0, 0, w, 0));
     height = render_text_->GetStringSize().height();
   } else {
     std::vector<base::string16> lines = GetLinesForWidth(w);
@@ skipping 112 matching lines @@
   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;
   multi_line_ = false;
   UpdateColorsFromTheme(ui::NativeTheme::instance());
   handles_tooltips_ = true;
   collapse_when_hidden_ = false;
-  allow_character_break_ = false;
   max_width_ = 0;
   is_first_paint_text_ = true;
   SetText(text);
 }
 
 void Label::ResetLayout() {
   InvalidateLayout();
   PreferredSizeChanged();
   SchedulePaint();
   lines_.clear();
@@ skipping 37 matching lines @@
     if (alignment == gfx::ALIGN_TO_HEAD)
       alignment = rtl ? gfx::ALIGN_RIGHT : gfx::ALIGN_LEFT;
     directionality =
         rtl ? gfx::DIRECTIONALITY_FORCE_RTL : gfx::DIRECTIONALITY_FORCE_LTR;
   }
 
   // Text eliding is not supported for multi-lined Labels.
   // TODO(mukai): Add multi-lined elided text support.
   gfx::ElideBehavior elide_behavior =
       multi_line() ? gfx::NO_ELIDE : elide_behavior_;
-  if (!multi_line() ||
-      (render_text_->MultilineSupported() && !allow_character_break_)) {
+  if (!multi_line() || render_text_->MultilineSupported()) {
     scoped_ptr<gfx::RenderText> render_text =
         CreateRenderText(text(), alignment, directionality, elide_behavior);
     render_text->SetDisplayRect(rect);
     render_text->SetMultiline(multi_line());
     lines_.push_back(render_text.release());
   } else {
     std::vector<base::string16> lines = GetLinesForWidth(rect.width());
     if (lines.size() > 1)
       rect.set_height(std::max(line_height(), font_list().GetHeight()));
 
@@ skipping 31 matching lines @@
   return focus_bounds;
 }
 
 std::vector<base::string16> Label::GetLinesForWidth(int width) const {
   std::vector<base::string16> lines;
   // |width| can be 0 when getting the default text size, in that case
   // the ideal lines (i.e. broken at newline characters) are wanted.
   if (width <= 0) {
     base::SplitString(render_text_->GetDisplayText(), '\n', &lines);
   } else {
-    const gfx::WordWrapBehavior wrap = allow_character_break_
+    const gfx::WordWrapBehavior wrap = render_text_->allow_character_break()
                                            ? gfx::WRAP_LONG_WORDS
                                            : gfx::TRUNCATE_LONG_WORDS;
     gfx::ElideRectangleText(render_text_->GetDisplayText(), font_list(), width,
                             std::numeric_limits<int>::max(), wrap, &lines);
   }
   return lines;
 }
 
 gfx::Size Label::GetTextSize() const {
   gfx::Size size;
   if (text().empty()) {
     size = gfx::Size(0, std::max(line_height(), font_list().GetHeight()));
-  } else if (!multi_line() ||
-             (render_text_->MultilineSupported() && !allow_character_break_)) {
+  } else if (!multi_line() || render_text_->MultilineSupported()) {
     // Cancel the display rect of |render_text_|. The display rect may be
     // specified in GetHeightForWidth(), and specifying empty Rect cancels
     // its effect. See also the comment in GetHeightForWidth().
     // TODO(mukai): use gfx::Rect() to compute the ideal size rather than
     // the current width(). See crbug.com/468494, crbug.com/467526, and
     // the comment for MultilinePreferredSizeTest in label_unittest.cc.
     render_text_->SetDisplayRect(gfx::Rect(0, 0, width(), 0));
     size = render_text_->GetStringSize();
   } else {
     // Get the natural text size, unelided and only wrapped on newlines.
@@ skipping 49 matching lines @@
 }
 
 bool Label::ShouldShowDefaultTooltip() const {
   const gfx::Size text_size = GetTextSize();
   const gfx::Size size = GetContentsBounds().size();
   return !obscured() && (text_size.width() > size.width() ||
                          (multi_line() && text_size.height() > size.height()));
 }
 
 }  // namespace views