diff options
| author | asvitkine@chromium.org <asvitkine@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-04 14:50:00 +0000 |
|---|---|---|
| committer | asvitkine@chromium.org <asvitkine@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-04 14:50:00 +0000 |
| commit | f9905327d7243185ccde9f06a8a1f3e19c184b9e (patch) | |
| tree | 35a3a7af39b4ada6da84d5f023799e91374b6d2b /ui/gfx/render_text_win.h | |
| parent | 1272b1e6790224afe68736fd7528caf0a9a921d9 (diff) | |
| download | chromium_src-f9905327d7243185ccde9f06a8a1f3e19c184b9e.zip chromium_src-f9905327d7243185ccde9f06a8a1f3e19c184b9e.tar.gz chromium_src-f9905327d7243185ccde9f06a8a1f3e19c184b9e.tar.bz2 | |
Re-land: Use a common font baseline in RenderText classes.
This ensures the text in different runs gets aligned
along a common bottom baseline and that the correct
font's baseline gets used in case of font fallback.
Original CL: http://codereview.chromium.org/9968040/
BUG=105550
TEST=none
TBR=msw
Review URL: https://chromiumcodereview.appspot.com/9982001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@130618 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gfx/render_text_win.h')
| -rw-r--r-- | ui/gfx/render_text_win.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ui/gfx/render_text_win.h b/ui/gfx/render_text_win.h index d85e9ef..d79c877 100644 --- a/ui/gfx/render_text_win.h +++ b/ui/gfx/render_text_win.h @@ -121,6 +121,10 @@ class RenderTextWin : public RenderText { std::vector<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_; + scoped_array<int> visual_to_logical_; scoped_array<int> logical_to_visual_; |