| 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 825 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 836 } | 836 } |
| 837 | 837 |
| 838 void AfterTest() override {} | 838 void AfterTest() override {} |
| 839 | 839 |
| 840 base::Lock activate_count_lock_; | 840 base::Lock activate_count_lock_; |
| 841 int activate_count_; | 841 int activate_count_; |
| 842 scoped_refptr<Layer> root_; | 842 scoped_refptr<Layer> root_; |
| 843 scoped_refptr<TextureLayer> layer_; | 843 scoped_refptr<TextureLayer> layer_; |
| 844 }; | 844 }; |
| 845 | 845 |
| 846 // Flaky on windows. https://crbug.com/641613 |
| 847 #if !defined(OS_WIN) |
| 846 SINGLE_AND_MULTI_THREAD_TEST_F(TextureLayerMailboxIsActivatedDuringCommit); | 848 SINGLE_AND_MULTI_THREAD_TEST_F(TextureLayerMailboxIsActivatedDuringCommit); |
| 849 #endif |
| 847 | 850 |
| 848 class TextureLayerImplWithMailboxTest : public TextureLayerTest { | 851 class TextureLayerImplWithMailboxTest : public TextureLayerTest { |
| 849 protected: | 852 protected: |
| 850 void SetUp() override { | 853 void SetUp() override { |
| 851 TextureLayerTest::SetUp(); | 854 TextureLayerTest::SetUp(); |
| 852 layer_tree_host_ = | 855 layer_tree_host_ = |
| 853 MockLayerTreeHost::Create(&fake_client_, &task_graph_runner_); | 856 MockLayerTreeHost::Create(&fake_client_, &task_graph_runner_); |
| 854 layer_tree_ = layer_tree_host_->GetLayerTree(); | 857 layer_tree_ = layer_tree_host_->GetLayerTree(); |
| 855 host_impl_.SetVisible(true); | 858 host_impl_.SetVisible(true); |
| 856 EXPECT_TRUE(host_impl_.InitializeRenderer(output_surface_.get())); | 859 EXPECT_TRUE(host_impl_.InitializeRenderer(output_surface_.get())); |
| (...skipping 592 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1449 base::ThreadChecker main_thread_; | 1452 base::ThreadChecker main_thread_; |
| 1450 int callback_count_; | 1453 int callback_count_; |
| 1451 scoped_refptr<Layer> root_; | 1454 scoped_refptr<Layer> root_; |
| 1452 scoped_refptr<TextureLayer> layer_; | 1455 scoped_refptr<TextureLayer> layer_; |
| 1453 }; | 1456 }; |
| 1454 | 1457 |
| 1455 SINGLE_AND_MULTI_THREAD_TEST_F(TextureLayerWithMailboxImplThreadDeleted); | 1458 SINGLE_AND_MULTI_THREAD_TEST_F(TextureLayerWithMailboxImplThreadDeleted); |
| 1456 | 1459 |
| 1457 } // namespace | 1460 } // namespace |
| 1458 } // namespace cc | 1461 } // namespace cc |
| OLD | NEW |