Cache gfx::RenderText instances in views::Label.

ui/views/controls/label_unittest.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 "base/i18n/rtl.h"
 #include "base/strings/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/accessibility/ax_view_state.h"
@@ skipping 59 matching lines @@
 
   Label label;
   for (size_t i = 0; i < 2; ++i) {
     // Toggle the application default text direction (to try each direction).
     SetRTL(!base::i18n::IsRTL());
     bool reverse_alignment = base::i18n::IsRTL();
 
     // The alignment should be flipped in RTL UI.
     label.SetHorizontalAlignment(gfx::ALIGN_RIGHT);
     EXPECT_EQ(reverse_alignment ? gfx::ALIGN_LEFT : gfx::ALIGN_RIGHT,
-              label.GetHorizontalAlignment());
+              label.horizontal_alignment());
     label.SetHorizontalAlignment(gfx::ALIGN_LEFT);
     EXPECT_EQ(reverse_alignment ? gfx::ALIGN_RIGHT : gfx::ALIGN_LEFT,
-              label.GetHorizontalAlignment());
+              label.horizontal_alignment());
     label.SetHorizontalAlignment(gfx::ALIGN_CENTER);
-    EXPECT_EQ(gfx::ALIGN_CENTER, label.GetHorizontalAlignment());
+    EXPECT_EQ(gfx::ALIGN_CENTER, label.horizontal_alignment());
 
     for (size_t j = 0; j < 2; ++j) {
       label.SetHorizontalAlignment(gfx::ALIGN_TO_HEAD);
       const bool rtl = j == 0;
       label.SetText(rtl ? base::WideToUTF16(L"\x5d0") : ASCIIToUTF16("A"));
-      EXPECT_EQ(rtl ? gfx::ALIGN_RIGHT : gfx::ALIGN_LEFT,
-                label.GetHorizontalAlignment());
+      EXPECT_EQ(gfx::ALIGN_TO_HEAD, label.horizontal_alignment());
     }
   }
 
   EXPECT_EQ(was_rtl, base::i18n::IsRTL());
 }
 
 TEST_F(LabelTest, MultiLineProperty) {
   Label label;
   EXPECT_FALSE(label.multi_line());
   label.SetMultiLine(true);
@@ skipping 77 matching lines @@
   label.SetObscured(true);
   EXPECT_FALSE(label.GetTooltipText(gfx::Point(), &tooltip));
 
   // Obscuring the text shouldn't permanently clobber the tooltip.
   label.SetObscured(false);
   EXPECT_TRUE(label.GetTooltipText(gfx::Point(), &tooltip));
 
   // Making the label multiline shouldn't eliminate the tooltip.
   label.SetMultiLine(true);
   EXPECT_TRUE(label.GetTooltipText(gfx::Point(), &tooltip));
+
   // Expanding the multiline label bounds should eliminate the tooltip.
   label.SetBounds(0, 0, 1000, 1000);
   EXPECT_FALSE(label.GetTooltipText(gfx::Point(), &tooltip));
 
   // Verify that setting the tooltip still shows it.
   label.SetTooltipText(tooltip_text);
   EXPECT_TRUE(label.GetTooltipText(gfx::Point(), &tooltip));
   EXPECT_EQ(tooltip_text, tooltip);
   // Clear out the tooltip.
   label.SetTooltipText(base::string16());
@@ skipping 125 matching lines @@
 
   // GetPreferredSize and borders.
   label.SetBounds(0, 0, 0, 0);
   gfx::Size required_size_with_border = label.GetPreferredSize();
   EXPECT_EQ(required_size_with_border.height(),
             required_size.height() + border.height());
   EXPECT_EQ(required_size_with_border.width(),
             required_size.width() + border.width());
 }
 
-TEST_F(LabelTest, DirectionalityFromText) {
-  Label label;
-  label.SetBounds(0, 0, 1000, 1000);
-  base::string16 paint_text;
-  gfx::Rect text_bounds;
-  int flags = -1;
-
-  // Test text starts with RTL character.
-  label.SetText(base::WideToUTF16(L"  \x5d0\x5d1\x5d2 abc"));
-  label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
-  EXPECT_EQ(gfx::Canvas::FORCE_RTL_DIRECTIONALITY,
-            flags & (gfx::Canvas::FORCE_RTL_DIRECTIONALITY |
-                     gfx::Canvas::FORCE_LTR_DIRECTIONALITY));
-
-  // Test text starts with LTR character.
-  label.SetText(base::WideToUTF16(L"ltr \x5d0\x5d1\x5d2 abc"));
-  label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
-  EXPECT_EQ(gfx::Canvas::FORCE_LTR_DIRECTIONALITY,
-            flags & (gfx::Canvas::FORCE_RTL_DIRECTIONALITY |
-                     gfx::Canvas::FORCE_LTR_DIRECTIONALITY));
-}
-
-TEST_F(LabelTest, DrawSingleLineString) {
-  Label label;
-  label.SetFocusable(false);
-
-  label.SetText(ASCIIToUTF16("Here's a string with no returns."));
-  gfx::Size required_size(label.GetPreferredSize());
-  gfx::Size extra(22, 8);
-  label.SetBounds(0, 0, required_size.width() + extra.width(),
-                  required_size.height() + extra.height());
-
-  // Do some basic verifications for all three alignments.
-  base::string16 paint_text;
-  gfx::Rect text_bounds;
-  int flags = -1;
-
-  // Centered text.
-  label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
-  EXPECT_EQ(label.text(), paint_text);
-  // The text should be centered horizontally and vertically.
-  EXPECT_EQ(extra.width() / 2, text_bounds.x());
-  EXPECT_EQ(extra.height() / 2 , text_bounds.y());
-  EXPECT_EQ(required_size.width(), text_bounds.width());
-  EXPECT_EQ(required_size.height(), text_bounds.height());
-  EXPECT_EQ(gfx::Canvas::TEXT_ALIGN_CENTER,
-            flags & (gfx::Canvas::TEXT_ALIGN_LEFT |
-                     gfx::Canvas::TEXT_ALIGN_CENTER |
-                     gfx::Canvas::TEXT_ALIGN_RIGHT));
-
-  // Left aligned text.
-  label.SetHorizontalAlignment(gfx::ALIGN_LEFT);
-  paint_text.clear();
-  text_bounds.SetRect(0, 0, 0, 0);
-  label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
-  EXPECT_EQ(label.text(), paint_text);
-  // The text should be left aligned horizontally and centered vertically.
-  EXPECT_EQ(0, text_bounds.x());
-  EXPECT_EQ(extra.height() / 2 , text_bounds.y());
-  EXPECT_EQ(required_size.width(), text_bounds.width());
-  EXPECT_EQ(required_size.height(), text_bounds.height());
-  EXPECT_EQ(gfx::Canvas::TEXT_ALIGN_LEFT,
-            flags & (gfx::Canvas::TEXT_ALIGN_LEFT |
-                     gfx::Canvas::TEXT_ALIGN_CENTER |
-                     gfx::Canvas::TEXT_ALIGN_RIGHT));
-
-  // Right aligned text.
-  label.SetHorizontalAlignment(gfx::ALIGN_RIGHT);
-  paint_text.clear();
-  text_bounds.SetRect(0, 0, 0, 0);
-  label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
-  EXPECT_EQ(label.text(), paint_text);
-  // The text should be right aligned horizontally and centered vertically.
-  EXPECT_EQ(extra.width(), text_bounds.x());
-  EXPECT_EQ(extra.height() / 2 , text_bounds.y());
-  EXPECT_EQ(required_size.width(), text_bounds.width());
-  EXPECT_EQ(required_size.height(), text_bounds.height());
-  EXPECT_EQ(gfx::Canvas::TEXT_ALIGN_RIGHT,
-            flags & (gfx::Canvas::TEXT_ALIGN_LEFT |
-                     gfx::Canvas::TEXT_ALIGN_CENTER |
-                     gfx::Canvas::TEXT_ALIGN_RIGHT));
-
-  // Test single line drawing with a border.
-  gfx::Insets border(39, 34, 8, 96);
-  label.SetBorder(Border::CreateEmptyBorder(
-      border.top(), border.left(), border.bottom(), border.right()));
-
-  gfx::Size required_size_with_border(label.GetPreferredSize());
-  EXPECT_EQ(required_size.width() + border.width(),
-            required_size_with_border.width());
-  EXPECT_EQ(required_size.height() + border.height(),
-            required_size_with_border.height());
-  label.SetBounds(0, 0, required_size_with_border.width() + extra.width(),
-                  required_size_with_border.height() + extra.height());
-
-  // Centered text with border.
-  label.SetHorizontalAlignment(gfx::ALIGN_CENTER);
-  paint_text.clear();
-  text_bounds.SetRect(0, 0, 0, 0);
-  label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
-  EXPECT_EQ(label.text(), paint_text);
-  // The text should be centered horizontally and vertically within the border.
-  EXPECT_EQ(border.left() + extra.width() / 2, text_bounds.x());
-  EXPECT_EQ(border.top() + extra.height() / 2 , text_bounds.y());
-  EXPECT_EQ(required_size.width(), text_bounds.width());
-  EXPECT_EQ(required_size.height(), text_bounds.height());
-  EXPECT_EQ(gfx::Canvas::TEXT_ALIGN_CENTER,
-            flags & (gfx::Canvas::TEXT_ALIGN_LEFT |
-                     gfx::Canvas::TEXT_ALIGN_CENTER |
-                     gfx::Canvas::TEXT_ALIGN_RIGHT));
-
-  // Left aligned text with border.
-  label.SetHorizontalAlignment(gfx::ALIGN_LEFT);
-  paint_text.clear();
-  text_bounds.SetRect(0, 0, 0, 0);
-  label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
-  EXPECT_EQ(label.text(), paint_text);
-  // The text should be left aligned horizontally and centered vertically.
-  EXPECT_EQ(border.left(), text_bounds.x());
-  EXPECT_EQ(border.top() + extra.height() / 2 , text_bounds.y());
-  EXPECT_EQ(required_size.width(), text_bounds.width());
-  EXPECT_EQ(required_size.height(), text_bounds.height());
-  EXPECT_EQ(gfx::Canvas::TEXT_ALIGN_LEFT,
-            flags & (gfx::Canvas::TEXT_ALIGN_LEFT |
-                     gfx::Canvas::TEXT_ALIGN_CENTER |
-                     gfx::Canvas::TEXT_ALIGN_RIGHT));
-
-  // Right aligned text.
-  label.SetHorizontalAlignment(gfx::ALIGN_RIGHT);
-  paint_text.clear();
-  text_bounds.SetRect(0, 0, 0, 0);
-  label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
-  EXPECT_EQ(label.text(), paint_text);
-  // The text should be right aligned horizontally and centered vertically.
-  EXPECT_EQ(border.left() + extra.width(), text_bounds.x());
-  EXPECT_EQ(border.top() + extra.height() / 2 , text_bounds.y());
-  EXPECT_EQ(required_size.width(), text_bounds.width());
-  EXPECT_EQ(required_size.height(), text_bounds.height());
-  EXPECT_EQ(gfx::Canvas::TEXT_ALIGN_RIGHT,
-            flags & (gfx::Canvas::TEXT_ALIGN_LEFT |
-                     gfx::Canvas::TEXT_ALIGN_CENTER |
-                     gfx::Canvas::TEXT_ALIGN_RIGHT));
-}
-
-// Pango needs a max height to elide multiline text; that is not supported here.
-TEST_F(LabelTest, DrawMultiLineString) {
-  Label label;
-  label.SetFocusable(false);
-  // Set a background color to prevent gfx::Canvas::NO_SUBPIXEL_RENDERING flags.
-  label.SetBackgroundColor(SK_ColorWHITE);
-
-  label.SetText(ASCIIToUTF16("Another string\nwith returns\n\n!"));
-  label.SetMultiLine(true);
-  label.SizeToFit(0);
-  gfx::Size extra(50, 10);
-  label.SetBounds(label.x(), label.y(),
-                  label.width() + extra.width(),
-                  label.height() + extra.height());
-
-  // Do some basic verifications for all three alignments.
-  base::string16 paint_text;
-  gfx::Rect text_bounds;
-  int flags = -1;
-  label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
-  EXPECT_EQ(label.text(), paint_text);
-  EXPECT_EQ(extra.width() / 2, text_bounds.x());
-  EXPECT_EQ(extra.height() / 2, text_bounds.y());
-  EXPECT_GT(text_bounds.width(), kMinTextDimension);
-  EXPECT_GT(text_bounds.height(), kMinTextDimension);
-  int expected_flags = gfx::Canvas::MULTI_LINE |
-                       gfx::Canvas::TEXT_ALIGN_CENTER |
-                       gfx::Canvas::FORCE_LTR_DIRECTIONALITY;
-#if !defined(OS_WIN)
-  expected_flags |= gfx::Canvas::NO_ELLIPSIS;
-#endif
-  EXPECT_EQ(expected_flags, expected_flags);
-  gfx::Rect center_bounds(text_bounds);
-
-  label.SetHorizontalAlignment(gfx::ALIGN_LEFT);
-  paint_text.clear();
-  text_bounds.SetRect(0, 0, 0, 0);
-  label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
-  EXPECT_EQ(label.text(), paint_text);
-  EXPECT_EQ(0, text_bounds.x());
-  EXPECT_EQ(extra.height() / 2, text_bounds.y());
-  EXPECT_GT(text_bounds.width(), kMinTextDimension);
-  EXPECT_GT(text_bounds.height(), kMinTextDimension);
-  expected_flags = gfx::Canvas::MULTI_LINE |
-                   gfx::Canvas::TEXT_ALIGN_LEFT |
-                   gfx::Canvas::FORCE_LTR_DIRECTIONALITY;
-#if !defined(OS_WIN)
-  expected_flags |= gfx::Canvas::NO_ELLIPSIS;
-#endif
-  EXPECT_EQ(expected_flags, expected_flags);
-
-  label.SetHorizontalAlignment(gfx::ALIGN_RIGHT);
-  paint_text.clear();
-  text_bounds.SetRect(0, 0, 0, 0);
-  label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
-  EXPECT_EQ(label.text(), paint_text);
-  EXPECT_EQ(extra.width(), text_bounds.x());
-  EXPECT_EQ(extra.height() / 2, text_bounds.y());
-  EXPECT_GT(text_bounds.width(), kMinTextDimension);
-  EXPECT_GT(text_bounds.height(), kMinTextDimension);
-  expected_flags = gfx::Canvas::MULTI_LINE |
-                   gfx::Canvas::TEXT_ALIGN_RIGHT |
-                   gfx::Canvas::FORCE_LTR_DIRECTIONALITY;
-#if !defined(OS_WIN)
-  expected_flags |= gfx::Canvas::NO_ELLIPSIS;
-#endif
-  EXPECT_EQ(expected_flags, expected_flags);
-
-  // Test multiline drawing with a border.
-  gfx::Insets border(19, 92, 23, 2);
-  label.SetBorder(Border::CreateEmptyBorder(
-      border.top(), border.left(), border.bottom(), border.right()));
-  label.SizeToFit(0);
-  label.SetBounds(label.x(), label.y(),
-                  label.width() + extra.width(),
-                  label.height() + extra.height());
-
-  label.SetHorizontalAlignment(gfx::ALIGN_CENTER);
-  paint_text.clear();
-  text_bounds.SetRect(0, 0, 0, 0);
-  label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
-  EXPECT_EQ(label.text(), paint_text);
-  EXPECT_EQ(border.left() + extra.width() / 2, text_bounds.x());
-  EXPECT_EQ(border.top() + extra.height() / 2, text_bounds.y());
-  EXPECT_EQ(center_bounds.width(), text_bounds.width());
-  EXPECT_EQ(center_bounds.height(), text_bounds.height());
-  expected_flags = gfx::Canvas::MULTI_LINE |
-                   gfx::Canvas::TEXT_ALIGN_CENTER |
-                   gfx::Canvas::FORCE_LTR_DIRECTIONALITY;
-#if !defined(OS_WIN)
-  expected_flags |= gfx::Canvas::NO_ELLIPSIS;
-#endif
-  EXPECT_EQ(expected_flags, expected_flags);
-
-  label.SetHorizontalAlignment(gfx::ALIGN_LEFT);
-  paint_text.clear();
-  text_bounds.SetRect(0, 0, 0, 0);
-  label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
-  EXPECT_EQ(label.text(), paint_text);
-  EXPECT_EQ(border.left(), text_bounds.x());
-  EXPECT_EQ(border.top() + extra.height() / 2, text_bounds.y());
-  EXPECT_EQ(center_bounds.width(), text_bounds.width());
-  EXPECT_EQ(center_bounds.height(), text_bounds.height());
-  expected_flags = gfx::Canvas::MULTI_LINE |
-                   gfx::Canvas::TEXT_ALIGN_LEFT |
-                   gfx::Canvas::FORCE_LTR_DIRECTIONALITY;
-#if !defined(OS_WIN)
-  expected_flags |= gfx::Canvas::NO_ELLIPSIS;
-#endif
-  EXPECT_EQ(expected_flags, expected_flags);
-
-  label.SetHorizontalAlignment(gfx::ALIGN_RIGHT);
-  paint_text.clear();
-  text_bounds.SetRect(0, 0, 0, 0);
-  label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
-  EXPECT_EQ(label.text(), paint_text);
-  EXPECT_EQ(extra.width() + border.left(), text_bounds.x());
-  EXPECT_EQ(border.top() + extra.height() / 2, text_bounds.y());
-  EXPECT_EQ(center_bounds.width(), text_bounds.width());
-  EXPECT_EQ(center_bounds.height(), text_bounds.height());
-  expected_flags = gfx::Canvas::MULTI_LINE |
-                   gfx::Canvas::TEXT_ALIGN_RIGHT |
-                   gfx::Canvas::FORCE_LTR_DIRECTIONALITY;
-#if !defined(OS_WIN)
-  expected_flags |= gfx::Canvas::NO_ELLIPSIS;
-#endif
-  EXPECT_EQ(expected_flags, expected_flags);
-}
-
-TEST_F(LabelTest, DrawSingleLineStringInRTL) {
-  Label label;
-  label.SetFocusable(false);
-
-  std::string locale = l10n_util::GetApplicationLocale("");
-  base::i18n::SetICUDefaultLocale("he");
-
-  label.SetText(ASCIIToUTF16("Here's a string with no returns."));
-  gfx::Size required_size(label.GetPreferredSize());
-  gfx::Size extra(22, 8);
-  label.SetBounds(0, 0, required_size.width() + extra.width(),
-                  required_size.height() + extra.height());
-
-  // Do some basic verifications for all three alignments.
-  base::string16 paint_text;
-  gfx::Rect text_bounds;
-  int flags = -1;
-
-  // Centered text.
-  label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
-  EXPECT_EQ(label.text(), paint_text);
-  // The text should be centered horizontally and vertically.
-  EXPECT_EQ(extra.width() / 2, text_bounds.x());
-  EXPECT_EQ(extra.height() / 2 , text_bounds.y());
-  EXPECT_EQ(required_size.width(), text_bounds.width());
-  EXPECT_EQ(required_size.height(), text_bounds.height());
-  EXPECT_EQ(gfx::Canvas::TEXT_ALIGN_CENTER,
-            flags & (gfx::Canvas::TEXT_ALIGN_LEFT |
-                     gfx::Canvas::TEXT_ALIGN_CENTER |
-                     gfx::Canvas::TEXT_ALIGN_RIGHT));
-
-  // ALIGN_LEFT label.
-  label.SetHorizontalAlignment(gfx::ALIGN_LEFT);
-  paint_text.clear();
-  text_bounds.SetRect(0, 0, 0, 0);
-  label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
-  EXPECT_EQ(label.text(), paint_text);
-  // The text should be right aligned horizontally and centered vertically.
-  EXPECT_EQ(extra.width(), text_bounds.x());
-  EXPECT_EQ(extra.height() / 2 , text_bounds.y());
-  EXPECT_EQ(required_size.width(), text_bounds.width());
-  EXPECT_EQ(required_size.height(), text_bounds.height());
-  EXPECT_EQ(gfx::Canvas::TEXT_ALIGN_RIGHT,
-            flags & (gfx::Canvas::TEXT_ALIGN_LEFT |
-                     gfx::Canvas::TEXT_ALIGN_CENTER |
-                     gfx::Canvas::TEXT_ALIGN_RIGHT));
-
-  // ALIGN_RIGHT label.
-  label.SetHorizontalAlignment(gfx::ALIGN_RIGHT);
-  paint_text.clear();
-  text_bounds.SetRect(0, 0, 0, 0);
-  label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
-  EXPECT_EQ(label.text(), paint_text);
-  // The text should be left aligned horizontally and centered vertically.
-  EXPECT_EQ(0, text_bounds.x());
-  EXPECT_EQ(extra.height() / 2 , text_bounds.y());
-  EXPECT_EQ(required_size.width(), text_bounds.width());
-  EXPECT_EQ(required_size.height(), text_bounds.height());
-  EXPECT_EQ(gfx::Canvas::TEXT_ALIGN_LEFT,
-            flags & (gfx::Canvas::TEXT_ALIGN_LEFT |
-                     gfx::Canvas::TEXT_ALIGN_CENTER |
-                     gfx::Canvas::TEXT_ALIGN_RIGHT));
-
-
-  // Test single line drawing with a border.
-  gfx::Insets border(39, 34, 8, 96);
-  label.SetBorder(Border::CreateEmptyBorder(
-      border.top(), border.left(), border.bottom(), border.right()));
-
-  gfx::Size required_size_with_border(label.GetPreferredSize());
-  EXPECT_EQ(required_size.width() + border.width(),
-            required_size_with_border.width());
-  EXPECT_EQ(required_size.height() + border.height(),
-            required_size_with_border.height());
-  label.SetBounds(0, 0, required_size_with_border.width() + extra.width(),
-                  required_size_with_border.height() + extra.height());
-
-  // Centered text with border.
-  label.SetHorizontalAlignment(gfx::ALIGN_CENTER);
-  paint_text.clear();
-  text_bounds.SetRect(0, 0, 0, 0);
-  label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
-  EXPECT_EQ(label.text(), paint_text);
-  // The text should be centered horizontally and vertically within the border.
-  EXPECT_EQ(border.left() + extra.width() / 2, text_bounds.x());
-  EXPECT_EQ(border.top() + extra.height() / 2 , text_bounds.y());
-  EXPECT_EQ(required_size.width(), text_bounds.width());
-  EXPECT_EQ(required_size.height(), text_bounds.height());
-  EXPECT_EQ(gfx::Canvas::TEXT_ALIGN_CENTER,
-            flags & (gfx::Canvas::TEXT_ALIGN_LEFT |
-                     gfx::Canvas::TEXT_ALIGN_CENTER |
-                     gfx::Canvas::TEXT_ALIGN_RIGHT));
-
-  // ALIGN_LEFT text with border.
-  label.SetHorizontalAlignment(gfx::ALIGN_LEFT);
-  paint_text.clear();
-  text_bounds.SetRect(0, 0, 0, 0);
-  label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
-  EXPECT_EQ(label.text(), paint_text);
-  // The text should be right aligned horizontally and centered vertically.
-  EXPECT_EQ(border.left() + extra.width(), text_bounds.x());
-  EXPECT_EQ(border.top() + extra.height() / 2 , text_bounds.y());
-  EXPECT_EQ(required_size.width(), text_bounds.width());
-  EXPECT_EQ(required_size.height(), text_bounds.height());
-  EXPECT_EQ(gfx::Canvas::TEXT_ALIGN_RIGHT,
-            flags & (gfx::Canvas::TEXT_ALIGN_LEFT |
-                     gfx::Canvas::TEXT_ALIGN_CENTER |
-                     gfx::Canvas::TEXT_ALIGN_RIGHT));
-
-  // ALIGN_RIGHT text.
-  label.SetHorizontalAlignment(gfx::ALIGN_RIGHT);
-  paint_text.clear();
-  text_bounds.SetRect(0, 0, 0, 0);
-  label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
-  EXPECT_EQ(label.text(), paint_text);
-  // The text should be left aligned horizontally and centered vertically.
-  EXPECT_EQ(border.left(), text_bounds.x());
-  EXPECT_EQ(border.top() + extra.height() / 2 , text_bounds.y());
-  EXPECT_EQ(required_size.width(), text_bounds.width());
-  EXPECT_EQ(required_size.height(), text_bounds.height());
-  EXPECT_EQ(gfx::Canvas::TEXT_ALIGN_LEFT,
-            flags & (gfx::Canvas::TEXT_ALIGN_LEFT |
-                     gfx::Canvas::TEXT_ALIGN_CENTER |
-                     gfx::Canvas::TEXT_ALIGN_RIGHT));
-
-  // Reset locale.
-  base::i18n::SetICUDefaultLocale(locale);
-}
-
-// On Linux the underlying pango routines require a max height in order to
-// ellide multiline text. So until that can be resolved, we set all
-// multiline lables to not ellide in Linux only.
-TEST_F(LabelTest, DrawMultiLineStringInRTL) {
-  Label label;
-  label.SetFocusable(false);
-
-  // Test for RTL.
-  std::string locale = l10n_util::GetApplicationLocale("");
-  base::i18n::SetICUDefaultLocale("he");
-
-  label.SetText(ASCIIToUTF16("Another string\nwith returns\n\n!"));
-  label.SetMultiLine(true);
-  label.SizeToFit(0);
-  gfx::Size extra(50, 10);
-  label.SetBounds(label.x(), label.y(),
-                  label.width() + extra.width(),
-                  label.height() + extra.height());
-
-  // Do some basic verifications for all three alignments.
-  base::string16 paint_text;
-  gfx::Rect text_bounds;
-  int flags = -1;
-  label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
-  EXPECT_EQ(label.text(), paint_text);
-  EXPECT_EQ(extra.width() / 2, text_bounds.x());
-  EXPECT_EQ(extra.height() / 2, text_bounds.y());
-  EXPECT_GT(text_bounds.width(), kMinTextDimension);
-  EXPECT_GT(text_bounds.height(), kMinTextDimension);
-  EXPECT_TRUE(gfx::Canvas::MULTI_LINE & flags);
-  EXPECT_TRUE(gfx::Canvas::TEXT_ALIGN_CENTER & flags);
-#if !defined(OS_WIN)
-  EXPECT_TRUE(gfx::Canvas::NO_ELLIPSIS & flags);
-#endif
-  gfx::Rect center_bounds(text_bounds);
-
-  label.SetHorizontalAlignment(gfx::ALIGN_LEFT);
-  paint_text.clear();
-  text_bounds.SetRect(0, 0, 0, 0);
-  label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
-  EXPECT_EQ(label.text(), paint_text);
-  EXPECT_EQ(extra.width(), text_bounds.x());
-  EXPECT_EQ(extra.height() / 2, text_bounds.y());
-  EXPECT_GT(text_bounds.width(), kMinTextDimension);
-  EXPECT_GT(text_bounds.height(), kMinTextDimension);
-  EXPECT_TRUE(gfx::Canvas::MULTI_LINE & flags);
-  EXPECT_TRUE(gfx::Canvas::TEXT_ALIGN_RIGHT & flags);
-#if !defined(OS_WIN)
-  EXPECT_TRUE(gfx::Canvas::NO_ELLIPSIS & flags);
-#endif
-
-  label.SetHorizontalAlignment(gfx::ALIGN_RIGHT);
-  paint_text.clear();
-  text_bounds.SetRect(0, 0, 0, 0);
-  label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
-  EXPECT_EQ(label.text(), paint_text);
-  EXPECT_EQ(0, text_bounds.x());
-  EXPECT_EQ(extra.height() / 2, text_bounds.y());
-  EXPECT_GT(text_bounds.width(), kMinTextDimension);
-  EXPECT_GT(text_bounds.height(), kMinTextDimension);
-  EXPECT_TRUE(gfx::Canvas::MULTI_LINE & flags);
-  EXPECT_TRUE(gfx::Canvas::TEXT_ALIGN_LEFT & flags);
-#if !defined(OS_WIN)
-  EXPECT_TRUE(gfx::Canvas::NO_ELLIPSIS & flags);
-#endif
-
-  // Test multiline drawing with a border.
-  gfx::Insets border(19, 92, 23, 2);
-  label.SetBorder(Border::CreateEmptyBorder(
-      border.top(), border.left(), border.bottom(), border.right()));
-  label.SizeToFit(0);
-  label.SetBounds(label.x(), label.y(),
-                  label.width() + extra.width(),
-                  label.height() + extra.height());
-
-  label.SetHorizontalAlignment(gfx::ALIGN_CENTER);
-  paint_text.clear();
-  text_bounds.SetRect(0, 0, 0, 0);
-  label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
-  EXPECT_EQ(label.text(), paint_text);
-  EXPECT_EQ(border.left() + extra.width() / 2, text_bounds.x());
-  EXPECT_EQ(border.top() + extra.height() / 2, text_bounds.y());
-  EXPECT_EQ(center_bounds.width(), text_bounds.width());
-  EXPECT_EQ(center_bounds.height(), text_bounds.height());
-  EXPECT_TRUE(gfx::Canvas::MULTI_LINE & flags);
-  EXPECT_TRUE(gfx::Canvas::TEXT_ALIGN_CENTER & flags);
-#if !defined(OS_WIN)
-  EXPECT_TRUE(gfx::Canvas::NO_ELLIPSIS & flags);
-#endif
-
-  label.SetHorizontalAlignment(gfx::ALIGN_LEFT);
-  paint_text.clear();
-  text_bounds.SetRect(0, 0, 0, 0);
-  label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
-  EXPECT_EQ(label.text(), paint_text);
-  EXPECT_EQ(border.left() + extra.width(), text_bounds.x());
-  EXPECT_EQ(border.top() + extra.height() / 2, text_bounds.y());
-  EXPECT_EQ(center_bounds.width(), text_bounds.width());
-  EXPECT_EQ(center_bounds.height(), text_bounds.height());
-  EXPECT_TRUE(gfx::Canvas::MULTI_LINE & flags);
-  EXPECT_TRUE(gfx::Canvas::TEXT_ALIGN_RIGHT & flags);
-#if !defined(OS_WIN)
-  EXPECT_TRUE(gfx::Canvas::NO_ELLIPSIS & flags);
-#endif
-
-  label.SetHorizontalAlignment(gfx::ALIGN_RIGHT);
-  paint_text.clear();
-  text_bounds.SetRect(0, 0, 0, 0);
-  label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
-  EXPECT_EQ(label.text(), paint_text);
-  EXPECT_EQ(border.left(), text_bounds.x());
-  EXPECT_EQ(border.top() + extra.height() / 2, text_bounds.y());
-  EXPECT_EQ(center_bounds.width(), text_bounds.width());
-  EXPECT_EQ(center_bounds.height(), text_bounds.height());
-  EXPECT_TRUE(gfx::Canvas::MULTI_LINE & flags);
-  EXPECT_TRUE(gfx::Canvas::TEXT_ALIGN_LEFT & flags);
-#if !defined(OS_WIN)
-  EXPECT_TRUE(gfx::Canvas::NO_ELLIPSIS & flags);
-#endif
-
-  // Reset Locale
-  base::i18n::SetICUDefaultLocale(locale);
-}
-
-// Ensure the subpixel rendering flag and background color alpha are respected.
-TEST_F(LabelTest, DisableSubpixelRendering) {
-  Label label;
-  label.SetBackgroundColor(SK_ColorWHITE);
-  const int flag = gfx::Canvas::NO_SUBPIXEL_RENDERING;
-  EXPECT_EQ(0, label.ComputeDrawStringFlags() & flag);
-  label.SetSubpixelRenderingEnabled(false);
-  EXPECT_EQ(flag, label.ComputeDrawStringFlags() & flag);
-  label.SetSubpixelRenderingEnabled(true);
-  EXPECT_EQ(0, label.ComputeDrawStringFlags() & flag);
-  // Text cannot be drawn with subpixel rendering on transparent backgrounds.
-  label.SetBackgroundColor(SkColorSetARGB(64, 255, 255, 255));
-  EXPECT_EQ(flag, label.ComputeDrawStringFlags() & flag);
-}
-
 // Check that labels support GetTooltipHandlerForPoint.
 TEST_F(LabelTest, GetTooltipHandlerForPoint) {
   // A root view must be defined for this test because the hit-testing
   // behaviour used by GetTooltipHandlerForPoint() is defined by
   // the ViewTargeter installed on the root view.
   Widget widget;
   Widget::InitParams init_params =
       CreateParams(Widget::InitParams::TYPE_POPUP);
   init_params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   init_params.bounds = gfx::Rect(0, 0, 200, 200);
@@ skipping 22 matching lines @@
   EXPECT_FALSE(label.GetTooltipHandlerForPoint(gfx::Point(2, 51)));
   EXPECT_FALSE(label.GetTooltipHandlerForPoint(gfx::Point(-1, 20)));
 
   // GetTooltipHandlerForPoint works should work in child bounds.
   label.SetBounds(2, 2, 10, 10);
   EXPECT_EQ(&label, label.GetTooltipHandlerForPoint(gfx::Point(1, 5)));
   EXPECT_FALSE(label.GetTooltipHandlerForPoint(gfx::Point(3, 11)));
 }
 
 }  // namespace views