Implement skia sandbox callback

content/renderer/renderer_main_platform_delegate_win.cc

 // Copyright (c) 2011 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 "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/common/injection_test_dll.h"
 #include "content/public/common/content_switches.h"
 #include "sandbox/src/sandbox.h"
 #include "unicode/timezone.h"
 
+#if defined (USE_SKIA)

[vandebo (ex-Chrome), 2011/11/22 01:15:08]

nit: defined(USE_SKIA)

[arthurhsu, 2011/11/22 18:10:47]

Done.

+#include "content/public/renderer/render_thread.h"
+#include "skia/ext/skia_sandbox_support_win.h"
+#endif
+
 namespace {
 
 // In order to have Theme support, we need to connect to the theme service.
 // This needs to be done before we lock down the renderer. Officially this
 // can be done with OpenThemeData() but it fails unless you pass a valid
 // window at least the first time. Interestingly, the very act of creating a
 // window also sets the connection to the theme service.
 void EnableThemeSupportForRenderer(bool no_sandbox) {
   HWINSTA current = NULL;
   HWINSTA winsta0 = NULL;
@@ skipping 27 matching lines @@
 
     if (!::CloseWindowStation(winsta0)) {
       // We might be leaking a winsta0 handle.  This is a security risk, but
       // since we allow fail over to no desktop protection in low memory
       // condition, this is not a big risk.
       NOTREACHED();
     }
   }
 }
 
+// Windows-only skia sandbox support
+#if defined (USE_SKIA)
+void skia_ensure_font_load(LOGFONT logfont) {

[vandebo (ex-Chrome), 2011/11/22 01:15:08]

nit: match one of the names, i.e. either skia_pre_cache_font or
skia_ensure_typeface_accessible

[jam, 2011/11/22 01:21:23]

chrome style is CamelCase

[arthurhsu, 2011/11/22 18:10:47]

Done.

[arthurhsu, 2011/11/22 18:10:47]

Done.

+  content::RenderThread* render_thread = content::RenderThread::Get();
+  if (render_thread) {
+    render_thread->PreCacheFont(logfont);
+  }
+}
+#endif
+
 }  // namespace
 
 RendererMainPlatformDelegate::RendererMainPlatformDelegate(
     const content::MainFunctionParams& parameters)
         : parameters_(parameters),
           sandbox_test_module_(NULL) {
 }
 
 RendererMainPlatformDelegate::~RendererMainPlatformDelegate() {
 }
 
 void RendererMainPlatformDelegate::PlatformInitialize() {
   // Be mindful of what resources you acquire here. They can be used by
   // malicious code if the renderer gets compromised.
   const CommandLine& command_line = parameters_.command_line;
   bool no_sandbox = command_line.HasSwitch(switches::kNoSandbox);
   EnableThemeSupportForRenderer(no_sandbox);
 
   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());
+    if (!g_skia_sandbox_support) {
+      g_skia_sandbox_support = skia_ensure_font_load;

[jam, 2011/11/22 01:21:23]

this won't work in the component build. you'd need a function in the skia code
that's exported from skia to set this

[arthurhsu, 2011/11/22 18:10:47]

Done.

+    }
   }
 }
 
 void RendererMainPlatformDelegate::PlatformUninitialize() {
 }
 
 bool RendererMainPlatformDelegate::InitSandboxTests(bool no_sandbox) {
   const CommandLine& command_line = parameters_.command_line;
 
   DVLOG(1) << "Started renderer with " << command_line.GetCommandLineString();
@@ skipping 40 matching lines @@
                                                           kRenderTestCall));
     DCHECK(run_security_tests);
     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.";
     }
   }
 }