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

Unified Diff: mojo/aura/surface_context_factory.cc

Issue 648413004: Make browser GPU channel creation async. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 | « mojo/aura/surface_context_factory.h ('k') | ui/compositor/compositor.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/aura/surface_context_factory.cc
diff --git a/mojo/aura/surface_context_factory.cc b/mojo/aura/surface_context_factory.cc
index aa964012ecd1a011e07313f53da5124d50c4da0f..34cc316a822c82a6857aa672d58e2e58bf5984ae 100644
--- a/mojo/aura/surface_context_factory.cc
+++ b/mojo/aura/surface_context_factory.cc
@@ -20,10 +20,10 @@ SurfaceContextFactory::SurfaceContextFactory(Shell* shell, View* view)
SurfaceContextFactory::~SurfaceContextFactory() {
}
-scoped_ptr<cc::OutputSurface> SurfaceContextFactory::CreateOutputSurface(
- ui::Compositor* compositor,
+void SurfaceContextFactory::CreateOutputSurface(
+ base::WeakPtr<ui::Compositor> compositor,
bool software_fallback) {
- return surface_binding_.CreateOutputSurface();
+ compositor->SetOutputSurface(surface_binding_.CreateOutputSurface());
}
scoped_refptr<ui::Reflector> SurfaceContextFactory::CreateReflector(
« no previous file with comments | « mojo/aura/surface_context_factory.h ('k') | ui/compositor/compositor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698