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

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: rename to ClientNativePixmapFactory 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
Index: content/browser/browser_main_loop.cc
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
index 70f474c20e7539253785f4ced44e0715d791e8bf..a34941ff79dd0f4aaacffbc7f1f527aaa958b925 100644
--- a/content/browser/browser_main_loop.cc
+++ b/content/browser/browser_main_loop.cc
@@ -109,7 +109,7 @@
#endif
#if defined(USE_OZONE)
-#include "ui/ozone/public/client_native_pixmap_factory.h"
+#include "content/browser/gpu/browser_client_native_pixmap_factory_ozone.h"
#endif
#if defined(OS_WIN)
@@ -619,9 +619,8 @@ void BrowserMainLoop::PostMainMessageLoopStart() {
#endif
#if defined(USE_OZONE)
- client_native_pixmap_factory_ = ui::ClientNativePixmapFactory::Create();
ui::ClientNativePixmapFactory::SetInstance(
- client_native_pixmap_factory_.get());
+ BrowserClientNativePixmapFactory::GetInstance());
#endif
if (parsed_command_line_.HasSwitch(switches::kMemoryMetrics)) {

Powered by Google App Engine
This is Rietveld 408576698