content/browser/compositor/browser_compositor_output_surface.cc - Issue 1273163004: Revert of cc: Use worker context for one-copy tile initialization.

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 1273163004: Revert of cc: Use worker context for one-copy tile initialization. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 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

« no previous file with comments | « content/browser/compositor/browser_compositor_output_surface.h ('k') | content/browser/compositor/gpu_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 bdf3a1b2de663e92df420fc974df80aec34cbde5..0e014c94a68524df657cf89dab59780b31d6d608 100644

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

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

@@ -17,16 +17,14 @@

BrowserCompositorOutputSurface::BrowserCompositorOutputSurface(

const scoped_refptr<cc::ContextProvider>& context_provider,

- const scoped_refptr<cc::ContextProvider>& worker_context_provider,

const scoped_refptr<ui::CompositorVSyncManager>& vsync_manager,

scoped_ptr<BrowserCompositorOverlayCandidateValidator>

overlay_candidate_validator)

- : OutputSurface(context_provider, worker_context_provider),

+ : OutputSurface(context_provider),

vsync_manager_(vsync_manager),

reflector_(nullptr),

- use_begin_frame_scheduling_(

- base::CommandLine::ForCurrentProcess()

- ->HasSwitch(cc::switches::kEnableBeginFrameScheduling)) {

+ use_begin_frame_scheduling_(base::CommandLine::ForCurrentProcess()->

+ HasSwitch(cc::switches::kEnableBeginFrameScheduling)) {

overlay_candidate_validator_ = overlay_candidate_validator.Pass();

Initialize();

}