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/trees/layer_tree_host.h" | 5 #include "cc/trees/layer_tree_host.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include <algorithm> | 10 #include <algorithm> |
(...skipping 2786 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2797 OnDrawOutputSurface* output_surface_ = nullptr; | 2797 OnDrawOutputSurface* output_surface_ = nullptr; |
2798 }; | 2798 }; |
2799 | 2799 |
2800 MULTI_THREAD_TEST_F( | 2800 MULTI_THREAD_TEST_F( |
2801 LayerTreeHostTestAbortedCommitDoesntStallSynchronousCompositor); | 2801 LayerTreeHostTestAbortedCommitDoesntStallSynchronousCompositor); |
2802 | 2802 |
2803 class LayerTreeHostTestAbortedCommitDoesntStallDisabledVsync | 2803 class LayerTreeHostTestAbortedCommitDoesntStallDisabledVsync |
2804 : public LayerTreeHostTestAbortedCommitDoesntStall { | 2804 : public LayerTreeHostTestAbortedCommitDoesntStall { |
2805 void InitializeSettings(LayerTreeSettings* settings) override { | 2805 void InitializeSettings(LayerTreeSettings* settings) override { |
2806 LayerTreeHostTestAbortedCommitDoesntStall::InitializeSettings(settings); | 2806 LayerTreeHostTestAbortedCommitDoesntStall::InitializeSettings(settings); |
2807 settings->wait_for_beginframe_interval = false; | |
enne (OOO)
2016/09/08 22:19:52
This is not relevant here, so just removed.
| |
2808 settings->renderer_settings.disable_display_vsync = true; | |
2809 } | 2807 } |
2810 }; | 2808 }; |
2811 | 2809 |
2812 MULTI_THREAD_TEST_F(LayerTreeHostTestAbortedCommitDoesntStallDisabledVsync); | 2810 MULTI_THREAD_TEST_F(LayerTreeHostTestAbortedCommitDoesntStallDisabledVsync); |
2813 | 2811 |
2814 class LayerTreeHostTestUninvertibleTransformDoesNotBlockActivation | 2812 class LayerTreeHostTestUninvertibleTransformDoesNotBlockActivation |
2815 : public LayerTreeHostTest { | 2813 : public LayerTreeHostTest { |
2816 protected: | 2814 protected: |
2817 void SetupTree() override { | 2815 void SetupTree() override { |
2818 LayerTreeHostTest::SetupTree(); | 2816 LayerTreeHostTest::SetupTree(); |
(...skipping 2403 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
5222 FakeRecordingSource* recording_source_; | 5220 FakeRecordingSource* recording_source_; |
5223 }; | 5221 }; |
5224 | 5222 |
5225 MULTI_THREAD_TEST_F(LayerTreeHostTestGpuRasterizationEnabled); | 5223 MULTI_THREAD_TEST_F(LayerTreeHostTestGpuRasterizationEnabled); |
5226 | 5224 |
5227 class LayerTreeHostTestGpuRasterizationReenabled : public LayerTreeHostTest { | 5225 class LayerTreeHostTestGpuRasterizationReenabled : public LayerTreeHostTest { |
5228 protected: | 5226 protected: |
5229 void InitializeSettings(LayerTreeSettings* settings) override { | 5227 void InitializeSettings(LayerTreeSettings* settings) override { |
5230 EXPECT_FALSE(settings->gpu_rasterization_enabled); | 5228 EXPECT_FALSE(settings->gpu_rasterization_enabled); |
5231 settings->gpu_rasterization_enabled = true; | 5229 settings->gpu_rasterization_enabled = true; |
5232 settings->wait_for_beginframe_interval = false; | |
5233 settings->renderer_settings.disable_display_vsync = true; | |
5234 } | 5230 } |
5235 | 5231 |
5236 void SetupTree() override { | 5232 void SetupTree() override { |
5237 LayerTreeHostTest::SetupTree(); | 5233 LayerTreeHostTest::SetupTree(); |
5238 | 5234 |
5239 std::unique_ptr<FakeRecordingSource> recording_source( | 5235 std::unique_ptr<FakeRecordingSource> recording_source( |
5240 new FakeRecordingSource); | 5236 new FakeRecordingSource); |
5241 recording_source_ = recording_source.get(); | 5237 recording_source_ = recording_source.get(); |
5242 | 5238 |
5243 scoped_refptr<FakePictureLayer> layer = | 5239 scoped_refptr<FakePictureLayer> layer = |
(...skipping 1796 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
7040 private: | 7036 private: |
7041 FakeContentLayerClient client_; | 7037 FakeContentLayerClient client_; |
7042 const gfx::Size viewport_size_; | 7038 const gfx::Size viewport_size_; |
7043 const gfx::Size large_image_size_; | 7039 const gfx::Size large_image_size_; |
7044 }; | 7040 }; |
7045 | 7041 |
7046 SINGLE_AND_MULTI_THREAD_TEST_F(GpuRasterizationSucceedsWithLargeImage); | 7042 SINGLE_AND_MULTI_THREAD_TEST_F(GpuRasterizationSucceedsWithLargeImage); |
7047 | 7043 |
7048 } // namespace | 7044 } // namespace |
7049 } // namespace cc | 7045 } // namespace cc |
OLD | NEW |