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

Unified Diff: content/browser/browser_main_loop.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: fix extensions_unittests Created 5 years, 4 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 | « content/browser/browser_main_loop.h ('k') | content/browser/renderer_host/render_process_host_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/browser_main_loop.cc
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
index 0e38b9ceae3e5dcd100b66964411ab3b9868b504..70f474c20e7539253785f4ced44e0715d791e8bf 100644
--- a/content/browser/browser_main_loop.cc
+++ b/content/browser/browser_main_loop.cc
@@ -108,6 +108,10 @@
#include "content/browser/theme_helper_mac.h"
#endif
+#if defined(USE_OZONE)
+#include "ui/ozone/public/client_native_pixmap_factory.h"
+#endif
+
#if defined(OS_WIN)
#include <windows.h>
#include <commctrl.h>
@@ -614,6 +618,12 @@ void BrowserMainLoop::PostMainMessageLoopStart() {
}
#endif
+#if defined(USE_OZONE)
+ client_native_pixmap_factory_ = ui::ClientNativePixmapFactory::Create();
+ ui::ClientNativePixmapFactory::SetInstance(
+ client_native_pixmap_factory_.get());
+#endif
+
if (parsed_command_line_.HasSwitch(switches::kMemoryMetrics)) {
TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:MemoryObserver");
memory_observer_.reset(new MemoryObserver());
« no previous file with comments | « content/browser/browser_main_loop.h ('k') | content/browser/renderer_host/render_process_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698