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

ui/gfx/render_text_mac.h

Index: ui/gfx/render_text_mac.h
diff --git a/ui/gfx/render_text_mac.h b/ui/gfx/render_text_mac.h
index 737207fe19af6060b893b4b38a0cfb582e1f847a..21e25c4488420d0e32f75c010ec45598700c5b7e 100644
--- a/ui/gfx/render_text_mac.h
+++ b/ui/gfx/render_text_mac.h
@@ -53,6 +53,8 @@ class RenderTextMac : public RenderText {
   void DrawVisualText(Canvas* canvas) override;
 
  private:
+  FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Mac_ElidedText);
+
   struct TextRun {
     CTRunRef ct_run;
     SkPoint origin;
@@ -71,8 +73,22 @@ class RenderTextMac : public RenderText {
     ~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();
@@ -85,7 +101,7 @@ class RenderTextMac : public RenderText {
   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_;