Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(173)

Side by Side Diff: cc/trees/layer_tree_host_unittest.cc

Issue 864313004: Disable LayerTreeHostTestDeferCommits since it is flaky on Win. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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.
2079 SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestDeferCommits); 2081 SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestDeferCommits);
2082 #endif
2080 2083
2081 class LayerTreeHostWithProxy : public LayerTreeHost { 2084 class LayerTreeHostWithProxy : public LayerTreeHost {
2082 public: 2085 public:
2083 LayerTreeHostWithProxy(FakeLayerTreeHostClient* client, 2086 LayerTreeHostWithProxy(FakeLayerTreeHostClient* client,
2084 const LayerTreeSettings& settings, 2087 const LayerTreeSettings& settings,
2085 scoped_ptr<FakeProxy> proxy) 2088 scoped_ptr<FakeProxy> proxy)
2086 : LayerTreeHost(client, NULL, NULL, settings) { 2089 : LayerTreeHost(client, NULL, NULL, settings) {
2087 proxy->SetLayerTreeHost(this); 2090 proxy->SetLayerTreeHost(this);
2088 client->SetLayerTreeHost(this); 2091 client->SetLayerTreeHost(this);
2089 InitializeForTesting(proxy.Pass()); 2092 InitializeForTesting(proxy.Pass());
(...skipping 4104 matching lines...) Expand 10 before | Expand all | Expand 10 after
6194 6197
6195 void AfterTest() override { EXPECT_TRUE(did_commit_); } 6198 void AfterTest() override { EXPECT_TRUE(did_commit_); }
6196 6199
6197 private: 6200 private:
6198 bool did_commit_; 6201 bool did_commit_;
6199 }; 6202 };
6200 6203
6201 SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestNoTasksBetweenWillAndDidCommit); 6204 SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestNoTasksBetweenWillAndDidCommit);
6202 6205
6203 } // namespace cc 6206 } // namespace cc
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698