| 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 <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/auto_reset.h" | 9 #include "base/auto_reset.h" |
| 10 #include "base/synchronization/lock.h" | 10 #include "base/synchronization/lock.h" |
| (...skipping 4203 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4214 EndTest(); | 4214 EndTest(); |
| 4215 } | 4215 } |
| 4216 | 4216 |
| 4217 virtual void AfterTest() OVERRIDE {} | 4217 virtual void AfterTest() OVERRIDE {} |
| 4218 | 4218 |
| 4219 private: | 4219 private: |
| 4220 FakeContentLayerClient client_; | 4220 FakeContentLayerClient client_; |
| 4221 }; | 4221 }; |
| 4222 | 4222 |
| 4223 // Impl-side painting is a multi-threaded compositor feature. | 4223 // Impl-side painting is a multi-threaded compositor feature. |
| 4224 // Disabled for flakiness: http://crbug.com/380662 |
| 4225 #if 0 |
| 4224 MULTI_THREAD_TEST_F(LayerTreeHostTestMaxTransferBufferUsageBytes); | 4226 MULTI_THREAD_TEST_F(LayerTreeHostTestMaxTransferBufferUsageBytes); |
| 4227 #endif |
| 4225 | 4228 |
| 4226 // Test ensuring that memory limits are sent to the prioritized resource | 4229 // Test ensuring that memory limits are sent to the prioritized resource |
| 4227 // manager. | 4230 // manager. |
| 4228 class LayerTreeHostTestMemoryLimits : public LayerTreeHostTest { | 4231 class LayerTreeHostTestMemoryLimits : public LayerTreeHostTest { |
| 4229 public: | 4232 public: |
| 4230 LayerTreeHostTestMemoryLimits() : num_commits_(0) {} | 4233 LayerTreeHostTestMemoryLimits() : num_commits_(0) {} |
| 4231 | 4234 |
| 4232 virtual void BeginTest() OVERRIDE { PostSetNeedsCommitToMainThread(); } | 4235 virtual void BeginTest() OVERRIDE { PostSetNeedsCommitToMainThread(); } |
| 4233 | 4236 |
| 4234 virtual void WillCommit() OVERRIDE { | 4237 virtual void WillCommit() OVERRIDE { |
| (...skipping 664 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4899 const gfx::Size bounds_; | 4902 const gfx::Size bounds_; |
| 4900 FakeContentLayerClient client_; | 4903 FakeContentLayerClient client_; |
| 4901 scoped_refptr<ContentLayerWithUpdateTracking> content_layer_; | 4904 scoped_refptr<ContentLayerWithUpdateTracking> content_layer_; |
| 4902 scoped_refptr<FakePictureLayer> picture_layer_; | 4905 scoped_refptr<FakePictureLayer> picture_layer_; |
| 4903 Layer* child_layer_; | 4906 Layer* child_layer_; |
| 4904 }; | 4907 }; |
| 4905 | 4908 |
| 4906 MULTI_THREAD_TEST_F(LayerTreeHostTestContinuousPainting); | 4909 MULTI_THREAD_TEST_F(LayerTreeHostTestContinuousPainting); |
| 4907 | 4910 |
| 4908 } // namespace cc | 4911 } // namespace cc |
| OLD | NEW |