content/browser/compositor/browser_compositor_output_surface.cc - Issue 2002303002: Consolidate OutputSurface constructors into GL vs Vulkan.

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/browser_compositor_output_surface.cc

Issue 2002303002: Consolidate OutputSurface constructors into GL vs Vulkan. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: outputsurface-constructors: rebase-and-fixcrash Created 4 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 | « components/mus/surfaces/direct_output_surface_ozone.cc ('k') | content/browser/compositor/gpu_surfaceless_browser_compositor_output_surface.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/compositor/browser_compositor_output_surface.cc

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

index eb2a98cfa3a693ca44214ccd48f2c2ff7d8b4b0e..66183edd4d410ba9af3b3ff621f29128581b135e 100644

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

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

@@ -24,7 +24,7 @@ BrowserCompositorOutputSurface::BrowserCompositorOutputSurface(

base::SingleThreadTaskRunner* task_runner,

std::unique_ptr<display_compositor::CompositorOverlayCandidateValidator>

overlay_candidate_validator)

- : OutputSurface(std::move(context_provider)),

+ : OutputSurface(std::move(context_provider), nullptr, nullptr),

vsync_manager_(std::move(vsync_manager)),

synthetic_begin_frame_source_(new cc::SyntheticBeginFrameSource(

task_runner,

@@ -41,7 +41,7 @@ BrowserCompositorOutputSurface::BrowserCompositorOutputSurface(

std::unique_ptr<cc::SoftwareOutputDevice> software_device,

const scoped_refptr<ui::CompositorVSyncManager>& vsync_manager,

base::SingleThreadTaskRunner* task_runner)

- : OutputSurface(std::move(software_device)),

+ : OutputSurface(nullptr, nullptr, std::move(software_device)),

vsync_manager_(vsync_manager),

synthetic_begin_frame_source_(new cc::SyntheticBeginFrameSource(

task_runner,

@@ -57,7 +57,7 @@ BrowserCompositorOutputSurface::BrowserCompositorOutputSurface(

const scoped_refptr<cc::VulkanContextProvider>& vulkan_context_provider,

const scoped_refptr<ui::CompositorVSyncManager>& vsync_manager,

base::SingleThreadTaskRunner* task_runner)

- : OutputSurface(nullptr, nullptr, vulkan_context_provider, nullptr),

+ : OutputSurface(std::move(vulkan_context_provider)),

vsync_manager_(vsync_manager),

synthetic_begin_frame_source_(new cc::SyntheticBeginFrameSource(

task_runner,