Fix focus rectangle for label.

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 336 matching lines @@
 
     is_first_paint_text_ = false;
     PaintText(canvas);
   } else {
     // TODO(vadimt): Remove ScopedTracker below once crbug.com/431326 is fixed.
     tracked_objects::ScopedTracker tracking_profile(
         FROM_HERE_WITH_EXPLICIT_FUNCTION("431326 Label::PaintText not first"));
 
     PaintText(canvas);
   }
-  if (HasFocus()) {
-    gfx::Rect focus_bounds = GetLocalBounds();
-    focus_bounds.Inset(-kFocusBorderPadding, -kFocusBorderPadding);
-    canvas->DrawFocusRect(focus_bounds);
-  }
+  if (HasFocus())
+    canvas->DrawFocusRect(GetFocusBounds());
 }
 
 void Label::OnNativeThemeChanged(const ui::NativeTheme* theme) {
   UpdateColorsFromTheme(theme);
 }
 
 void Label::OnDeviceScaleFactorChanged(float device_scale_factor) {
   View::OnDeviceScaleFactorChanged(device_scale_factor);
   // When the device scale factor is changed, some font rendering parameters is
   // changed (especially, hinting). The bounding box of the text has to be
@@ skipping 54 matching lines @@
   render_text->SetCursorEnabled(false);
   render_text->SetText(text);
   return render_text.Pass();
 }
 
 void Label::MaybeBuildRenderTextLines() {
   if (!lines_.empty())
     return;
 
   gfx::Rect rect = GetContentsBounds();
+  if (focusable())
+    rect.Inset(kFocusBorderPadding, kFocusBorderPadding);
   if (rect.IsEmpty())
     return;
 
   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_->GetDisplayTextDirection() == base::i18n::RIGHT_TO_LEFT;
     if (alignment == gfx::ALIGN_TO_HEAD)
@@ skipping 26 matching lines @@
       lines_.push_back(line.release());
       rect.set_y(rect.y() + rect.height());
     }
     // Append the remaining text to the last visible line.
     for (size_t i = lines_.size(); i < lines.size(); ++i)
       lines_.back()->SetText(lines_.back()->text() + lines[i]);
   }
   RecalculateColors();
 }
 
+gfx::Rect Label::GetFocusBounds() {
+  MaybeBuildRenderTextLines();
+
+  gfx::Rect focus_bounds;
+  if (lines_.empty()) {
+    focus_bounds = gfx::Rect(GetTextSize());
+  } else {
+    for (size_t i = 0; i < lines_.size(); ++i) {
+      gfx::Point origin;
+      origin += lines_[i]->GetLineOffset(0);
+      focus_bounds.Union(gfx::Rect(origin, lines_[i]->GetStringSize()));
+    }
+  }
+
+  focus_bounds.Inset(-kFocusBorderPadding, -kFocusBorderPadding);
+  focus_bounds.Intersect(GetLocalBounds());
+  return focus_bounds;
+}
+
 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_->GetDisplayText(), font_list(), width,
                           std::numeric_limits<int>::max(), wrap, &lines);
   return lines;
 }
 
 gfx::Size Label::GetTextSize() const {
@@ skipping 62 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