Reduce the number of text reshaping in RenderText

ui/gfx/render_text_mac.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_mac.h"
 
 #include <ApplicationServices/ApplicationServices.h>
 
 #include <algorithm>
 #include <cmath>
 #include <utility>
 
 #include "base/mac/foundation_util.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/strings/sys_string_conversions.h"
 #include "skia/ext/skia_utils_mac.h"
 
 namespace gfx {
 
-RenderTextMac::RenderTextMac() : common_baseline_(0), runs_valid_(false) {
+RenderTextMac::RenderTextMac()
+    : common_baseline_(0), runs_valid_(false) {
 }
 
 RenderTextMac::~RenderTextMac() {
 }
 
 scoped_ptr<RenderText> RenderTextMac::CreateInstanceOfSameType() const {
   return scoped_ptr<RenderTextMac>(new RenderTextMac);
 }
 
+const base::string16& RenderTextMac::GetDisplayText() {
+  return text_elided() ? display_text() : layout_text();
+}
+
 Size RenderTextMac::GetStringSize() {
   EnsureLayout();
   return Size(std::ceil(string_size_.width()), string_size_.height());
 }
 
 SizeF RenderTextMac::GetStringSizeF() {
   EnsureLayout();
   return string_size_;
 }
 
@@ skipping 11 matching lines @@
   for (size_t i = 0; i < runs_.size(); ++i) {
     Font font(runs_[i].font_name, runs_[i].text_size);
     const CFRange cf_range = CTRunGetStringRange(runs_[i].ct_run);
     const Range range(cf_range.location, cf_range.location + cf_range.length);
     spans.push_back(RenderText::FontSpan(font, range));
   }
 
   return spans;
 }
 
-int RenderTextMac::GetLayoutTextBaseline() {
+int RenderTextMac::GetDisplayTextBaseline() {
   EnsureLayout();
   return common_baseline_;
 }
 
 SelectionModel RenderTextMac::AdjacentCharSelectionModel(
     const SelectionModel& selection,
     VisualCursorDirection direction) {
   // TODO(asvitkine): Implement this. http://crbug.com/131618
   return SelectionModel();
 }
 
 SelectionModel RenderTextMac::AdjacentWordSelectionModel(
     const SelectionModel& selection,
     VisualCursorDirection direction) {
   // TODO(asvitkine): Implement this. http://crbug.com/131618
   return SelectionModel();
 }
 
 Range RenderTextMac::GetGlyphBounds(size_t index) {
   // TODO(asvitkine): Implement this. http://crbug.com/131618
   return Range();
 }
 
 std::vector<Rect> RenderTextMac::GetSubstringBounds(const Range& range) {
   // TODO(asvitkine): Implement this. http://crbug.com/131618
   return std::vector<Rect>();
 }
 
-size_t RenderTextMac::TextIndexToLayoutIndex(size_t index) const {
+size_t RenderTextMac::TextIndexToDisplayIndex(size_t index) {
   // TODO(asvitkine): Implement this. http://crbug.com/131618
   return index;
 }
 
-size_t RenderTextMac::LayoutIndexToTextIndex(size_t index) const {
+size_t RenderTextMac::DisplayIndexToTextIndex(size_t index) {
   // TODO(asvitkine): Implement this. http://crbug.com/131618
   return index;
 }
 
 bool RenderTextMac::IsValidCursorIndex(size_t index) {
   // TODO(asvitkine): Implement this. http://crbug.com/131618
   return IsValidLogicalIndex(index);
 }
 
-void RenderTextMac::ResetLayout() {
+void RenderTextMac::OnLayoutTextAttributeChanged(bool text_changed) {
+  if (text_changed &&
+      elide_behavior() != NO_ELIDE &&
+      elide_behavior() != FADE_TAIL &&
+      !layout_text().empty()) {
+    UpdateDisplayText(GetContentWidth());
+  }
   line_.reset();
   attributes_.reset();
   runs_.clear();
   runs_valid_ = false;
 }
 
+void RenderTextMac::OnDisplayTextAttributeChanged() {
+  OnLayoutTextAttributeChanged(true);
+}
+
 void RenderTextMac::EnsureLayout() {
   if (line_.get())
     return;
   runs_.clear();
   runs_valid_ = false;
 
   CTFontRef ct_font = base::mac::NSToCFCast(
       font_list().GetPrimaryFont().GetNativeFont());
 
   const void* keys[] = { kCTFontAttributeName };
@@ skipping 83 matching lines @@
   ApplyCompositionAndSelectionStyles();
 
   // Note: CFAttributedStringSetAttribute() does not appear to retain the values
   // passed in, as can be verified via CFGetRetainCount(). To ensure the
   // attribute objects do not leak, they are saved to |attributes_|.
   // Clear the attributes storage.
   attributes_.reset(CFArrayCreateMutable(NULL, 0, &kCFTypeArrayCallBacks));
 
   // https://developer.apple.com/library/mac/#documentation/Carbon/Reference/CoreText_StringAttributes_Ref/Reference/reference.html
   internal::StyleIterator style(colors(), styles());
-  const size_t layout_text_length = GetLayoutText().length();
+  const size_t layout_text_length = GetDisplayText().length();
   for (size_t i = 0, end = 0; i < layout_text_length; i = end) {
     end = TextIndexToLayoutIndex(style.GetRange().end());
     const CFRange range = CFRangeMake(i, end - i);
     base::ScopedCFTypeRef<CGColorRef> foreground(
         CGColorCreateFromSkColor(style.color()));
     CFAttributedStringSetAttribute(attr_string, range,
         kCTForegroundColorAttributeName, foreground);
     CFArrayAppendValue(attributes_, foreground);
 
     if (style.style(UNDERLINE)) {
@@ skipping 113 matching lines @@
     CTUnderlineStyle value = kCTUnderlineStyleNone;
     if (underline && CFNumberGetValue(underline, kCFNumberSInt32Type, &value))
       run->underline = (value == kCTUnderlineStyleSingle);
 
     run_origin.offset(run_width, 0);
   }
   runs_valid_ = true;
 }
 
 }  // namespace gfx