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

Unified Diff: content/app/content_main_runner.cc

Issue 1128113011: ozone: Introduce ClientPixmap and ClientPixmapFactory for non-GPU processes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove ChildNativePixmapManager or BrowserNativePixmapManager Created 5 years, 5 months 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
« no previous file with comments | « no previous file | content/browser/browser_main_loop.cc » ('j') | content/browser/browser_main_loop.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/app/content_main_runner.cc
diff --git a/content/app/content_main_runner.cc b/content/app/content_main_runner.cc
index 2906e77f0d2d805215b63bd2a352c525cf788f65..659dc972a73402eff5d69aa67f052f4dbed891dd 100644
--- a/content/app/content_main_runner.cc
+++ b/content/app/content_main_runner.cc
@@ -110,6 +110,10 @@
#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);
@@ -683,6 +687,13 @@ class ContentMainRunnerImpl : public ContentMainRunner {
SetupCRT(command_line);
#endif
+#if defined(USE_OZONE)
+ if (!ui::NativePixmapManager::GetInstance() &&
+ process_type == switches::kRendererProcess) {
+ ui::NativePixmapManager::SetInstance(ui::NativePixmapManager::Create());
+ }
+#endif
+
#if defined(OS_POSIX)
if (!process_type.empty()) {
// When you hit Ctrl-C in a terminal running the browser
« no previous file with comments | « no previous file | content/browser/browser_main_loop.cc » ('j') | content/browser/browser_main_loop.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698