content/browser/browser_main_loop.cc - Issue 1248713002: ozone: ClientPixmapManager passes VGEM fd from browser to renderer.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: rebase to latest crrev.com/1128113011 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 | « content/browser/browser_main_loop.h ('k') | content/browser/gpu/browser_client_native_pixmap_manager_ozone.h » ('j') | content/browser/gpu/browser_client_native_pixmap_manager_ozone.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | 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 d8e4778ab3723e32a83a775264fcedc42b1ed62b..00489ef36c9f9122e294a2543ab52c992078cbb0 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_manager.h"

+#include "content/browser/gpu/browser_client_native_pixmap_manager_ozone.h"

#endif

#if defined(OS_WIN)

@@ -619,9 +619,8 @@ void BrowserMainLoop::PostMainMessageLoopStart() {

#endif

#if defined(USE_OZONE)

- client_native_pixmap_manager_ = ui::ClientNativePixmapManager::Create();

ui::ClientNativePixmapManager::SetInstance(

- client_native_pixmap_manager_.get());

+ BrowserClientNativePixmapManager::GetInstance());

#endif

if (parsed_command_line_.HasSwitch(switches::kMemoryMetrics)) {