Windows implementation of multiline RenderText

ui/gfx/render_text_win.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_WIN_H_
 #define UI_GFX_RENDER_TEXT_WIN_H_
 
 #include <usp10.h>
 
 #include <map>
@@ skipping 36 matching lines @@
 
   scoped_ptr<int[]> advance_widths;
   scoped_ptr<GOFFSET[]> offsets;
   ABC abc_widths;
   SCRIPT_CACHE script_cache;
 
  private:
   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.
 class RenderTextWin : public RenderText {
  public:
   RenderTextWin();
   virtual ~RenderTextWin();
 
   // Overridden from RenderText:
   virtual Size GetStringSize() OVERRIDE;
@@ skipping 13 matching lines @@
   virtual std::vector<Rect> GetSubstringBounds(const ui::Range& range) OVERRIDE;
   virtual size_t TextIndexToLayoutIndex(size_t index) const OVERRIDE;
   virtual size_t LayoutIndexToTextIndex(size_t index) const OVERRIDE;
   virtual bool IsCursorablePosition(size_t position) OVERRIDE;
   virtual void ResetLayout() OVERRIDE;
   virtual void EnsureLayout() OVERRIDE;
   virtual void DrawVisualText(Canvas* canvas) OVERRIDE;
 
  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();
   void LayoutTextRun(internal::TextRun* run);
 
   // Helper function that calls |ScriptShape()| on the run, which has logic to
   // handle E_OUTOFMEMORY return codes.
   HRESULT ShapeTextRunWithFont(internal::TextRun* run, const Font& font);
 
   // Returns the number of characters in |run| that have missing glyphs.
@@ skipping 14 matching lines @@
   static HDC cached_hdc_;
 
   // Cached map from font name to the last successful substitute font used.
   // TODO(asvitkine): Move the caching logic to font_fallback_win.cc.
   static std::map<std::string, Font> successful_substitute_fonts_;
 
   SCRIPT_CONTROL script_control_;
   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_;
 
   bool needs_layout_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderTextWin);
 };
 
 }  // namespace gfx
 
 #endif  // UI_GFX_RENDER_TEXT_WIN_H_