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

Unified Diff: content/app/content_main_runner.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/app/content_main_runner.cc
diff --git a/content/app/content_main_runner.cc b/content/app/content_main_runner.cc
index 56808efff8fca83a2764dd9cc62e7168b25fa477..df069e87e07a6c77125fe6af3f16f93918126926 100644
--- a/content/app/content_main_runner.cc
+++ b/content/app/content_main_runner.cc
@@ -110,10 +110,6 @@
#endif // OS_POSIX
-#if defined(USE_OZONE)
-#include "ui/ozone/public/client_native_pixmap_factory.h"
-#endif
-
#if !defined(OS_MACOSX) && defined(USE_TCMALLOC)
extern "C" {
int tc_set_new_mode(int mode);
@@ -670,14 +666,6 @@ class ContentMainRunnerImpl : public ContentMainRunner {
SetupCRT(command_line);
#endif
-#if defined(USE_OZONE)
- if (process_type == switches::kRendererProcess) {
- client_native_pixmap_factory_ = ui::ClientNativePixmapFactory::Create();
- ui::ClientNativePixmapFactory::SetInstance(
- client_native_pixmap_factory_.get());
- }
-#endif
-
#if defined(OS_POSIX)
if (!process_type.empty()) {
// When you hit Ctrl-C in a terminal running the browser
@@ -858,9 +846,6 @@ class ContentMainRunnerImpl : public ContentMainRunner {
#elif defined(OS_MACOSX)
scoped_ptr<base::mac::ScopedNSAutoreleasePool> autorelease_pool_;
#endif
-#if defined(USE_OZONE)
- scoped_ptr<ui::ClientNativePixmapFactory> client_native_pixmap_factory_;
-#endif
base::Closure* ui_task_;
« no previous file with comments | « no previous file | content/browser/BUILD.gn » ('j') | content/browser/gpu/browser_client_native_pixmap_factory_ozone.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698