Add RenderText DirectionalityMode enum and support; etc.

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 "base/i18n/rtl.h"
 #include "base/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/canvas.h"
+#include "ui/gfx/render_text.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/label.h"
 
 namespace views {
 
 // All text sizing measurements (width and height) should be greater than this.
 const int kMinTextDimension = 4;
 
 TEST(LabelTest, FontPropertyCourier) {
   Label label;
@@ skipping 51 matching lines @@
       reverse_alignment ? Label::ALIGN_LEFT : Label::ALIGN_RIGHT,
       label.horizontal_alignment());
   label.SetHorizontalAlignment(Label::ALIGN_LEFT);
   EXPECT_EQ(
       reverse_alignment ? Label::ALIGN_RIGHT : Label::ALIGN_LEFT,
       label.horizontal_alignment());
   label.SetHorizontalAlignment(Label::ALIGN_CENTER);
   EXPECT_EQ(Label::ALIGN_CENTER, label.horizontal_alignment());
 
   // The label's alignment should not be flipped if the directionality mode is
-  // AUTO_DETECT_DIRECTIONALITY.
-  label.set_directionality_mode(Label::AUTO_DETECT_DIRECTIONALITY);
+  // gfx::DERIVE_FROM_TEXT.
+  label.set_directionality_mode(gfx::DERIVE_FROM_TEXT);
   label.SetHorizontalAlignment(Label::ALIGN_RIGHT);
   EXPECT_EQ(Label::ALIGN_RIGHT, label.horizontal_alignment());
   label.SetHorizontalAlignment(Label::ALIGN_LEFT);
   EXPECT_EQ(Label::ALIGN_LEFT, label.horizontal_alignment());
   label.SetHorizontalAlignment(Label::ALIGN_CENTER);
   EXPECT_EQ(Label::ALIGN_CENTER, label.horizontal_alignment());
 }
 
 TEST(LabelTest, DirectionalityModeProperty) {
   Label label;
-  EXPECT_EQ(Label::USE_UI_DIRECTIONALITY, label.directionality_mode());
+  EXPECT_EQ(gfx::DERIVE_FROM_UI, label.directionality_mode());
 
-  label.set_directionality_mode(Label::AUTO_DETECT_DIRECTIONALITY);
-  EXPECT_EQ(Label::AUTO_DETECT_DIRECTIONALITY, label.directionality_mode());
+  label.set_directionality_mode(gfx::DERIVE_FROM_TEXT);
+  EXPECT_EQ(gfx::DERIVE_FROM_TEXT, label.directionality_mode());
 
-  label.set_directionality_mode(Label::USE_UI_DIRECTIONALITY);
-  EXPECT_EQ(Label::USE_UI_DIRECTIONALITY, label.directionality_mode());
+  label.set_directionality_mode(gfx::DERIVE_FROM_UI);
+  EXPECT_EQ(gfx::DERIVE_FROM_UI, label.directionality_mode());
 }
 
 TEST(LabelTest, MultiLineProperty) {
   Label label;
   EXPECT_FALSE(label.is_multi_line());
   label.SetMultiLine(true);
   EXPECT_TRUE(label.is_multi_line());
   label.SetMultiLine(false);
   EXPECT_FALSE(label.is_multi_line());
 }
@@ skipping 162 matching lines @@
   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(LabelTest, AutoDetectDirectionality) {
   Label label;
-  label.set_directionality_mode(Label::AUTO_DETECT_DIRECTIONALITY);
-
-  // Test text starts with RTL character.
-  string16 test_text(WideToUTF16(L"  \x5d0\x5d1\x5d2 abc"));
-  label.SetText(test_text);
-  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());
+  label.set_directionality_mode(gfx::DERIVE_FROM_TEXT);
 
   string16 paint_text;
   gfx::Rect text_bounds;
-  int flags;
+  int flags = 0;
+
+  // Test text starting with an RTL character.
+  label.SetText(WideToUTF16(L"  \x5d0\x5d1\x5d2 abc "));
   label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
   EXPECT_EQ(gfx::Canvas::FORCE_RTL_DIRECTIONALITY, flags);
 
-  // Test text starts with LTR character.
-  test_text = (WideToUTF16(L"ltr \x5d0\x5d1\x5d2 abc"));
-  label.SetText(test_text);
-  required_size = label.GetPreferredSize();
-  label.SetBounds(0,
-                  0,
-                  required_size.width() + extra.width(),
-                  required_size.height() + extra.height());
-
+  // Test text starting with an LTR character.
+  label.SetText(WideToUTF16(L"ltr \x5d0\x5d1\x5d2 abc "));
   label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
   EXPECT_EQ(gfx::Canvas::FORCE_LTR_DIRECTIONALITY, flags);
 }
 
 TEST(LabelTest, DrawSingleLineString) {
   Label label;
   label.set_focusable(false);
 
   // Turn off mirroring so that we don't need to figure out if
   // align right really means align left.
-  label.set_directionality_mode(Label::AUTO_DETECT_DIRECTIONALITY);
+  label.set_directionality_mode(gfx::DERIVE_FROM_TEXT);
 
   string16 test_text(ASCIIToUTF16("Here's a string with no returns."));
   label.SetText(test_text);
   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());
 
@@ skipping 97 matching lines @@
 
 // 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(LabelTest, DrawMultiLineString) {
   Label label;
   label.set_focusable(false);
 
   // Turn off mirroring so that we don't need to figure out if
   // align right really means align left.
-  label.set_directionality_mode(Label::AUTO_DETECT_DIRECTIONALITY);
+  label.set_directionality_mode(gfx::DERIVE_FROM_TEXT);
 
   string16 test_text(ASCIIToUTF16("Another string\nwith returns\n\n!"));
   label.SetText(test_text);
   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());
@@ skipping 400 matching lines @@
   EXPECT_EQ(
       0, label.ComputeDrawStringFlags() & gfx::Canvas::NO_SUBPIXEL_RENDERING);
 
   label.SetBackgroundColor(SkColorSetARGB(64, 255, 255, 255));
   EXPECT_EQ(
       gfx::Canvas::NO_SUBPIXEL_RENDERING,
       label.ComputeDrawStringFlags() & gfx::Canvas::NO_SUBPIXEL_RENDERING);
 }
 
 }  // namespace views