From 65df010baf6b520699cd44e4396c72d0d5e56538 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Wed, 9 Nov 2011 12:54:52 +0000 Subject: 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 --- DEPS | 2 +- skia/ext/SkFontHost_fontconfig.cpp | 8 -------- skia/skia.gyp | 1 + 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/DEPS b/DEPS index dd6084b..027b8a9 100644 --- a/DEPS +++ b/DEPS @@ -28,7 +28,7 @@ vars = { "libvpx_revision": "107145", "ffmpeg_revision": "108357", "sfntly_revision": "98", - "skia_revision": "2620", + "skia_revision": "2633", "v8_revision": "9897", "webrtc_revision": "883", "jsoncpp_revision": "246", 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', -- cgit v1.1