RenderText: Always invalidate layout on style changes and never on color changes

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 <climits>
 
 #include "base/command_line.h"
@@ skipping 654 matching lines @@
 void RenderText::SetCompositionRange(const Range& composition_range) {
   CHECK(!composition_range.IsValid() ||
         Range(0, text_.length()).Contains(composition_range));
   composition_range_.set_end(composition_range.end());
   composition_range_.set_start(composition_range.start());
   ResetLayout();
 }
 
 void RenderText::SetColor(SkColor value) {
   colors_.SetValue(value);
-
-#if defined(OS_WIN)
-  // TODO(msw): Windows applies colors and decorations in the layout process.
-  cached_bounds_and_offset_valid_ = false;
-  ResetLayout();
-#endif
 }
 
 void RenderText::ApplyColor(SkColor value, const Range& range) {
   colors_.ApplyValue(value, range);
-
-#if defined(OS_WIN)

[ckocagil, 2014/08/30 01:26:15]

This one shouldn't be needed after http://crrev.com/214150.

[msw, 2014/09/02 18:02:21]

Acknowledged.

-  // TODO(msw): Windows applies colors and decorations in the layout process.
-  cached_bounds_and_offset_valid_ = false;
-  ResetLayout();
-#endif
 }
 
 void RenderText::SetStyle(TextStyle style, bool value) {
   styles_[style].SetValue(value);
 
-  // Only invalidate the layout on font changes; not for colors or decorations.
-  bool invalidate = (style == BOLD) || (style == ITALIC);
-#if defined(OS_WIN)
-  // TODO(msw): Windows applies colors and decorations in the layout process.
-  invalidate = true;
-#endif
-  if (invalidate) {
-    cached_bounds_and_offset_valid_ = false;
-    ResetLayout();
-  }
+  cached_bounds_and_offset_valid_ = false;
+  ResetLayout();
 }
 
 void RenderText::ApplyStyle(TextStyle style, bool value, const Range& range) {
   styles_[style].ApplyValue(value, range);
 
-  // Only invalidate the layout on font changes; not for colors or decorations.
-  bool invalidate = (style == BOLD) || (style == ITALIC);
-#if defined(OS_WIN)

[ckocagil, 2014/08/30 01:26:15]

HarfBuzz always needs invalidation on style change.

[msw, 2014/09/02 18:02:21]

Acknowledged.

-  // TODO(msw): Windows applies colors and decorations in the layout process.
-  invalidate = true;
-#endif
-  if (invalidate) {
-    cached_bounds_and_offset_valid_ = false;
-    ResetLayout();
-  }
+  cached_bounds_and_offset_valid_ = false;
+  ResetLayout();
 }
 
 bool RenderText::GetStyle(TextStyle style) const {
   return (styles_[style].breaks().size() == 1) &&
       styles_[style].breaks().front().second;
 }
 
 void RenderText::SetDirectionalityMode(DirectionalityMode mode) {
   if (mode == directionality_mode_)
     return;
@@ skipping 700 matching lines @@
   SetDisplayOffset(display_offset_.x() + delta_x);
 }
 
 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