diff options
| author | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-08 08:25:24 +0000 |
|---|---|---|
| committer | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-08 08:27:14 +0000 |
| commit | c44272063736691732f2997b4564d5583cc17dc0 (patch) | |
| tree | d6e3748c16e308ebd764e3ab86e445b72d420076 /ui/gfx/render_text_harfbuzz.h | |
| parent | c9e3b2030e2e615111e341ac9149fe329b005da3 (diff) | |
| download | chromium_src-c44272063736691732f2997b4564d5583cc17dc0.zip chromium_src-c44272063736691732f2997b4564d5583cc17dc0.tar.gz chromium_src-c44272063736691732f2997b4564d5583cc17dc0.tar.bz2 | |
Support float widths in RenderTextHarfBuzz.
The gfx_unittests CanvasTestMac.* passes on Mac Views.
(can also run the tests with --enable-harfbuzz-rendertext)
BUG=391843
TEST=CanvasTestMac.* passes, no Mac text rendering changes.
R=asvitkine@chromium.org,ckocagil@chromium.org
Review URL: https://codereview.chromium.org/440213004
Cr-Commit-Position: refs/heads/master@{#288255}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@288255 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gfx/render_text_harfbuzz.h')
| -rw-r--r-- | ui/gfx/render_text_harfbuzz.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ui/gfx/render_text_harfbuzz.h b/ui/gfx/render_text_harfbuzz.h index b028a37a..e84ca48 100644 --- a/ui/gfx/render_text_harfbuzz.h +++ b/ui/gfx/render_text_harfbuzz.h @@ -48,8 +48,8 @@ struct GFX_EXPORT TextRunHarfBuzz { // Returns whether the given shaped run contains any missing glyphs. bool HasMissingGlyphs() const; - int width; - int preceding_run_widths; + float width; + float preceding_run_widths; Range range; bool is_rtl; UBiDiLevel level; @@ -80,6 +80,7 @@ class GFX_EXPORT RenderTextHarfBuzz : public RenderText { // Overridden from RenderText. virtual Size GetStringSize() OVERRIDE; + virtual SizeF GetStringSizeF() OVERRIDE; virtual SelectionModel FindCursorPosition(const Point& point) OVERRIDE; virtual std::vector<FontSpan> GetFontSpansForTesting() OVERRIDE; virtual Range GetGlyphBounds(size_t index) OVERRIDE; |