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 lastest 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

Index: content/browser/browser_main_loop.cc

diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc

index 69a7cce4ed609681d467aece191debc0396f8fca..581d203dcc447f2e1f7d5b74cefec63646ba826d 100644

--- a/content/browser/browser_main_loop.cc

+++ b/content/browser/browser_main_loop.cc

@@ -108,7 +108,7 @@

#endif

#if defined(USE_OZONE)

-#include "ui/ozone/public/native_pixmap_manager.h"

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

#endif

#if defined(OS_WIN)

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

#if defined(USE_OZONE)

DCHECK(!ui::NativePixmapManager::GetInstance());

- ui::NativePixmapManager::SetInstance(ui::NativePixmapManager::Create());

+ ui::NativePixmapManager::SetInstance(

+ BrowserNativePixmapManager::GetInstance());

#endif

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

« no previous file with comments | « content/browser/BUILD.gn ('k') | content/browser/gpu/browser_native_pixmap_manager_ozone.h » ('j') | no next file with comments »