| 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.h" | 5 #include "cc/test/layer_tree_test.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "cc/animation/animation.h" | 8 #include "cc/animation/animation.h" |
| 9 #include "cc/animation/animation_registrar.h" | 9 #include "cc/animation/animation_registrar.h" |
| 10 #include "cc/animation/layer_animation_controller.h" | 10 #include "cc/animation/layer_animation_controller.h" |
| 11 #include "cc/animation/timing_function.h" | 11 #include "cc/animation/timing_function.h" |
| 12 #include "cc/base/switches.h" | 12 #include "cc/base/switches.h" |
| 13 #include "cc/debug/fake_context_provider.h" |
| 13 #include "cc/input/input_handler.h" | 14 #include "cc/input/input_handler.h" |
| 14 #include "cc/layers/content_layer.h" | 15 #include "cc/layers/content_layer.h" |
| 15 #include "cc/layers/layer.h" | 16 #include "cc/layers/layer.h" |
| 16 #include "cc/layers/layer_impl.h" | 17 #include "cc/layers/layer_impl.h" |
| 17 #include "cc/test/animation_test_common.h" | 18 #include "cc/test/animation_test_common.h" |
| 18 #include "cc/test/fake_context_provider.h" | |
| 19 #include "cc/test/fake_layer_tree_host_client.h" | 19 #include "cc/test/fake_layer_tree_host_client.h" |
| 20 #include "cc/test/fake_output_surface.h" | 20 #include "cc/test/fake_output_surface.h" |
| 21 #include "cc/test/occlusion_tracker_test_common.h" | 21 #include "cc/test/occlusion_tracker_test_common.h" |
| 22 #include "cc/test/tiled_layer_test_common.h" | 22 #include "cc/test/tiled_layer_test_common.h" |
| 23 #include "cc/trees/layer_tree_host_impl.h" | 23 #include "cc/trees/layer_tree_host_impl.h" |
| 24 #include "cc/trees/single_thread_proxy.h" | 24 #include "cc/trees/single_thread_proxy.h" |
| 25 #include "testing/gmock/include/gmock/gmock.h" | 25 #include "testing/gmock/include/gmock/gmock.h" |
| 26 #include "ui/gfx/size_conversions.h" | 26 #include "ui/gfx/size_conversions.h" |
| 27 | 27 |
| 28 namespace cc { | 28 namespace cc { |
| (...skipping 578 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 607 else | 607 else |
| 608 output_surface = FakeOutputSurface::Create3d(); | 608 output_surface = FakeOutputSurface::Create3d(); |
| 609 output_surface_ = output_surface.get(); | 609 output_surface_ = output_surface.get(); |
| 610 return output_surface.PassAs<OutputSurface>(); | 610 return output_surface.PassAs<OutputSurface>(); |
| 611 } | 611 } |
| 612 | 612 |
| 613 scoped_refptr<cc::ContextProvider> LayerTreeTest:: | 613 scoped_refptr<cc::ContextProvider> LayerTreeTest:: |
| 614 OffscreenContextProviderForMainThread() { | 614 OffscreenContextProviderForMainThread() { |
| 615 if (!main_thread_contexts_.get() || | 615 if (!main_thread_contexts_.get() || |
| 616 main_thread_contexts_->DestroyedOnMainThread()) { | 616 main_thread_contexts_->DestroyedOnMainThread()) { |
| 617 main_thread_contexts_ = FakeContextProvider::Create(); | 617 main_thread_contexts_ = FakeContextProvider::Create( |
| 618 TestWebGraphicsContext3D::CreateBaseFactory()); |
| 618 if (!main_thread_contexts_->BindToCurrentThread()) | 619 if (!main_thread_contexts_->BindToCurrentThread()) |
| 619 main_thread_contexts_ = NULL; | 620 main_thread_contexts_ = NULL; |
| 620 } | 621 } |
| 621 return main_thread_contexts_; | 622 return main_thread_contexts_; |
| 622 } | 623 } |
| 623 | 624 |
| 624 scoped_refptr<cc::ContextProvider> LayerTreeTest:: | 625 scoped_refptr<cc::ContextProvider> LayerTreeTest:: |
| 625 OffscreenContextProviderForCompositorThread() { | 626 OffscreenContextProviderForCompositorThread() { |
| 626 if (!compositor_thread_contexts_.get() || | 627 if (!compositor_thread_contexts_.get() || |
| 627 compositor_thread_contexts_->DestroyedOnMainThread()) | 628 compositor_thread_contexts_->DestroyedOnMainThread()) |
| 628 compositor_thread_contexts_ = FakeContextProvider::Create(); | 629 compositor_thread_contexts_ = FakeContextProvider::Create( |
| 630 TestWebGraphicsContext3D::CreateBaseFactory()); |
| 629 return compositor_thread_contexts_; | 631 return compositor_thread_contexts_; |
| 630 } | 632 } |
| 631 | 633 |
| 632 } // namespace cc | 634 } // namespace cc |
| OLD | NEW |