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: fix base::ThreadRestrictions::AssertWaitAllowed crash 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

« base/threading/thread_restrictions.h ('K') | « base/threading/thread_restrictions.h ('k') | content/browser/renderer_host/render_process_host_impl.cc » ('j') | content/browser/renderer_host/render_process_host_impl.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 b5159df02a3e91b640f71dc37d0e5e82f77e634a..ef44f3aec3cb3aa4edcca73783196d7680011049 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,9 @@ void BrowserMainLoop::PostMainMessageLoopStart() {

client_native_pixmap_factory_ = ui::ClientNativePixmapFactory::Create();

ui::ClientNativePixmapFactory::SetInstance(

client_native_pixmap_factory_.get());

+ auto scoped_fd =

dcheng 2015/08/21 14:44:06 Use the full typename rather than auto (ScopedFD i

dshwang 2015/08/21 18:38:37 Done.

+ ui::OzonePlatform::GetInstance()->OpenClientNativePixmapDevice();

+ ui::ClientNativePixmapFactory::GetInstance()->Initialize(scoped_fd.Pass());

#endif

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