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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/aura/window_tree_host.cc

Issue 296053009: Makes Env contain a ContextFactory (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: foo Created 6 years, 7 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/aura/test/aura_test_helper.cc ('k') | ui/keyboard/keyboard_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/window_tree_host.cc
diff --git a/ui/aura/window_tree_host.cc b/ui/aura/window_tree_host.cc
index 2118c2ebd6af1603eeab722bfdb24a6d505ba17b..9ac7cf7ab0182634013b2794ca9716ea9692330f 100644
--- a/ui/aura/window_tree_host.cc
+++ b/ui/aura/window_tree_host.cc
@@ -198,8 +198,11 @@ void WindowTreeHost::DestroyDispatcher() {
void WindowTreeHost::CreateCompositor(
gfx::AcceleratedWidget accelerated_widget) {
- compositor_.reset(new ui::Compositor(GetAcceleratedWidget()));
- DCHECK(compositor_.get());
+ DCHECK(Env::GetInstance());
+ ui::ContextFactory* context_factory = Env::GetInstance()->context_factory();
+ DCHECK(context_factory);
+ compositor_.reset(
+ new ui::Compositor(GetAcceleratedWidget(), context_factory));
// TODO(beng): I think this setup should probably all move to a "accelerated
// widget available" function.
if (!dispatcher()) {
« no previous file with comments | « ui/aura/test/aura_test_helper.cc ('k') | ui/keyboard/keyboard_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698