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

« content/common/gpu/client_native_pixmap_manager_ozone_messages.h ('K') | « content/test/content_test_suite.h ('k') | content/test/test_client_native_pixmap_manager_ozone.h » ('j') | no next file with comments »
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 ca9b7480668952b2d6f756aff2ca6bf867dabb1d..581234c62ade22de0987d11fab5925aadaa4c91c 100644

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

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

@@ -36,7 +36,7 @@

#endif

#if defined(USE_OZONE)

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

+#include "content/test/test_client_native_pixmap_manager_ozone.h"

#endif

namespace content {

@@ -112,9 +112,8 @@ void ContentTestSuite::Initialize() {

#endif

#if defined(USE_OZONE)

if (!is_child_process) {

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

ui::ClientNativePixmapManager::SetInstance(

- client_native_pixmap_manager_.get());

+ TestClientNativePixmapManager::GetInstance());

}

#endif

}