| 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 #include "ui/compositor/test/test_suite.h" | 5 #include "ui/compositor/test/test_suite.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/message_loop/message_loop.h" | 8 #include "base/message_loop/message_loop.h" |
| 9 #include "ui/compositor/compositor.h" | 9 #include "ui/compositor/compositor.h" |
| 10 #include "ui/compositor/compositor_switches.h" | 10 #include "ui/compositor/compositor_switches.h" |
| 11 #include "ui/compositor/layer.h" |
| 11 #include "ui/gfx/gfx_paths.h" | 12 #include "ui/gfx/gfx_paths.h" |
| 12 #include "ui/gl/test/gl_surface_test_support.h" | 13 #include "ui/gl/test/gl_surface_test_support.h" |
| 13 | 14 |
| 14 #if defined(OS_WIN) | 15 #if defined(OS_WIN) |
| 15 #include "ui/gfx/win/dpi.h" | 16 #include "ui/gfx/win/dpi.h" |
| 16 #endif | 17 #endif |
| 17 | 18 |
| 18 namespace ui { | 19 namespace ui { |
| 19 namespace test { | 20 namespace test { |
| 20 | 21 |
| 21 CompositorTestSuite::CompositorTestSuite(int argc, char** argv) | 22 CompositorTestSuite::CompositorTestSuite(int argc, char** argv) |
| 22 : TestSuite(argc, argv) {} | 23 : TestSuite(argc, argv) {} |
| 23 | 24 |
| 24 CompositorTestSuite::~CompositorTestSuite() {} | 25 CompositorTestSuite::~CompositorTestSuite() {} |
| 25 | 26 |
| 26 void CompositorTestSuite::Initialize() { | 27 void CompositorTestSuite::Initialize() { |
| 27 base::TestSuite::Initialize(); | 28 base::TestSuite::Initialize(); |
| 28 gfx::GLSurfaceTestSupport::InitializeOneOff(); | 29 gfx::GLSurfaceTestSupport::InitializeOneOff(); |
| 29 | 30 |
| 30 gfx::RegisterPathProvider(); | 31 gfx::RegisterPathProvider(); |
| 31 | 32 |
| 32 #if defined(OS_WIN) | 33 #if defined(OS_WIN) |
| 33 gfx::SetDefaultDeviceScaleFactor(1.0f); | 34 gfx::SetDefaultDeviceScaleFactor(1.0f); |
| 34 #endif | 35 #endif |
| 35 | 36 |
| 37 ui::Layer::InitializeUILayerSettings(); |
| 38 |
| 36 message_loop_.reset(new base::MessageLoopForUI); | 39 message_loop_.reset(new base::MessageLoopForUI); |
| 37 } | 40 } |
| 38 | 41 |
| 39 void CompositorTestSuite::Shutdown() { | 42 void CompositorTestSuite::Shutdown() { |
| 40 message_loop_.reset(); | 43 message_loop_.reset(); |
| 41 | 44 |
| 42 base::TestSuite::Shutdown(); | 45 base::TestSuite::Shutdown(); |
| 43 } | 46 } |
| 44 | 47 |
| 45 } // namespace test | 48 } // namespace test |
| 46 } // namespace ui | 49 } // namespace ui |
| OLD | NEW |