content/renderer/gpu/delegated_compositor_output_surface.cc - Issue 20185002: ContextProvider in OutputSurface

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/gpu/delegated_compositor_output_surface.cc

Issue 20185002: ContextProvider in OutputSurface (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: contextprovider: don't access Context3d() in OutputSurface contructors, it's not bound yet Created 7 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:

Index: content/renderer/gpu/delegated_compositor_output_surface.cc

diff --git a/content/renderer/gpu/delegated_compositor_output_surface.cc b/content/renderer/gpu/delegated_compositor_output_surface.cc

index 2e53923de14820b7527617260789f72daa20feae..02ad1587accafd7006483ec36d3d7383cd3eed7e 100644

--- a/content/renderer/gpu/delegated_compositor_output_surface.cc

+++ b/content/renderer/gpu/delegated_compositor_output_surface.cc

@@ -9,12 +9,12 @@ namespace content {

DelegatedCompositorOutputSurface::DelegatedCompositorOutputSurface(

int32 routing_id,

uint32 output_surface_id,

- WebGraphicsContext3DCommandBufferImpl* context3d,

- cc::SoftwareOutputDevice* software)

+ const scoped_refptr<ContextProviderCommandBuffer>& context_provider,

+ scoped_ptr<cc::SoftwareOutputDevice> software)

: CompositorOutputSurface(routing_id,

output_surface_id,

- context3d,

- software,

+ context_provider,

+ software.Pass(),

true) {

capabilities_.delegated_rendering = true;

capabilities_.max_frames_pending = 1;