Add line height setting to views::Label & use it for notifications.

ui/gfx/canvas_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 <limits>
+
 #include "base/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/font.h"
 
 namespace gfx {
 
-TEST(CanvasTest, StringWidth) {
-  const string16 text = UTF8ToUTF16("Test");
-  const int width = Canvas::GetStringWidth(text, Font());
+/* Test fixture ***************************************************************/

[msw, 2013/04/17 20:12:59]

nit: this doesn't seem terribly common or helpful, i'd remove it.

[dharcourt, 2013/04/17 23:29:40]

And now it's gone :-).

 
-  EXPECT_GT(width, 0);
+class CanvasTest : public testing::Test {
+ protected:
+  int GetStringWidth(const char *text) {
+    return Canvas::GetStringWidth(UTF8ToUTF16(text), font_);
+  }
+
+  gfx::Size SizeStringInt(const char *text, int width, int line_height) {
+    string16 text16 = UTF8ToUTF16(text);
+    int height = 0;
+    int flags = (text16.find('\n') != string16::npos) ? Canvas::MULTI_LINE : 0;
+    Canvas::SizeStringInt(text16, font_, &width, &height, line_height, flags);
+    return gfx::Size(width, height);
+  }
+
+ private:
+  gfx::Font font_;
+};
+
+/* Test cases *****************************************************************/

[msw, 2013/04/17 20:12:59]

nit: this doesn't seem terribly common or helpful, i'd remove it.

[dharcourt, 2013/04/17 23:29:40]

Done.

+
+TEST_F(CanvasTest, StringWidth) {
+  EXPECT_GT(GetStringWidth("Test"), 0);
 }
 
-TEST(CanvasTest, StringWidthEmptyString) {
-  const string16 text = UTF8ToUTF16("");
-  const int width = Canvas::GetStringWidth(text, Font());
-
-  EXPECT_EQ(0, width);
+TEST_F(CanvasTest, StringWidthEmptyString) {
+  EXPECT_EQ(0, GetStringWidth(""));
 }
 
-TEST(CanvasTest, StringSizeEmptyString) {
-  const Font font;
-  const string16 text = UTF8ToUTF16("");
-  int width = 0;
-  int height = 0;
-  Canvas::SizeStringInt(text, font, &width, &height, 0);
+TEST_F(CanvasTest, StringSizeEmptyString) {
+  gfx::Size size = SizeStringInt("", 0, -1);
+  EXPECT_EQ(0, size.width());
+  EXPECT_GT(size.height(), 0);
+}
 
-  EXPECT_EQ(0, width);
-  EXPECT_GT(height, 0);
+// Line height only supported on Skia.

[msw, 2013/04/17 20:12:59]

nit: "Line height *is* only..."

[dharcourt, 2013/04/17 23:29:40]

Done.

+#if defined(OS_MACOSX) || defined(OS_ANDROID)
+#define MAYBE_StringSizeWithLineHeight DISABLED_StringSizeWithLineHeight

[msw, 2013/04/17 20:12:59]

It seems more common to just wrap the test in #if defined blocks.
But I actually like this, it's easier to track DISABLED_* tests.

[dharcourt, 2013/04/17 23:29:40]

I'm glad my ignorance in this regard led to better trackability :-).

+#else
+#define MAYBE_StringSizeWithLineHeight StringSizeWithLineHeight
+#endif
+
+TEST_F(CanvasTest, MAYBE_StringSizeWithLineHeight) {
+  gfx::Size one_line_size = SizeStringInt("Q", 0, -1);
+  gfx::Size four_line_size = SizeStringInt("Q\nQ\nQ\nQ", 1000000, 1000);
+  EXPECT_EQ(one_line_size.width(), four_line_size.width());
+  EXPECT_EQ(3 * 1000 + one_line_size.height(), four_line_size.height());
 }
 
 }  // namespace gfx