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

Unified Diff: content/browser/browser_main_loop.cc

Issue 1248713002: ozone: ClientPixmapManager passes VGEM fd from browser to renderer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove redundant Pass() 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 | « no previous file | 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 b5159df02a3e91b640f71dc37d0e5e82f77e634a..b7a5ad7fc466f47a8aae3984b28f794fdfb2bbfb 100644
--- a/content/browser/browser_main_loop.cc
+++ b/content/browser/browser_main_loop.cc
@@ -111,6 +111,7 @@
#if defined(USE_OZONE)
#include "ui/ozone/public/client_native_pixmap_factory.h"
+#include "ui/ozone/public/ozone_platform.h"
#endif
#if defined(OS_WIN)
@@ -621,6 +622,8 @@ void BrowserMainLoop::PostMainMessageLoopStart() {
client_native_pixmap_factory_ = ui::ClientNativePixmapFactory::Create();
ui::ClientNativePixmapFactory::SetInstance(
client_native_pixmap_factory_.get());
+ ui::ClientNativePixmapFactory::GetInstance()->Initialize(
+ ui::OzonePlatform::GetInstance()->OpenClientNativePixmapDevice());
#endif
if (parsed_command_line_.HasSwitch(switches::kMemoryMetrics)) {
« no previous file with comments | « no previous file | content/browser/renderer_host/render_process_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698