| 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 1779 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1790 | 1790 |
| 1791 class EvictionTestLayerImpl : public LayerImpl { | 1791 class EvictionTestLayerImpl : public LayerImpl { |
| 1792 public: | 1792 public: |
| 1793 static scoped_ptr<EvictionTestLayerImpl> Create(LayerTreeImpl* tree_impl, | 1793 static scoped_ptr<EvictionTestLayerImpl> Create(LayerTreeImpl* tree_impl, |
| 1794 int id) { | 1794 int id) { |
| 1795 return make_scoped_ptr(new EvictionTestLayerImpl(tree_impl, id)); | 1795 return make_scoped_ptr(new EvictionTestLayerImpl(tree_impl, id)); |
| 1796 } | 1796 } |
| 1797 ~EvictionTestLayerImpl() override {} | 1797 ~EvictionTestLayerImpl() override {} |
| 1798 | 1798 |
| 1799 void AppendQuads(RenderPass* render_pass, | 1799 void AppendQuads(RenderPass* render_pass, |
| 1800 const Occlusion& occlusion_in_content_space, | |
| 1801 AppendQuadsData* append_quads_data) override { | 1800 AppendQuadsData* append_quads_data) override { |
| 1802 ASSERT_TRUE(has_texture_); | 1801 ASSERT_TRUE(has_texture_); |
| 1803 ASSERT_NE(0u, layer_tree_impl()->resource_provider()->num_resources()); | 1802 ASSERT_NE(0u, layer_tree_impl()->resource_provider()->num_resources()); |
| 1804 } | 1803 } |
| 1805 | 1804 |
| 1806 void SetHasTexture(bool has_texture) { has_texture_ = has_texture; } | 1805 void SetHasTexture(bool has_texture) { has_texture_ = has_texture; } |
| 1807 | 1806 |
| 1808 private: | 1807 private: |
| 1809 EvictionTestLayerImpl(LayerTreeImpl* tree_impl, int id) | 1808 EvictionTestLayerImpl(LayerTreeImpl* tree_impl, int id) |
| 1810 : LayerImpl(tree_impl, id), has_texture_(false) {} | 1809 : LayerImpl(tree_impl, id), has_texture_(false) {} |
| (...skipping 4502 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6313 | 6312 |
| 6314 void AfterTest() override { EXPECT_TRUE(did_commit_); } | 6313 void AfterTest() override { EXPECT_TRUE(did_commit_); } |
| 6315 | 6314 |
| 6316 private: | 6315 private: |
| 6317 bool did_commit_; | 6316 bool did_commit_; |
| 6318 }; | 6317 }; |
| 6319 | 6318 |
| 6320 SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestNoTasksBetweenWillAndDidCommit); | 6319 SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestNoTasksBetweenWillAndDidCommit); |
| 6321 | 6320 |
| 6322 } // namespace cc | 6321 } // namespace cc |
| OLD | NEW |