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

Unified Diff: cc/trees/layer_tree_host_unittest.cc

Issue 508373002: cc: Single-threaded impl-side painting for unit tests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 4 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 side-by-side diff with in-line comments
Download patch
Index: cc/trees/layer_tree_host_unittest.cc
diff --git a/cc/trees/layer_tree_host_unittest.cc b/cc/trees/layer_tree_host_unittest.cc
index 1fd7f6e2355bf15323858f310a34e2dbf61f7a9a..a9203f4a61eb876a5c5859e98497356f442363b6 100644
--- a/cc/trees/layer_tree_host_unittest.cc
+++ b/cc/trees/layer_tree_host_unittest.cc
@@ -529,7 +529,10 @@ class LayerTreeHostTestSetNextCommitForcesRedraw : public LayerTreeHostTest {
scoped_refptr<ContentLayer> root_layer_;
};
-SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestSetNextCommitForcesRedraw);
+// This test does not make sense in the single-threaded impl-side painting
enne (OOO) 2014/08/27 23:53:38 These two tests are the only ones that called Bloc
danakj 2014/09/03 17:01:31 I like the sound of that idea.
enne (OOO) 2014/09/03 19:41:28 Done.
+// configuration, as activation cannot fail.
+MULTI_THREAD_TEST_F(LayerTreeHostTestSetNextCommitForcesRedraw);
+SINGLE_THREAD_NOIMPL_TEST_F(LayerTreeHostTestSetNextCommitForcesRedraw);
// Tests that if a layer is not drawn because of some reason in the parent then
// its damage is preserved until the next time it is drawn.
@@ -777,7 +780,10 @@ class LayerTreeHostTestFrameTimeUpdatesAfterActivationFails
base::TimeTicks first_frame_time_;
};
-SINGLE_AND_MULTI_THREAD_TEST_F(
+// This test does not make sense in the single-threaded impl-side painting
+// configuration, as activation cannot fail.
+MULTI_THREAD_TEST_F(LayerTreeHostTestFrameTimeUpdatesAfterActivationFails);
+SINGLE_THREAD_NOIMPL_TEST_F(
LayerTreeHostTestFrameTimeUpdatesAfterActivationFails);
// This test verifies that LayerTreeHostImpl's current frame time gets
@@ -2219,7 +2225,7 @@ class LayerTreeHostTestLCDNotification : public LayerTreeHostTest {
NotificationClient client_;
};
-SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestLCDNotification);
+SINGLE_THREAD_NOIMPL_TEST_F(LayerTreeHostTestLCDNotification);
danakj 2014/09/03 17:01:32 Why this? What happened to MULTI?
enne (OOO) 2014/09/03 19:41:28 Fixed.
// Verify that the BeginFrame notification is used to initiate rendering.
class LayerTreeHostTestBeginFrameNotification : public LayerTreeHostTest {
@@ -2433,7 +2439,8 @@ class LayerTreeHostTestChangeLayerPropertiesInPaintContents
int num_commits_;
};
-SINGLE_THREAD_TEST_F(LayerTreeHostTestChangeLayerPropertiesInPaintContents);
+SINGLE_THREAD_NOIMPL_TEST_F(
danakj 2014/09/03 17:01:32 can this be SINGLE_AND_MULTI_IMPL after all that?
enne (OOO) 2014/09/03 19:41:28 Made it SINGLE_AND_MULTI instead.
+ LayerTreeHostTestChangeLayerPropertiesInPaintContents);
class MockIOSurfaceWebGraphicsContext3D : public TestWebGraphicsContext3D {
public:

Powered by Google App Engine
This is Rietveld 408576698