Fix for 128506: Random Chinese/Japanese characters are missing in documents printed via the syst...

content/renderer/renderer_main_platform_delegate_win.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/renderer_main_platform_delegate.h"
 
 #include <signal.h>
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/string16.h"
 #include "base/win/win_util.h"
 #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 "skia/ext/vector_platform_device_emf_win.h"
 #include "unicode/timezone.h"
 
 namespace content {
 namespace {
 
 // Windows-only skia sandbox support
 void SkiaPreCacheFont(const LOGFONT& logfont) {
   RenderThread* render_thread = RenderThread::Get();
   if (render_thread) {
     render_thread->PreCacheFont(logfont);
   }
 }
 
+void SkiaPreCacheFontCharacters(const LOGFONT& logfont,
+                                const wchar_t* text,
+                                unsigned int text_length) {
+  content::RenderThreadImpl* render_thread_impl =
+      content::RenderThreadImpl::current();
+  if (render_thread_impl) {
+    render_thread_impl->PreCacheFontCharacters(logfont,
+                                               string16(text, text_length));
+  }
+}
+
 void __cdecl ForceCrashOnSigAbort(int) {
   *((int*)0) = 0x1337;
 }
 
 void InitExitInterceptions() {
   // If code subsequently tries to exit using exit(), _exit(), abort(), or
   // ExitProcess(), force a crash (since otherwise these would be silent
   // terminations and fly under the radar).
   base::win::SetShouldCrashOnProcessDetach(true);
 
@@ skipping 30 matching lines @@
 
   if (!no_sandbox) {
     // ICU DateFormat class (used in base/time_format.cc) needs to get the
     // Olson timezone ID by accessing the registry keys under
     // HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones.
     // After TimeZone::createDefault is called once here, the timezone ID is
     // 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);
+    skia::SetSkiaEnsureTypefaceCharactersAccessible(
+        SkiaPreCacheFontCharacters);
   }
 }
 
 void RendererMainPlatformDelegate::PlatformUninitialize() {
   // At this point we are shutting down in a normal code path, so undo our
   // hack to crash on exit.
   base::win::SetShouldCrashOnProcessDetach(false);
 }
 
 bool RendererMainPlatformDelegate::InitSandboxTests(bool no_sandbox) {
@@ skipping 45 matching lines @@
     if (run_security_tests) {
       int test_count = 0;
       DVLOG(1) << "Running renderer security tests";
       BOOL result = run_security_tests(&test_count);
       CHECK(result) << "Test number " << test_count << " has failed.";
     }
   }
 }
 
 }  // namespace content