Use GetDisplayText() instead of text() for rendering text.

ui/gfx/render_text_mac.h

 // 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.
 
 #ifndef UI_GFX_RENDER_TEXT_MAC_H_
 #define UI_GFX_RENDER_TEXT_MAC_H_
 
 #include <ApplicationServices/ApplicationServices.h>
 
 #include <string>
@@ skipping 35 matching lines @@
   std::vector<Rect> GetSubstringBounds(const Range& range) override;
   size_t TextIndexToDisplayIndex(size_t index) override;
   size_t DisplayIndexToTextIndex(size_t index) override;
   bool IsValidCursorIndex(size_t index) override;
   void OnLayoutTextAttributeChanged(bool text_changed) override;
   void OnDisplayTextAttributeChanged() override;
   void EnsureLayout() override;
   void DrawVisualText(Canvas* canvas) override;
 
  private:
+  FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Mac_ElidedText);
+
   struct TextRun {
     CTRunRef ct_run;
     SkPoint origin;
     std::vector<uint16> glyphs;
     std::vector<SkPoint> glyph_positions;
     SkScalar width;
     std::string font_name;
     int font_style;
     SkScalar text_size;
     SkColor foreground;
     bool underline;
     bool strike;
     bool diagonal_strike;
 
     TextRun();
     ~TextRun();
   };
 
+  // Update |string_size_| based on the |layout_text()|.
+  void EnsureStringSize();

[oshima, 2015/03/05 18:14:20]

EnsureLayoutTextSize() ?

[Jun Mukai, 2015/03/05 18:41:38]

Renamed to GetLayoutTextSize(). This is (currently) only necessary in
OnLayoutTextAttributeChanged(), and it always needs to recompute the size in
that context.

+
+  // Creates Core Text line object and its attributes for the given text and
+  // returns the text. |attributes| keeps the ownership of the text attributes.
+  // See the comments of ArrayStyles() implementation for the ownership details.
+  base::ScopedCFTypeRef<CTLineRef> EnsureLayoutInternal(
+      const base::string16& text,
+      base::ScopedCFTypeRef<CFMutableArrayRef>* attributes) const;
+
   // Applies RenderText styles to |attr_string| with the given |ct_font|.
-  void ApplyStyles(CFMutableAttributedStringRef attr_string, CTFontRef ct_font);
+  // Returns the array of attributes to keep the ownership of the attributes.
+  // See the comments in .cc file for the details.
+  base::ScopedCFTypeRef<CFMutableArrayRef> ApplyStyles(
+      CFMutableAttributedStringRef attr_string,
+      CTFontRef ct_font) const;
 
   // Updates |runs_| based on |line_| and sets |runs_valid_| to true.
   void ComputeRuns();
 
   // The Core Text line of text. Created by |EnsureLayout()|.
   base::ScopedCFTypeRef<CTLineRef> line_;
 
   // Array to hold CFAttributedString attributes that allows Core Text to hold
   // weak references to them without leaking.
   base::ScopedCFTypeRef<CFMutableArrayRef> attributes_;
 
   // Visual dimensions of the text. Computed by |EnsureLayout()|.
-  SizeF string_size_;
+  scoped_ptr<SizeF> string_size_;
 
   // Common baseline for this line of text. Computed by |EnsureLayout()|.
   SkScalar common_baseline_;
 
   // Visual text runs. Only valid if |runs_valid_| is true. Computed by
   // |ComputeRuns()|.
   std::vector<TextRun> runs_;
 
   // Indicates that |runs_| are valid, set by |ComputeRuns()|.
   bool runs_valid_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderTextMac);
 };
 
 }  // namespace gfx
 
 #endif  // UI_GFX_RENDER_TEXT_MAC_H_