Windows implementation of multiline RenderText

ui/gfx/render_text_win.h

Index: ui/gfx/render_text_win.h
diff --git a/ui/gfx/render_text_win.h b/ui/gfx/render_text_win.h
index 704829d65c7e91735930e9e4914e665976e2c162..4614f6eb273302bd1c05b3302cd2d80dde5dc327 100644
--- a/ui/gfx/render_text_win.h
+++ b/ui/gfx/render_text_win.h
@@ -57,6 +57,10 @@ struct TextRun {
   DISALLOW_COPY_AND_ASSIGN(TextRun);
 };
 
+struct LineSegmentWin : LineSegment {

[msw, 2013/07/10 04:01:56]

I think this can be declared in the .cc file.

[ckocagil, 2013/07/13 16:05:10]

Done.

+  TextRun* run;
+};
+
 }  // namespace internal
 
 // RenderTextWin is the Windows implementation of RenderText using Uniscribe.
@@ -67,6 +71,7 @@ class RenderTextWin : public RenderText {
 
   // Overridden from RenderText:
   virtual Size GetStringSize() OVERRIDE;
+  virtual Size GetMultilineTextSize() OVERRIDE;
   virtual int GetBaseline() OVERRIDE;
   virtual SelectionModel FindCursorPosition(const Point& point) OVERRIDE;
   virtual std::vector<FontSpan> GetFontSpansForTesting() OVERRIDE;
@@ -88,6 +93,7 @@ class RenderTextWin : public RenderText {
   virtual void ResetLayout() OVERRIDE;
   virtual void EnsureLayout() OVERRIDE;
   virtual void DrawVisualText(Canvas* canvas) OVERRIDE;
+  virtual void ComputeLines() OVERRIDE;
 
  private:
   void ItemizeLogicalText();