| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 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/layers/texture_layer.h" | 5 #include "cc/layers/texture_layer.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 826 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 837 } | 837 } |
| 838 | 838 |
| 839 void AfterTest() override {} | 839 void AfterTest() override {} |
| 840 | 840 |
| 841 base::Lock activate_count_lock_; | 841 base::Lock activate_count_lock_; |
| 842 int activate_count_; | 842 int activate_count_; |
| 843 scoped_refptr<Layer> root_; | 843 scoped_refptr<Layer> root_; |
| 844 scoped_refptr<TextureLayer> layer_; | 844 scoped_refptr<TextureLayer> layer_; |
| 845 }; | 845 }; |
| 846 | 846 |
| 847 // Flaky on windows. https://crbug.com/641613 | 847 // Flaky on windows and linux. https://crbug.com/641613 |
| 848 #if !defined(OS_WIN) | 848 #if !defined(OS_WIN) && !defined(OS_LINUX) |
| 849 SINGLE_AND_MULTI_THREAD_TEST_F(TextureLayerMailboxIsActivatedDuringCommit); | 849 SINGLE_AND_MULTI_THREAD_TEST_F(TextureLayerMailboxIsActivatedDuringCommit); |
| 850 #endif | 850 #endif |
| 851 | 851 |
| 852 class TextureLayerImplWithMailboxTest : public TextureLayerTest { | 852 class TextureLayerImplWithMailboxTest : public TextureLayerTest { |
| 853 protected: | 853 protected: |
| 854 void SetUp() override { | 854 void SetUp() override { |
| 855 TextureLayerTest::SetUp(); | 855 TextureLayerTest::SetUp(); |
| 856 layer_tree_host_ = | 856 layer_tree_host_ = |
| 857 MockLayerTreeHost::Create(&fake_client_, &task_graph_runner_); | 857 MockLayerTreeHost::Create(&fake_client_, &task_graph_runner_); |
| 858 layer_tree_ = layer_tree_host_->GetLayerTree(); | 858 layer_tree_ = layer_tree_host_->GetLayerTree(); |
| (...skipping 594 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1453 base::ThreadChecker main_thread_; | 1453 base::ThreadChecker main_thread_; |
| 1454 int callback_count_; | 1454 int callback_count_; |
| 1455 scoped_refptr<Layer> root_; | 1455 scoped_refptr<Layer> root_; |
| 1456 scoped_refptr<TextureLayer> layer_; | 1456 scoped_refptr<TextureLayer> layer_; |
| 1457 }; | 1457 }; |
| 1458 | 1458 |
| 1459 SINGLE_AND_MULTI_THREAD_TEST_F(TextureLayerWithMailboxImplThreadDeleted); | 1459 SINGLE_AND_MULTI_THREAD_TEST_F(TextureLayerWithMailboxImplThreadDeleted); |
| 1460 | 1460 |
| 1461 } // namespace | 1461 } // namespace |
| 1462 } // namespace cc | 1462 } // namespace cc |
| OLD | NEW |