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

Unified Diff: mojo/aura/surface_context_factory.h

Issue 808003002: Fix compositor integration in ui/compositor (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years 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_binding.cc ('k') | mojo/aura/surface_context_factory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/aura/surface_context_factory.h
diff --git a/mojo/aura/surface_context_factory.h b/mojo/aura/surface_context_factory.h
index e9cdbed422c63baa05ce685704d75717f219d6f3..a69bb90a7798bc5ab412da7980b99a4ed3388f57 100644
--- a/mojo/aura/surface_context_factory.h
+++ b/mojo/aura/surface_context_factory.h
@@ -19,9 +19,8 @@ class SurfaceContextFactory : public ui::ContextFactory {
private:
// ContextFactory:
- scoped_ptr<cc::OutputSurface> CreateOutputSurface(
- ui::Compositor* compositor,
- bool software_fallback) override;
+ void CreateOutputSurface(base::WeakPtr<ui::Compositor> compositor,
+ bool software_fallback) override;
scoped_refptr<ui::Reflector> CreateReflector(
ui::Compositor* mirrored_compositor,
ui::Layer* mirroring_layer) override;
« no previous file with comments | « mojo/aura/surface_binding.cc ('k') | mojo/aura/surface_context_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698