summaryrefslogtreecommitdiffstats
path: root/skia
diff options
context:
space:
mode:
authorreed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-13 17:46:16 +0000
committerreed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-13 17:46:16 +0000
commit6f64f31ce1633353c9b7ad8a538c415080b43f43 (patch)
tree475c14f7a414ee7e0d0c3eae225735dc953d17bf /skia
parent88008ce218639f10bc290f33eb01905c8a4c7976 (diff)
downloadchromium_src-6f64f31ce1633353c9b7ad8a538c415080b43f43.zip
chromium_src-6f64f31ce1633353c9b7ad8a538c415080b43f43.tar.gz
chromium_src-6f64f31ce1633353c9b7ad8a538c415080b43f43.tar.bz2
roll skia, along with API change to SkFontHost
Review URL: http://codereview.chromium.org/7003144 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@88843 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
-rw-r--r--skia/ext/SkFontHost_fontconfig.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/skia/ext/SkFontHost_fontconfig.cpp b/skia/ext/SkFontHost_fontconfig.cpp
index 688f3d0..5d50eb7 100644
--- a/skia/ext/SkFontHost_fontconfig.cpp
+++ b/skia/ext/SkFontHost_fontconfig.cpp
@@ -231,7 +231,7 @@ SkTypeface* SkFontHost::Deserialize(SkStream* stream) {
}
// static
-uint32_t SkFontHost::NextLogicalFont(SkFontID fontID) {
+uint32_t SkFontHost::NextLogicalFont(SkFontID curr, SkFontID orig) {
// We don't handle font fallback, WebKit does.
return 0;
}