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 2058 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2069 void AfterTest() override { | 2069 void AfterTest() override { |
2070 EXPECT_GE(3, num_will_begin_impl_frame_); | 2070 EXPECT_GE(3, num_will_begin_impl_frame_); |
2071 EXPECT_EQ(2, num_send_begin_main_frame_); | 2071 EXPECT_EQ(2, num_send_begin_main_frame_); |
2072 } | 2072 } |
2073 | 2073 |
2074 private: | 2074 private: |
2075 int num_will_begin_impl_frame_; | 2075 int num_will_begin_impl_frame_; |
2076 int num_send_begin_main_frame_; | 2076 int num_send_begin_main_frame_; |
2077 }; | 2077 }; |
2078 | 2078 |
2079 #if !defined(OS_WIN) | |
2080 // Flaky on Win: crbug/453787. | |
2081 SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestDeferCommits); | 2079 SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestDeferCommits); |
2082 #endif | |
2083 | 2080 |
2084 class LayerTreeHostWithProxy : public LayerTreeHost { | 2081 class LayerTreeHostWithProxy : public LayerTreeHost { |
2085 public: | 2082 public: |
2086 LayerTreeHostWithProxy(FakeLayerTreeHostClient* client, | 2083 LayerTreeHostWithProxy(FakeLayerTreeHostClient* client, |
2087 const LayerTreeSettings& settings, | 2084 const LayerTreeSettings& settings, |
2088 scoped_ptr<FakeProxy> proxy) | 2085 scoped_ptr<FakeProxy> proxy) |
2089 : LayerTreeHost(client, NULL, NULL, settings) { | 2086 : LayerTreeHost(client, NULL, NULL, settings) { |
2090 proxy->SetLayerTreeHost(this); | 2087 proxy->SetLayerTreeHost(this); |
2091 client->SetLayerTreeHost(this); | 2088 client->SetLayerTreeHost(this); |
2092 InitializeForTesting(proxy.Pass()); | 2089 InitializeForTesting(proxy.Pass()); |
(...skipping 4104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6197 | 6194 |
6198 void AfterTest() override { EXPECT_TRUE(did_commit_); } | 6195 void AfterTest() override { EXPECT_TRUE(did_commit_); } |
6199 | 6196 |
6200 private: | 6197 private: |
6201 bool did_commit_; | 6198 bool did_commit_; |
6202 }; | 6199 }; |
6203 | 6200 |
6204 SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestNoTasksBetweenWillAndDidCommit); | 6201 SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestNoTasksBetweenWillAndDidCommit); |
6205 | 6202 |
6206 } // namespace cc | 6203 } // namespace cc |
OLD | NEW |