diff options
| author | Steve Block <steveblock@google.com> | 2011-05-19 14:17:46 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-05-25 15:27:45 +0100 |
| commit | 22864c0fcfca794950482bfa8a79f37da16f509d (patch) | |
| tree | c53d4031e5525d502dfc9439304730d128873123 /Source/WebCore/platform/graphics | |
| parent | 741305eba09a1f6a5258684e97bf20c883329829 (diff) | |
| download | external_webkit-22864c0fcfca794950482bfa8a79f37da16f509d.zip external_webkit-22864c0fcfca794950482bfa8a79f37da16f509d.tar.gz external_webkit-22864c0fcfca794950482bfa8a79f37da16f509d.tar.bz2 | |
Merge WebKit at r78450: TextRun::padding() renamed
See http://trac.webkit.org/changeset/76743
Change-Id: Ia9f39b83ea6e9a97e271f5545c3cc36ed5c65800
Diffstat (limited to 'Source/WebCore/platform/graphics')
| -rw-r--r-- | Source/WebCore/platform/graphics/android/FontAndroid.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebCore/platform/graphics/android/FontAndroid.cpp b/Source/WebCore/platform/graphics/android/FontAndroid.cpp index 7fcad73..e4e96f9 100644 --- a/Source/WebCore/platform/graphics/android/FontAndroid.cpp +++ b/Source/WebCore/platform/graphics/android/FontAndroid.cpp @@ -918,7 +918,7 @@ void Font::drawComplexText(GraphicsContext* gc, TextRun const& run, bool haveMultipleLayers = isCanvasMultiLayered(canvas); TextRunWalker walker(run, point.x(), this); walker.setWordAndLetterSpacing(wordSpacing(), letterSpacing()); - walker.setPadding(run.padding()); + walker.setPadding(run.expansion()); while (walker.nextScriptRun()) { if (fill) { |