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 39 matching lines @@
 
   scoped_ptr<int[]> advance_widths;
   scoped_ptr<GOFFSET[]> offsets;
   ABC abc_widths;
   SCRIPT_CACHE script_cache;
 
  private:
   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.
 class RenderTextWin : public RenderText {
  public:
   RenderTextWin();
   virtual ~RenderTextWin();
 
   // 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;
 
  protected:
   // Overridden from RenderText:
   virtual SelectionModel AdjacentCharSelectionModel(
       const SelectionModel& selection,
       VisualCursorDirection direction) OVERRIDE;
   virtual SelectionModel AdjacentWordSelectionModel(
       const SelectionModel& selection,
       VisualCursorDirection direction) OVERRIDE;
   virtual void SetSelectionModel(const SelectionModel& model) OVERRIDE;
   virtual ui::Range GetGlyphBounds(size_t index) OVERRIDE;
   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;
+  virtual void ComputeLines() OVERRIDE;
 
  private:
   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);
 
@@ skipping 32 matching lines @@
   scoped_ptr<int[]> logical_to_visual_;
 
   bool needs_layout_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderTextWin);
 };
 
 }  // namespace gfx
 
 #endif  // UI_GFX_RENDER_TEXT_WIN_H_