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

Unified Diff: ui/compositor/test/in_process_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 | « ui/compositor/test/in_process_context_factory.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/compositor/test/in_process_context_factory.cc
diff --git a/ui/compositor/test/in_process_context_factory.cc b/ui/compositor/test/in_process_context_factory.cc
index 3bf0d3ebf764648e733b667c61598d52b9afdd2b..042f9a320c6b5f379b47986d43f848a3e0004ae3 100644
--- a/ui/compositor/test/in_process_context_factory.cc
+++ b/ui/compositor/test/in_process_context_factory.cc
@@ -39,8 +39,8 @@ InProcessContextFactory::InProcessContextFactory()
InProcessContextFactory::~InProcessContextFactory() {}
-scoped_ptr<cc::OutputSurface> InProcessContextFactory::CreateOutputSurface(
- Compositor* compositor,
+void InProcessContextFactory::CreateOutputSurface(
+ base::WeakPtr<Compositor> compositor,
bool software_fallback) {
DCHECK(!software_fallback);
blink::WebGraphicsContext3D::Attributes attrs;
@@ -60,7 +60,8 @@ scoped_ptr<cc::OutputSurface> InProcessContextFactory::CreateOutputSurface(
scoped_refptr<ContextProviderInProcess> context_provider =
ContextProviderInProcess::Create(context3d.Pass(), "UICompositor");
- return make_scoped_ptr(new cc::PixelTestOutputSurface(context_provider));
+ compositor->SetOutputSurface(
+ make_scoped_ptr(new cc::PixelTestOutputSurface(context_provider)));
}
scoped_refptr<Reflector> InProcessContextFactory::CreateReflector(
« no previous file with comments | « ui/compositor/test/in_process_context_factory.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698