| 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..69bf6022301d37dda52da40c92f2ac411061240d 100644
|
| --- a/ui/gfx/render_text_win.h
|
| +++ b/ui/gfx/render_text_win.h
|
| @@ -64,6 +64,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;
|
| @@ -92,6 +93,9 @@ class RenderTextWin : public RenderText {
|
| void LayoutVisualText();
|
| void LayoutTextRun(internal::TextRun* run);
|
|
|
| + // Computes Line structs using the current text run data. Calls |set_lines()|.
|
| + void ComputeLines();
|
| +
|
| // 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);
|
|
|