content/renderer/render_thread_impl.cc - Issue 2194003002: services/ui: Have an explicit lifetime/ownership of ui::GpuService.

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/renderer/render_thread_impl.cc

Issue 2194003002: services/ui: Have an explicit lifetime/ownership of ui::GpuService. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: tot merge Created 4 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

Index: content/renderer/render_thread_impl.cc

diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc

index 72ef9b8ad16ae97cde8ee2164c2a27a476f07c47..830fd3d6b5dbcd012547f6644cd421341f598182 100644

--- a/content/renderer/render_thread_impl.cc

+++ b/content/renderer/render_thread_impl.cc

@@ -644,7 +644,8 @@ void RenderThreadImpl::Init(

#if defined(USE_AURA)

if (IsRunningInMash())

- ui::GpuService::Initialize(GetMojoShellConnection()->GetConnector());

+ gpu_service_ =

+ ui::GpuService::Initialize(GetMojoShellConnection()->GetConnector());

#endif

InitializeWebKit(resource_task_queue);

@@ -1803,7 +1804,7 @@ scoped_refptr<gpu::GpuChannelHost> RenderThreadImpl::EstablishGpuChannelSync() {

gpu_memory_buffer_manager());

} else {

#if defined(USE_AURA)

- gpu_channel_ = ui::GpuService::GetInstance()->EstablishGpuChannelSync();

+ gpu_channel_ = gpu_service_->EstablishGpuChannelSync();

#else

NOTREACHED();

#endif

« no previous file with comments | « content/renderer/render_thread_impl.h ('k') | services/ui/common/gpu_service.h » ('j') | no next file with comments »