| OLD | NEW |
| 1 // Copyright 2011 The Chromium Authors. All rights reserved. | 1 // Copyright 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 "cc/test/layer_tree_test_common.h" | 5 #include "cc/test/layer_tree_test_common.h" |
| 6 | 6 |
| 7 #include "base/stl_util.h" | 7 #include "base/stl_util.h" |
| 8 #include "cc/active_animation.h" | 8 #include "cc/active_animation.h" |
| 9 #include "cc/content_layer.h" | 9 #include "cc/content_layer.h" |
| 10 #include "cc/font_atlas.h" | 10 #include "cc/font_atlas.h" |
| 11 #include "cc/input_handler.h" | 11 #include "cc/input_handler.h" |
| 12 #include "cc/layer.h" | 12 #include "cc/layer.h" |
| 13 #include "cc/layer_animation_controller.h" | 13 #include "cc/layer_animation_controller.h" |
| 14 #include "cc/layer_impl.h" | 14 #include "cc/layer_impl.h" |
| 15 #include "cc/layer_tree_host_impl.h" | 15 #include "cc/layer_tree_host_impl.h" |
| 16 #include "cc/scoped_thread_proxy.h" | 16 #include "cc/scoped_thread_proxy.h" |
| 17 #include "cc/single_thread_proxy.h" | 17 #include "cc/single_thread_proxy.h" |
| 18 #include "cc/thread_impl.h" | 18 #include "cc/thread_impl.h" |
| 19 #include "cc/test/animation_test_common.h" | 19 #include "cc/test/animation_test_common.h" |
| 20 #include "cc/test/fake_output_surface.h" | 20 #include "cc/test/fake_output_surface.h" |
| 21 #include "cc/test/fake_web_graphics_context_3d.h" | 21 #include "cc/test/fake_web_graphics_context_3d.h" |
| 22 #include "cc/test/occlusion_tracker_test_common.h" | 22 #include "cc/test/occlusion_tracker_test_common.h" |
| 23 #include "cc/test/tiled_layer_test_common.h" | 23 #include "cc/test/tiled_layer_test_common.h" |
| 24 #include "cc/timing_function.h" | 24 #include "cc/timing_function.h" |
| 25 #include "testing/gmock/include/gmock/gmock.h" | 25 #include "testing/gmock/include/gmock/gmock.h" |
| 26 #include <public/WebFilterOperation.h> | 26 #include "third_party/WebKit/Source/Platform/chromium/public/WebFilterOperation.
h" |
| 27 #include <public/WebFilterOperations.h> | 27 #include "third_party/WebKit/Source/Platform/chromium/public/WebFilterOperations
.h" |
| 28 | 28 |
| 29 using namespace WebKit; | 29 using namespace WebKit; |
| 30 | 30 |
| 31 namespace cc { | 31 namespace cc { |
| 32 | 32 |
| 33 scoped_ptr<CompositorFakeWebGraphicsContext3DWithTextureTracking> CompositorFake
WebGraphicsContext3DWithTextureTracking::create(Attributes attrs) | 33 scoped_ptr<CompositorFakeWebGraphicsContext3DWithTextureTracking> CompositorFake
WebGraphicsContext3DWithTextureTracking::create(Attributes attrs) |
| 34 { | 34 { |
| 35 return make_scoped_ptr(new CompositorFakeWebGraphicsContext3DWithTextureTrac
king(attrs)); | 35 return make_scoped_ptr(new CompositorFakeWebGraphicsContext3DWithTextureTrac
king(attrs)); |
| 36 } | 36 } |
| 37 | 37 |
| (...skipping 445 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 483 ASSERT_FALSE(m_layerTreeHost.get()); | 483 ASSERT_FALSE(m_layerTreeHost.get()); |
| 484 m_client.reset(); | 484 m_client.reset(); |
| 485 if (m_timedOut) { | 485 if (m_timedOut) { |
| 486 FAIL() << "Test timed out"; | 486 FAIL() << "Test timed out"; |
| 487 return; | 487 return; |
| 488 } | 488 } |
| 489 afterTest(); | 489 afterTest(); |
| 490 } | 490 } |
| 491 | 491 |
| 492 } // namespace cc | 492 } // namespace cc |
| OLD | NEW |