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..e20544370cfe146e62e5abbe456c924976f82651 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,20 @@ class RenderTextMac : public RenderText {
     ~TextRun();
   };
 
+  // Update |string_size_| based on the |layout_text()|.
+  void EnsureStringSize();
+
+  // Creates Core Text line object and its attributes for the given text.
+  void EnsureLayoutInternal(
+      const base::string16& text,
+      base::ScopedCFTypeRef<CTLineRef>* line,
+      base::ScopedCFTypeRef<CFMutableArrayRef>* attributes);
+
   // Applies RenderText styles to |attr_string| with the given |ct_font|.
-  void ApplyStyles(CFMutableAttributedStringRef attr_string, CTFontRef ct_font);
+  // The computed attributes are stored into |attributes_owner|.
+  void ApplyStyles(CFMutableAttributedStringRef attr_string,

[tapted, 2015/03/05 06:32:49]

declare this as a const function? That would be a good safety I think. Same for
EnsureLayoutInternal()

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

Done.

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

Oops, this and EnsureLayoutInternal() can't be const, because ApplyStyles()
invokes non-const methods (ApplyCompositionAndSelectionStyles() and
UndoCompositionAndSelectionStyles()). They are safely called from ApplyStyles(),
and probably some another way would be better to scope the selection styles, but
for now this should be non-const.

+                   CTFontRef ct_font,
+                   base::ScopedCFTypeRef<CFMutableArrayRef>* attributes_owner);

[tapted, 2015/03/05 06:32:49]

It should be fine to return a base::ScopedCFTypeRef instead of taking a pointer.


The same applies for EnsureLayoutInternal(..), but of course you'd still need to
pass |line|. Taking |line| by pointer and returning |attributes| would allow
EnsureStringSize to just ignore the return value, but it's not as consistent.
So, up to you if you like this or not.

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

Done, but I think EnsureLayoutInternal should semantically return CTLineRef
rather than |attributes| (and I believe we should not ignore the return value,
it seems to live as long as CTLineRef lives).

 
   // Updates |runs_| based on |line_| and sets |runs_valid_| to true.
   void ComputeRuns();
@@ -85,7 +99,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_;