ozone: Introduce ClientPixmap and ClientPixmapFactory for non-GPU processes.

content/app/content_main_runner.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/public/app/content_main_runner.h"
 
 #include <stdlib.h>
 
 #include "base/allocator/allocator_extension.h"
 #include "base/at_exit.h"
@@ skipping 92 matching lines @@
 #if !defined(OS_MACOSX)
 #include "content/public/common/content_descriptors.h"
 #include "content/public/common/zygote_fork_delegate_linux.h"
 #endif
 #if !defined(OS_MACOSX) && !defined(OS_ANDROID)
 #include "content/zygote/zygote_main.h"
 #endif
 
 #endif  // OS_POSIX
 
+#if defined(USE_OZONE)
+#include "ui/ozone/public/native_pixmap_manager.h"
+#endif
+
 #if !defined(OS_MACOSX) && defined(USE_TCMALLOC)
 extern "C" {
 int tc_set_new_mode(int mode);
 }
 #endif
 
 namespace content {
 extern int GpuMain(const content::MainFunctionParams&);
 #if defined(ENABLE_PLUGINS)
 #if !defined(OS_LINUX)
@@ skipping 553 matching lines @@
       if (service_port.is_valid()) {
         ChildIOSurfaceManager::GetInstance()->set_service_port(
             service_port.release());
         IOSurfaceManager::SetInstance(ChildIOSurfaceManager::GetInstance());
       }
     }
 #elif defined(OS_WIN)
     SetupCRT(command_line);
 #endif
 
+#if defined(USE_OZONE)
+    if (!ui::NativePixmapManager::GetInstance() &&

[reveman, 2015/07/23 18:25:23]

why the GetInstance check?

[dshwang, 2015/07/24 12:19:00]

I assumed that this routine can be called several times with --single-process. I
was wrong, so I remove GetInstance check.

+        process_type == switches::kRendererProcess) {
+      ui::NativePixmapManager::SetInstance(
+          ui::NativePixmapManager::Create().release());

[reveman, 2015/07/23 18:25:23]

Please don't leak the manager. At least use a
base::LazyInstance<scoped_ptr<ui::NativePixmapManager>> if there's no
appropriate owner of this instance.

[dshwang, 2015/07/24 12:19:00]

Done. use member.

+    }
+#endif
+
 #if defined(OS_POSIX)
     if (!process_type.empty()) {
       // When you hit Ctrl-C in a terminal running the browser
       // process, a SIGINT is delivered to the entire process group.
       // When debugging the browser process via gdb, gdb catches the
       // SIGINT for the browser process (and dumps you back to the gdb
       // console) but doesn't for the child processes, killing them.
       // The fix is to have child processes ignore SIGINT; they'll die
       // on their own when the browser process goes away.
       //
@@ skipping 172 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(ContentMainRunnerImpl);
 };
 
 // static
 ContentMainRunner* ContentMainRunner::Create() {
   return new ContentMainRunnerImpl();
 }
 
 }  // namespace content