This caused failures in ui_unittests FontListTest.Fonts_GetHeight_GetBaseline

trunk/src/ui/gfx/render_text.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/gfx/render_text.h"
 
 #include <algorithm>
 
 #include "base/i18n/break_iterator.h"
 #include "base/logging.h"
@@ skipping 339 matching lines @@
   font_list_ = font_list;
   cached_bounds_and_offset_valid_ = false;
   ResetLayout();
 }
 
 void RenderText::SetFont(const Font& font) {
   SetFontList(FontList(font));
 }
 
 void RenderText::SetFontSize(int size) {
-  SetFontList(font_list_.DeriveFontListWithSize(size));
+  font_list_ = font_list_.DeriveFontListWithSize(size);
+  cached_bounds_and_offset_valid_ = false;
+  ResetLayout();
 }
 
 void RenderText::SetCursorEnabled(bool cursor_enabled) {
   cursor_enabled_ = cursor_enabled;
   cached_bounds_and_offset_valid_ = false;
 }
 
 const Font& RenderText::GetFont() const {
   return font_list_.GetFonts()[0];
 }
@@ skipping 643 matching lines @@
   cursor_bounds_ += delta_offset;
 }
 
 void RenderText::DrawSelection(Canvas* canvas) {
   const std::vector<Rect> sel = GetSubstringBounds(selection());
   for (std::vector<Rect>::const_iterator i = sel.begin(); i < sel.end(); ++i)
     canvas->FillRect(*i, selection_background_focused_color_);
 }
 
 }  // namespace gfx