| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/gfx/compositor/test/test_suite.h" | 5 #include "ui/gfx/compositor/test/test_suite.h" |
| 6 | 6 |
| 7 #include "base/message_loop.h" | 7 #include "base/message_loop.h" |
| 8 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" | 8 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" |
| 9 #include "ui/base/resource/resource_bundle.h" | 9 #include "ui/base/resource/resource_bundle.h" |
| 10 #include "ui/base/ui_base_paths.h" | 10 #include "ui/base/ui_base_paths.h" |
| (...skipping 14 matching lines...) Expand all Loading... |
| 25 #if defined(OS_LINUX) | 25 #if defined(OS_LINUX) |
| 26 gfx::InitializeGLBindings(gfx::kGLImplementationOSMesaGL); | 26 gfx::InitializeGLBindings(gfx::kGLImplementationOSMesaGL); |
| 27 #endif | 27 #endif |
| 28 base::TestSuite::Initialize(); | 28 base::TestSuite::Initialize(); |
| 29 | 29 |
| 30 gfx::RegisterPathProvider(); | 30 gfx::RegisterPathProvider(); |
| 31 ui::RegisterPathProvider(); | 31 ui::RegisterPathProvider(); |
| 32 | 32 |
| 33 message_loop_.reset(new MessageLoop(MessageLoop::TYPE_UI)); | 33 message_loop_.reset(new MessageLoop(MessageLoop::TYPE_UI)); |
| 34 ui::CompositorTestSupport::Initialize(); | 34 ui::CompositorTestSupport::Initialize(); |
| 35 #if defined(USE_WEBKIT_COMPOSITOR) |
| 36 ui::CompositorCC::Initialize(false); |
| 37 #endif |
| 35 } | 38 } |
| 36 | 39 |
| 37 void CompositorTestSuite::Shutdown() { | 40 void CompositorTestSuite::Shutdown() { |
| 41 #if defined(USE_WEBKIT_COMPOSITOR) |
| 42 ui::CompositorCC::Terminate(); |
| 43 #endif |
| 38 ui::CompositorTestSupport::Terminate(); | 44 ui::CompositorTestSupport::Terminate(); |
| 39 message_loop_.reset(); | 45 message_loop_.reset(); |
| 40 | 46 |
| 41 ui::ResourceBundle::CleanupSharedInstance(); | 47 ui::ResourceBundle::CleanupSharedInstance(); |
| 42 | 48 |
| 43 base::TestSuite::Shutdown(); | 49 base::TestSuite::Shutdown(); |
| 44 } | 50 } |
| OLD | NEW |