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 620ef092dff98fd2175427ab390b253aa3057198..6f8c9e283548ef78e570274a47d68172dcbca849 100644
--- a/ui/gfx/render_text_win.h
+++ b/ui/gfx/render_text_win.h
@@ -54,6 +54,9 @@ struct TextRun {
   DISALLOW_COPY_AND_ASSIGN(TextRun);
 };
 
+UI_EXPORT void CheckLineIntegrity(const std::vector<Line>& lines,
+                                  const ScopedVector<TextRun>& runs);
+
 }  // namespace internal
 
 // RenderTextWin is the Windows implementation of RenderText using Uniscribe.
@@ -87,6 +90,8 @@ class RenderTextWin : public RenderText {
 
  private:
   FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Win_LogicalClusters);
+  FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Multiline_MinWidth);
+  FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Multiline_NormalWidth);
 
   void ItemizeLogicalText();
   void LayoutVisualText();
@@ -121,11 +126,12 @@ class RenderTextWin : public RenderText {
   SCRIPT_STATE script_state_;
 
   ScopedVector<internal::TextRun> runs_;
-  Size string_size_;
 
-  // A common vertical baseline for all the text runs. This is computed as the
-  // largest baseline over all the runs' fonts.
-  int common_baseline_;
+  // Single line width of the layout text.
+  int string_width_;
+
+  // Wrapped multiline size of the layout text.
+  Size multiline_string_size_;
 
   scoped_ptr<int[]> visual_to_logical_;
   scoped_ptr<int[]> logical_to_visual_;