LabelButton: cache the last computed preferred size

ui/views/controls/button/label_button_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/button/label_button.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/font_list.h"
@@ skipping 51 matching lines @@
   button.SetText(short_text);
   EXPECT_GT(button.GetPreferredSize().height(), font_list.GetHeight());
   EXPECT_GT(button.GetPreferredSize().width(), short_text_width);
   EXPECT_LT(button.GetPreferredSize().width(), long_text_width);
   button.SetText(long_text);
   EXPECT_GT(button.GetPreferredSize().width(), long_text_width);
   button.SetText(short_text);
   EXPECT_GT(button.GetPreferredSize().width(), long_text_width);
 
   // Clamp the size to a maximum value.
-  button.set_max_size(gfx::Size(long_text_width, 1));
+  button.SetMaxSize(gfx::Size(long_text_width, 1));
   EXPECT_EQ(button.GetPreferredSize(), gfx::Size(long_text_width, 1));
 
   // Clear the monotonically increasing minimum size.
-  button.set_min_size(gfx::Size());
+  button.SetMinSize(gfx::Size());
   EXPECT_GT(button.GetPreferredSize().width(), short_text_width);
   EXPECT_LT(button.GetPreferredSize().width(), long_text_width);
 }
 
 TEST_F(LabelButtonTest, Image) {
   LabelButton button(NULL, base::string16());
 
   const int small_size = 50, large_size = 100;
   const gfx::ImageSkia small_image = CreateTestImage(small_size, small_size);
   const gfx::ImageSkia large_image = CreateTestImage(large_size, large_size);
 
   // The width increases monotonically with image size (it does not shrink).
   EXPECT_LT(button.GetPreferredSize().width(), small_size);
   EXPECT_LT(button.GetPreferredSize().height(), small_size);
   button.SetImage(Button::STATE_NORMAL, small_image);
   EXPECT_GT(button.GetPreferredSize().width(), small_size);
   EXPECT_GT(button.GetPreferredSize().height(), small_size);
   EXPECT_LT(button.GetPreferredSize().width(), large_size);
   EXPECT_LT(button.GetPreferredSize().height(), large_size);
   button.SetImage(Button::STATE_NORMAL, large_image);
   EXPECT_GT(button.GetPreferredSize().width(), large_size);
   EXPECT_GT(button.GetPreferredSize().height(), large_size);
   button.SetImage(Button::STATE_NORMAL, small_image);
   EXPECT_GT(button.GetPreferredSize().width(), large_size);
   EXPECT_GT(button.GetPreferredSize().height(), large_size);
 
   // Clamp the size to a maximum value.
-  button.set_max_size(gfx::Size(large_size, 1));
+  button.SetMaxSize(gfx::Size(large_size, 1));
   EXPECT_EQ(button.GetPreferredSize(), gfx::Size(large_size, 1));
 
   // Clear the monotonically increasing minimum size.
-  button.set_min_size(gfx::Size());
+  button.SetMinSize(gfx::Size());
   EXPECT_GT(button.GetPreferredSize().width(), small_size);
   EXPECT_LT(button.GetPreferredSize().width(), large_size);
 }
 
 TEST_F(LabelButtonTest, LabelAndImage) {
   LabelButton button(NULL, base::string16());
 
   const gfx::FontList font_list;
   const base::string16 text(ASCIIToUTF16("abcdefghijklm"));
   const int text_width = gfx::GetStringWidth(text, font_list);
@@ skipping 31 matching lines @@
   EXPECT_LT(button.label_->bounds().right(), button.image_->bounds().x());
 
   button.SetText(base::string16());
   EXPECT_GT(button.GetPreferredSize().width(), text_width + image_size);
   EXPECT_GT(button.GetPreferredSize().height(), image_size);
   button.SetImage(Button::STATE_NORMAL, gfx::ImageSkia());
   EXPECT_GT(button.GetPreferredSize().width(), text_width + image_size);
   EXPECT_GT(button.GetPreferredSize().height(), image_size);
 
   // Clamp the size to a maximum value.
-  button.set_max_size(gfx::Size(image_size, 1));
+  button.SetMaxSize(gfx::Size(image_size, 1));
   EXPECT_EQ(button.GetPreferredSize(), gfx::Size(image_size, 1));
 
   // Clear the monotonically increasing minimum size.
-  button.set_min_size(gfx::Size());
+  button.SetMinSize(gfx::Size());
   EXPECT_LT(button.GetPreferredSize().width(), text_width);
   EXPECT_LT(button.GetPreferredSize().width(), image_size);
   EXPECT_LT(button.GetPreferredSize().height(), image_size);
 }
 
 TEST_F(LabelButtonTest, FontList) {
   const base::string16 text(ASCIIToUTF16("abc"));
   LabelButton button(NULL, text);
 
   const gfx::FontList original_font_list = button.GetFontList();
   const gfx::FontList large_font_list =
       original_font_list.DeriveWithSizeDelta(100);
   const int original_width = button.GetPreferredSize().width();
   const int original_height = button.GetPreferredSize().height();
 
   // The button size increases when the font size is increased.
   button.SetFontList(large_font_list);
   EXPECT_GT(button.GetPreferredSize().width(), original_width);
   EXPECT_GT(button.GetPreferredSize().height(), original_height);
 
   // The button returns to its original size when the minimal size is cleared
   // and the original font size is restored.
-  button.set_min_size(gfx::Size());
+  button.SetMinSize(gfx::Size());
   button.SetFontList(original_font_list);
   EXPECT_EQ(original_width, button.GetPreferredSize().width());
   EXPECT_EQ(original_height, button.GetPreferredSize().height());
 }
 
+TEST_F(LabelButtonTest, ChangeTextSize) {
+  const base::string16 text(ASCIIToUTF16("abc"));
+  const base::string16 longer_text(ASCIIToUTF16("abcdefghijklm"));
+  LabelButton button(NULL, text);
+
+  const int original_width = button.GetPreferredSize().width();
+
+  // The button size increases when the text size is increased.
+  button.SetText(longer_text);
+  EXPECT_GT(button.GetPreferredSize().width(), original_width);
+
+  // The button returns to its original size when the original text is restored.
+  button.SetMinSize(gfx::Size());
+  button.SetText(text);
+  EXPECT_EQ(original_width, button.GetPreferredSize().width());
+}
+
 }  // namespace views