Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1870)

Unified Diff: content/renderer/renderer_main_platform_delegate_win.cc

Issue 11363008: Fix for 128506: Random Chinese/Japanese characters are missing in documents printed via the syst... (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/renderer_main_platform_delegate_win.cc
===================================================================
--- content/renderer/renderer_main_platform_delegate_win.cc (revision 158204)
+++ content/renderer/renderer_main_platform_delegate_win.cc (working copy)
@@ -5,6 +5,7 @@
#include "content/renderer/renderer_main_platform_delegate.h"
#include <signal.h>
+#include <string>
#include "base/command_line.h"
#include "base/logging.h"
@@ -13,6 +14,7 @@
#include "content/public/common/content_switches.h"
#include "content/public/common/injection_test_win.h"
#include "content/public/renderer/render_thread.h"
+#include "content/renderer/render_thread_impl.h"
#include "sandbox/win/src/sandbox.h"
#include "skia/ext/skia_sandbox_support_win.h"
#include "unicode/timezone.h"
@@ -27,6 +29,17 @@
}
}
+// Windows-only skia sandbox support
+void SkiaPreCacheFontCharacters(const LOGFONT& logfont,
+ const wchar_t* text,
+ unsigned int text_length) {
+ RenderThreadImpl* render_thread_impl = RenderThreadImpl::current();
+ if (render_thread_impl) {
+ render_thread_impl->PreCacheFontCharacters(logfont,
+ std::wstring(text, text_length));
+ }
+}
+
void __cdecl ForceCrashOnSigAbort(int) {
*((int*)0) = 0x1337;
}
@@ -77,6 +90,7 @@
// is disabled, we don't have to make this dummy call.
scoped_ptr<icu::TimeZone> zone(icu::TimeZone::createDefault());
SetSkiaEnsureTypefaceAccessible(SkiaPreCacheFont);
+ SetSkiaEnsureTypefaceCharactersAccessible(SkiaPreCacheFontCharacters);
}
}

Powered by Google App Engine
This is Rietveld 408576698