diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-27 14:59:05 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-27 14:59:05 +0000 |
| commit | bb91ce763726b984aa69bb1dc3a8eec359753b3b (patch) | |
| tree | ea25a0160d21a73dd41ed0894f01a20abc5ab15f /skia/ext/SkFontHost_fontconfig_ipc.h | |
| parent | 86b19e614383f1e1779d85da639cc6af3d67ac25 (diff) | |
| download | chromium_src-bb91ce763726b984aa69bb1dc3a8eec359753b3b.zip chromium_src-bb91ce763726b984aa69bb1dc3a8eec359753b3b.tar.gz chromium_src-bb91ce763726b984aa69bb1dc3a8eec359753b3b.tar.bz2 | |
Skia roll 536:560
This also includes Evan's patch: http://codereview.chromium.org/1611033
This roll sits after a revert to Skia's hairline change so,
hopefully, doesn't need any rebaselines. The try servers mostly agree
although there's one (clip-path-text-and-shape.svg on Windows) that I
need to keep on eye on. (That's why I'm landing this before MTV is
active.)
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45696 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia/ext/SkFontHost_fontconfig_ipc.h')
| -rw-r--r-- | skia/ext/SkFontHost_fontconfig_ipc.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/skia/ext/SkFontHost_fontconfig_ipc.h b/skia/ext/SkFontHost_fontconfig_ipc.h index 30a32e1..6f0c052 100644 --- a/skia/ext/SkFontHost_fontconfig_ipc.h +++ b/skia/ext/SkFontHost_fontconfig_ipc.h @@ -33,7 +33,9 @@ class FontConfigIPC : public FontConfigInterface { // FontConfigInterface implementation. virtual bool Match(std::string* result_family, unsigned* result_fileid, bool fileid_valid, unsigned fileid, - const std::string& family, bool* is_bold, bool* is_italic); + const std::string& family, + const void* characters, size_t characters_bytes, + bool* is_bold, bool* is_italic); virtual int Open(unsigned fileid); enum Method { |