Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(93)

Unified Diff: content/browser/compositor/browser_compositor_output_surface.cc

Issue 1336703002: Revert of Re-land: 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, 3 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
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();
}

Powered by Google App Engine
This is Rietveld 408576698