content/test/content_test_suite.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/test/content_test_suite.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: remove redundant lock. make content_unittests run 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

« content/browser/renderer_host/render_process_host_impl.cc ('K') | « content/common/child_process_messages.h ('k') | ui/ozone/common/stub_client_native_pixmap_factory.cc » ('j') | ui/ozone/platform/drm/ozone_platform_gbm.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/test/content_test_suite.cc

diff --git a/content/test/content_test_suite.cc b/content/test/content_test_suite.cc

index aaf664890c4a65a79188b6c3fae9fe49847fa6c1..5ec0e2daaaaf3ba95346f19d50b76410e59f052e 100644

--- a/content/test/content_test_suite.cc

+++ b/content/test/content_test_suite.cc

@@ -37,6 +37,7 @@

#if defined(USE_OZONE)

#include "ui/ozone/public/client_native_pixmap_factory.h"

+#include "ui/ozone/public/ozone_platform.h"

#endif

namespace content {

@@ -115,6 +116,10 @@ void ContentTestSuite::Initialize() {

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

ui::ClientNativePixmapFactory::SetInstance(

client_native_pixmap_factory_.get());

+ ui::ClientNativePixmapFactory::GetInstance()->Initialize(

+ ui::OzonePlatform::GetInstance()

+ ->OpenClientNativePixmapDevice()

+ .Pass());

dcheng 2015/08/31 17:40:53 Pass() here should also be unnecessary.

dshwang 2015/08/31 18:12:29 Done.

}

#endif

}