diff options
| author | reed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-12 13:11:54 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-12 13:11:54 +0000 |
| commit | 9628e0d1b18acb3ef20752bfa19737338d26346c (patch) | |
| tree | 351c06ac28c8e89f99825fa0ef82250b36bd006f /content/zygote | |
| parent | 0b57b3ae0fcffa1f1734c19b92c1b3c8ecb3a4c7 (diff) | |
| download | chromium_src-9628e0d1b18acb3ef20752bfa19737338d26346c.zip chromium_src-9628e0d1b18acb3ef20752bfa19737338d26346c.tar.gz chromium_src-9628e0d1b18acb3ef20752bfa19737338d26346c.tar.bz2 | |
re-land 187283 -- switch to skia's version of SkFontHost_fontconfig
add suppressions.txt to account for global typeface cache
Review URL: https://codereview.chromium.org/12764009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@187572 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/zygote')
| -rw-r--r-- | content/zygote/zygote_main_linux.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/content/zygote/zygote_main_linux.cc b/content/zygote/zygote_main_linux.cc index 4ef3eefc..fd4a709 100644 --- a/content/zygote/zygote_main_linux.cc +++ b/content/zygote/zygote_main_linux.cc @@ -37,8 +37,8 @@ #include "crypto/nss_util.h" #include "sandbox/linux/services/libc_urandom_override.h" #include "sandbox/linux/suid/client/setuid_sandbox_client.h" -#include "skia/ext/SkFontHost_fontconfig_control.h" #include "third_party/icu/public/i18n/unicode/timezone.h" +#include "third_party/skia/include/ports/SkFontConfigInterface.h" #if defined(OS_LINUX) #include <sys/epoll.h> @@ -368,8 +368,8 @@ static bool EnterSandbox(sandbox::SetuidSandboxClient* setuid_sandbox, return false; PreSandboxInit(); - SkiaFontConfigSetImplementation( - new FontConfigIPC(Zygote::kMagicSandboxIPCDescriptor)); + SkFontConfigInterface::SetGlobal( + new FontConfigIPC(Zygote::kMagicSandboxIPCDescriptor))->unref(); if (setuid_sandbox->IsSuidSandboxChild()) { // Use the SUID sandbox. This still allows the seccomp sandbox to @@ -438,8 +438,8 @@ static bool EnterSandbox(sandbox::SetuidSandboxClient* setuid_sandbox, return false; PreSandboxInit(); - SkiaFontConfigSetImplementation( - new FontConfigIPC(Zygote::kMagicSandboxIPCDescriptor)); + SkFontConfigInterface::SetGlobal( + new FontConfigIPC(Zygote::kMagicSandboxIPCDescriptor)))->unref(); return true; } |