Index: content/renderer/renderer_main_platform_delegate_win.cc |
diff --git a/content/renderer/renderer_main_platform_delegate_win.cc b/content/renderer/renderer_main_platform_delegate_win.cc |
index 67a563dd4578e5750a6b1c0da42066a3a3822dde..b7de8fa4991652e21b51f9d9116555c5526766d0 100644 |
--- a/content/renderer/renderer_main_platform_delegate_win.cc |
+++ b/content/renderer/renderer_main_platform_delegate_win.cc |
@@ -9,7 +9,9 @@ |
#include "base/memory/scoped_ptr.h" |
#include "content/common/injection_test_dll.h" |
#include "content/public/common/content_switches.h" |
+#include "content/public/renderer/render_thread.h" |
#include "sandbox/src/sandbox.h" |
+#include "skia/ext/skia_sandbox_support_win.h" |
#include "unicode/timezone.h" |
namespace { |
@@ -59,6 +61,14 @@ void EnableThemeSupportForRenderer(bool no_sandbox) { |
} |
} |
+// Windows-only skia sandbox support |
+void SkiaPreCacheFont(LOGFONT logfont) { |
+ content::RenderThread* render_thread = content::RenderThread::Get(); |
+ if (render_thread) { |
+ render_thread->PreCacheFont(logfont); |
+ } |
+} |
+ |
} // namespace |
RendererMainPlatformDelegate::RendererMainPlatformDelegate( |
@@ -85,6 +95,7 @@ void RendererMainPlatformDelegate::PlatformInitialize() { |
// cached and there's no more need to access the registry. If the sandbox |
// is disabled, we don't have to make this dummy call. |
scoped_ptr<icu::TimeZone> zone(icu::TimeZone::createDefault()); |
+ SetSkiaEnsureTypefaceAccessible(SkiaPreCacheFont); |
} |
} |