content/browser/compositor/gpu_process_transport_factory.cc - Issue 1157793004: ozone: Add overlay candidate implementation that queries support via IPC

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/compositor/gpu_process_transport_factory.cc

Issue 1157793004: ozone: Add overlay candidate implementation that queries support via IPC (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix leak, other comments Created 5 years, 7 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

« no previous file with comments | « content/browser/compositor/browser_compositor_overlay_candidate_validator_ozone.cc ('k') | ui/gfx/overlay_transform.h » ('j') | ui/ozone/common/gpu/ozone_gpu_message_params.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/compositor/gpu_process_transport_factory.cc

diff --git a/content/browser/compositor/gpu_process_transport_factory.cc b/content/browser/compositor/gpu_process_transport_factory.cc

index ec1a28b16348086b7e0eb2e724a7121975286eca..5e48e1aa1f4a675be0f972de244ab6153ae5fea6 100644

--- a/content/browser/compositor/gpu_process_transport_factory.cc

+++ b/content/browser/compositor/gpu_process_transport_factory.cc

@@ -56,6 +56,7 @@

#elif defined(USE_OZONE)

#include "content/browser/compositor/browser_compositor_overlay_candidate_validator_ozone.h"

#include "content/browser/compositor/software_output_device_ozone.h"

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

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

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

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

@@ -161,7 +162,7 @@ GpuProcessTransportFactory::CreateSoftwareOutputDevice(

scoped_ptr<BrowserCompositorOverlayCandidateValidator>

CreateOverlayCandidateValidator(gfx::AcceleratedWidget widget) {

#if defined(USE_OZONE)

- ui::OverlayCandidatesOzone* overlay_candidates =

+ scoped_ptr<ui::OverlayCandidatesOzone> overlay_candidates =

ui::OzonePlatform::GetInstance()

->GetOverlayManager()

->GetOverlayCandidates(widget);

@@ -171,7 +172,7 @@ CreateOverlayCandidateValidator(gfx::AcceleratedWidget widget) {

command_line->HasSwitch(switches::kOzoneTestSingleOverlaySupport))) {

return scoped_ptr<BrowserCompositorOverlayCandidateValidator>(

new BrowserCompositorOverlayCandidateValidatorOzone(

- widget, overlay_candidates));

+ widget, overlay_candidates.Pass()));

}

#endif

return scoped_ptr<BrowserCompositorOverlayCandidateValidator>();