| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/output/copy_output_request.h" | 5 #include "cc/output/copy_output_request.h" |
| 6 #include "cc/output/copy_output_result.h" | 6 #include "cc/output/copy_output_result.h" |
| 7 #include "cc/test/fake_content_layer.h" | 7 #include "cc/test/fake_content_layer.h" |
| 8 #include "cc/test/fake_content_layer_client.h" | 8 #include "cc/test/fake_content_layer_client.h" |
| 9 #include "cc/test/fake_output_surface.h" | 9 #include "cc/test/fake_output_surface.h" |
| 10 #include "cc/test/layer_tree_test.h" | 10 #include "cc/test/layer_tree_test.h" |
| (...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 111 } | 111 } |
| 112 | 112 |
| 113 bool use_gl_renderer_; | 113 bool use_gl_renderer_; |
| 114 std::vector<gfx::Size> callbacks_; | 114 std::vector<gfx::Size> callbacks_; |
| 115 FakeContentLayerClient client_; | 115 FakeContentLayerClient client_; |
| 116 scoped_refptr<FakeContentLayer> root; | 116 scoped_refptr<FakeContentLayer> root; |
| 117 scoped_refptr<FakeContentLayer> child; | 117 scoped_refptr<FakeContentLayer> child; |
| 118 }; | 118 }; |
| 119 | 119 |
| 120 // Readback can't be done with a delegating renderer. | 120 // Readback can't be done with a delegating renderer. |
| 121 // Disabled due to flake: http://crbug.com/448521 |
| 121 TEST_F(LayerTreeHostCopyRequestTestMultipleRequests, | 122 TEST_F(LayerTreeHostCopyRequestTestMultipleRequests, |
| 122 GLRenderer_RunSingleThread) { | 123 DISABLED_GLRenderer_RunSingleThread) { |
| 123 use_gl_renderer_ = true; | 124 use_gl_renderer_ = true; |
| 124 RunTest(false, false, false); | 125 RunTest(false, false, false); |
| 125 } | 126 } |
| 126 | 127 |
| 127 TEST_F(LayerTreeHostCopyRequestTestMultipleRequests, | 128 TEST_F(LayerTreeHostCopyRequestTestMultipleRequests, |
| 128 GLRenderer_RunMultiThread_MainThreadPainting) { | 129 GLRenderer_RunMultiThread_MainThreadPainting) { |
| 129 use_gl_renderer_ = true; | 130 use_gl_renderer_ = true; |
| 130 RunTest(true, false, false); | 131 RunTest(true, false, false); |
| 131 } | 132 } |
| 132 | 133 |
| (...skipping 827 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 960 FakeContentLayerClient client_; | 961 FakeContentLayerClient client_; |
| 961 scoped_refptr<FakeContentLayer> root_; | 962 scoped_refptr<FakeContentLayer> root_; |
| 962 scoped_refptr<FakeContentLayer> copy_layer_; | 963 scoped_refptr<FakeContentLayer> copy_layer_; |
| 963 }; | 964 }; |
| 964 | 965 |
| 965 SINGLE_AND_MULTI_THREAD_DIRECT_RENDERER_TEST_F( | 966 SINGLE_AND_MULTI_THREAD_DIRECT_RENDERER_TEST_F( |
| 966 LayerTreeHostCopyRequestTestShutdownBeforeCopy); | 967 LayerTreeHostCopyRequestTestShutdownBeforeCopy); |
| 967 | 968 |
| 968 } // namespace | 969 } // namespace |
| 969 } // namespace cc | 970 } // namespace cc |
| OLD | NEW |