OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #if defined(USE_X11) | 5 #if defined(USE_X11) |
6 #include <X11/Xlib.h> | 6 #include <X11/Xlib.h> |
7 #endif | 7 #endif |
8 | 8 |
9 #include "base/at_exit.h" | 9 #include "base/at_exit.h" |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 279 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
290 | 290 |
291 #if defined(USE_X11) | 291 #if defined(USE_X11) |
292 // This demo uses InProcessContextFactory which uses X on a separate Gpu | 292 // This demo uses InProcessContextFactory which uses X on a separate Gpu |
293 // thread. | 293 // thread. |
294 gfx::InitializeThreadedX11(); | 294 gfx::InitializeThreadedX11(); |
295 #endif | 295 #endif |
296 | 296 |
297 gfx::GLSurface::InitializeOneOff(); | 297 gfx::GLSurface::InitializeOneOff(); |
298 | 298 |
299 // The ContextFactory must exist before any Compositors are created. | 299 // The ContextFactory must exist before any Compositors are created. |
| 300 bool context_factory_for_test = false; |
300 scoped_ptr<ui::InProcessContextFactory> context_factory( | 301 scoped_ptr<ui::InProcessContextFactory> context_factory( |
301 new ui::InProcessContextFactory()); | 302 new ui::InProcessContextFactory(context_factory_for_test)); |
302 | 303 |
303 base::i18n::InitializeICU(); | 304 base::i18n::InitializeICU(); |
304 | 305 |
305 base::MessageLoopForUI message_loop; | 306 base::MessageLoopForUI message_loop; |
306 aura::Env::CreateInstance(true); | 307 aura::Env::CreateInstance(true); |
307 aura::Env::GetInstance()->set_context_factory(context_factory.get()); | 308 aura::Env::GetInstance()->set_context_factory(context_factory.get()); |
308 scoped_ptr<aura::TestScreen> test_screen( | 309 scoped_ptr<aura::TestScreen> test_screen( |
309 aura::TestScreen::CreateFullscreen()); | 310 aura::TestScreen::CreateFullscreen()); |
310 gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, test_screen.get()); | 311 gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, test_screen.get()); |
311 scoped_ptr<aura::WindowTreeHost> host( | 312 scoped_ptr<aura::WindowTreeHost> host( |
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
359 ui::PrintLayerHierarchy(host->window()->layer(), gfx::Point(100, 100)); | 360 ui::PrintLayerHierarchy(host->window()->layer(), gfx::Point(100, 100)); |
360 #endif | 361 #endif |
361 | 362 |
362 host->Show(); | 363 host->Show(); |
363 base::MessageLoopForUI::current()->Run(); | 364 base::MessageLoopForUI::current()->Run(); |
364 focus_client.reset(); | 365 focus_client.reset(); |
365 host.reset(); | 366 host.reset(); |
366 | 367 |
367 return 0; | 368 return 0; |
368 } | 369 } |
OLD | NEW |