content/browser/renderer_host/compositor_impl_android.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/renderer_host/compositor_impl_android.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 | « content/browser/compositor/gpu_surfaceless_browser_compositor_output_surface.cc ('k') | content/content_renderer.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/compositor_impl_android.cc

diff --git a/content/browser/renderer_host/compositor_impl_android.cc b/content/browser/renderer_host/compositor_impl_android.cc

index 2aedd74644820bde8e48c672a815b43d9ef5912d..fb04a19fc5b1e59effe377f1dfea241d299a9f6f 100644

--- a/content/browser/renderer_host/compositor_impl_android.cc

+++ b/content/browser/renderer_host/compositor_impl_android.cc

@@ -139,11 +139,11 @@ class OutputSurfaceWithoutParent : public cc::OutputSurface,

public:

OutputSurfaceWithoutParent(

CompositorImpl* compositor,

- const scoped_refptr<ContextProviderCommandBuffer>& context_provider,

+ scoped_refptr<ContextProviderCommandBuffer> context_provider,

const base::Callback<void(gpu::Capabilities)>&

populate_gpu_capabilities_callback,

std::unique_ptr<ExternalBeginFrameSource> begin_frame_source)

- : cc::OutputSurface(context_provider),

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

compositor_(compositor),

populate_gpu_capabilities_callback_(populate_gpu_capabilities_callback),

swap_buffers_completion_callback_(

« no previous file with comments | « content/browser/compositor/gpu_surfaceless_browser_compositor_output_surface.cc ('k') | content/content_renderer.gypi » ('j') | no next file with comments »