| 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_compositor.h" | 5 #include "ui/gfx/compositor/test_compositor.h" |
| 6 | 6 |
| 7 #include "ui/gfx/compositor/test_texture.h" | 7 #include "ui/gfx/compositor/test_texture.h" |
| 8 | 8 |
| 9 namespace ui { | 9 namespace ui { |
| 10 | 10 |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 45 void TestCompositor::DrawTree() { | 45 void TestCompositor::DrawTree() { |
| 46 #if !defined(USE_WEBKIT_COMPOSITOR) | 46 #if !defined(USE_WEBKIT_COMPOSITOR) |
| 47 Compositor::DrawTree(); | 47 Compositor::DrawTree(); |
| 48 #endif | 48 #endif |
| 49 } | 49 } |
| 50 | 50 |
| 51 ui::Compositor* TestCompositor::Create(ui::CompositorDelegate* owner) { | 51 ui::Compositor* TestCompositor::Create(ui::CompositorDelegate* owner) { |
| 52 return new ui::TestCompositor(owner); | 52 return new ui::TestCompositor(owner); |
| 53 } | 53 } |
| 54 | 54 |
| 55 void TestCompositor::SetupTestCompositor() { |
| 56 #if defined(VIEWS_COMPOSITOR) |
| 57 ui::Compositor::set_compositor_factory_for_testing( |
| 58 ui::TestCompositor::Create); |
| 59 #endif |
| 60 } |
| 61 |
| 55 void TestCompositor::OnWidgetSizeChanged() { | 62 void TestCompositor::OnWidgetSizeChanged() { |
| 56 } | 63 } |
| 57 | 64 |
| 58 } // namespace ui | 65 } // namespace ui |
| OLD | NEW |