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

Unified Diff: ui/compositor/test/in_process_context_factory.h

Issue 888783002: Composite to cc::Display from ui::InProcessContextFactory. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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/context_factories_for_test.cc ('k') | ui/compositor/test/in_process_context_factory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/compositor/test/in_process_context_factory.h
diff --git a/ui/compositor/test/in_process_context_factory.h b/ui/compositor/test/in_process_context_factory.h
index 55642ca41049509ffabc57a317a9e5d1ae32dc29..a28bd39e952ddda123a7028e3c6092452848d1ae 100644
--- a/ui/compositor/test/in_process_context_factory.h
+++ b/ui/compositor/test/in_process_context_factory.h
@@ -13,11 +13,19 @@ namespace base {
class Thread;
}
+namespace cc {
+class OnscreenDisplayClient;
+class SurfaceManager;
+}
+
namespace ui {
class InProcessContextFactory : public ContextFactory {
public:
- explicit InProcessContextFactory(bool context_factory_for_test);
+ // surface_manager is owned by the creator of this and must outlive the
+ // context factory.
+ InProcessContextFactory(bool context_factory_for_test,
+ cc::SurfaceManager* surface_manager);
~InProcessContextFactory() override;
// If true (the default) an OutputSurface is created that does not display
@@ -51,8 +59,10 @@ class InProcessContextFactory : public ContextFactory {
cc::TestGpuMemoryBufferManager gpu_memory_buffer_manager_;
uint32_t next_surface_id_namespace_;
bool use_test_surface_;
+ bool context_factory_for_test_;
+ cc::SurfaceManager* surface_manager_;
- const bool context_factory_for_test_;
+ base::hash_map<Compositor*, cc::OnscreenDisplayClient*> per_compositor_data_;
DISALLOW_COPY_AND_ASSIGN(InProcessContextFactory);
};
« no previous file with comments | « ui/compositor/test/context_factories_for_test.cc ('k') | ui/compositor/test/in_process_context_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698