diff options
| author | reed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-09 12:54:52 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-09 12:54:52 +0000 |
| commit | 65df010baf6b520699cd44e4396c72d0d5e56538 (patch) | |
| tree | 8bb9d6d6ae7248b9010d982d008348836956140c /skia | |
| parent | 11e10eed516205828cbb6c554675d37eae6e515a (diff) | |
| download | chromium_src-65df010baf6b520699cd44e4396c72d0d5e56538.zip chromium_src-65df010baf6b520699cd44e4396c72d0d5e56538.tar.gz chromium_src-65df010baf6b520699cd44e4396c72d0d5e56538.tar.bz2 | |
roll skia to 2633
Review URL: http://codereview.chromium.org/8499024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109227 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
| -rw-r--r-- | skia/ext/SkFontHost_fontconfig.cpp | 8 | ||||
| -rw-r--r-- | skia/skia.gyp | 1 |
2 files changed, 1 insertions, 8 deletions
diff --git a/skia/ext/SkFontHost_fontconfig.cpp b/skia/ext/SkFontHost_fontconfig.cpp index 5d50eb7..82f69dd 100644 --- a/skia/ext/SkFontHost_fontconfig.cpp +++ b/skia/ext/SkFontHost_fontconfig.cpp @@ -326,14 +326,6 @@ SkStream* SkFontHost::OpenStream(uint32_t id) return SkNEW_ARGS(SkFileDescriptorStream, (fd)); } -size_t SkFontHost::ShouldPurgeFontCache(size_t sizeAllocatedSoFar) -{ - if (sizeAllocatedSoFar > kFontCacheMemoryBudget) - return sizeAllocatedSoFar - kFontCacheMemoryBudget; - else - return 0; // nothing to do -} - // static size_t SkFontHost::GetFileName(SkFontID fontID, char path[], size_t length, int32_t* index) { diff --git a/skia/skia.gyp b/skia/skia.gyp index 9478729..409118a 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -728,6 +728,7 @@ 'GR_AGGRESSIVE_SHADER_OPTS=1', 'SK_DISABLE_FAST_AA_STROKE_RECT', 'SK_IGNORE_CF_OPTIMIZATION', + 'SK_DEFAULT_FONT_CACHE_LIMIT=(16*1024*1024)', ], 'sources!': [ '../third_party/skia/include/core/SkTypes.h', |