| 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..b9ffe2dd8807cdbe681af4af822c786d9fc83cbe 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;
|
| @@ -87,6 +88,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();
|
| @@ -122,6 +125,7 @@ class RenderTextWin : public RenderText {
|
|
|
| ScopedVector<internal::TextRun> runs_;
|
| Size string_size_;
|
| + Size multiline_string_size_;
|
|
|
| // A common vertical baseline for all the text runs. This is computed as the
|
| // largest baseline over all the runs' fonts.
|
|
|