| Index: content/renderer/renderer_main.cc
|
| diff --git a/content/renderer/renderer_main.cc b/content/renderer/renderer_main.cc
|
| index fe9ea2d50b6890be57d4dea5fc03506d6da1a5f9..2d82597ee48cf7142cfc54e85ed5c5cd6e8e08cb 100644
|
| --- a/content/renderer/renderer_main.cc
|
| +++ b/content/renderer/renderer_main.cc
|
| @@ -52,6 +52,10 @@
|
| #include "third_party/libjingle/overrides/init_webrtc.h"
|
| #endif
|
|
|
| +#if defined(USE_OZONE)
|
| +#include "ui/ozone/public/client_native_pixmap_factory.h"
|
| +#endif
|
| +
|
| namespace content {
|
| namespace {
|
| // This function provides some ways to test crash and assertion handling
|
| @@ -65,6 +69,11 @@ static void HandleRendererErrorTestParameters(
|
| ChildProcess::WaitForDebugger("Renderer");
|
| }
|
|
|
| +#if defined(USE_OZONE)
|
| +base::LazyInstance<scoped_ptr<ui::ClientNativePixmapFactory>> g_pixmap_factory =
|
| + LAZY_INSTANCE_INITIALIZER;
|
| +#endif
|
| +
|
| } // namespace
|
|
|
| // mainline routine for running as the Renderer process
|
| @@ -100,6 +109,11 @@ int RendererMain(const MainFunctionParams& parameters) {
|
| SkGraphics::SetFontCacheLimit(font_cache_limit);
|
| #endif
|
|
|
| +#if defined(USE_OZONE)
|
| + g_pixmap_factory.Get() = ui::ClientNativePixmapFactory::Create();
|
| + ui::ClientNativePixmapFactory::SetInstance(g_pixmap_factory.Get().get());
|
| +#endif
|
| +
|
| // This function allows pausing execution using the --renderer-startup-dialog
|
| // flag allowing us to attach a debugger.
|
| // Do not move this function down since that would mean we can't easily debug
|
|
|