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

Unified Diff: cc/trees/layer_tree_host_unittest.cc

Issue 2456093003: Enable more layer_tree_host_unittest for LayerTreeHostRemote. (Closed)
Patch Set: Created 4 years, 2 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 d5acd402682bad7c79a0606114707e347f2b4db7..aa1be4ca29b593ea3da87569b14deba7474d63d4 100644
--- a/cc/trees/layer_tree_host_unittest.cc
+++ b/cc/trees/layer_tree_host_unittest.cc
@@ -287,10 +287,7 @@ class LayerTreeHostTestReadyToActivateNonEmpty
// No single thread test because the commit goes directly to the active tree in
// single thread mode, so notify ready to activate is skipped.
-// No remote test because we currently don't deserialize FakePictureLayer,
-// so on the impl side, PictureLayerImpl is created instead of
-// FakePictureLayerImpl, see crbug/657871.
-MULTI_THREAD_TEST_F(LayerTreeHostTestReadyToActivateNonEmpty);
+REMOTE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestReadyToActivateNonEmpty);
// Test if the LTHI receives ReadyToDraw notifications from the TileManager when
// no raster tasks get scheduled.
@@ -1624,7 +1621,7 @@ class LayerTreeHostTestGpuRasterDeviceSizeChanged : public LayerTreeHostTest {
// As there's no pending tree in single-threaded case, this test should run
// only for multi-threaded case.
-MULTI_THREAD_TEST_F(LayerTreeHostTestGpuRasterDeviceSizeChanged);
+REMOTE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestGpuRasterDeviceSizeChanged);
class LayerTreeHostTestNoExtraCommitFromInvalidate : public LayerTreeHostTest {
public:
@@ -1674,7 +1671,7 @@ class LayerTreeHostTestNoExtraCommitFromInvalidate : public LayerTreeHostTest {
scoped_refptr<Layer> scaled_layer_;
};
-SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestNoExtraCommitFromInvalidate);
+SINGLE_MULTI_AND_REMOTE_TEST_F(LayerTreeHostTestNoExtraCommitFromInvalidate);
class LayerTreeHostTestNoExtraCommitFromScrollbarInvalidate
: public LayerTreeHostTest {
@@ -1731,6 +1728,8 @@ class LayerTreeHostTestNoExtraCommitFromScrollbarInvalidate
scoped_refptr<FakePaintedScrollbarLayer> scrollbar_;
};
+// No remote test here because PaintedScrollbarLayer is not supported by LTH
+// remote.
SINGLE_AND_MULTI_THREAD_TEST_F(
LayerTreeHostTestNoExtraCommitFromScrollbarInvalidate);
@@ -1798,7 +1797,7 @@ class LayerTreeHostTestDeviceScaleFactorChange : public LayerTreeHostTest {
scoped_refptr<Layer> child_layer_;
};
-SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestDeviceScaleFactorChange);
+SINGLE_MULTI_AND_REMOTE_TEST_F(LayerTreeHostTestDeviceScaleFactorChange);
class LayerTreeHostTestDeviceColorSpaceChange : public LayerTreeHostTest {
public:
@@ -1921,6 +1920,9 @@ class LayerTreeHostTestDeviceColorSpaceChange : public LayerTreeHostTest {
scoped_refptr<Layer> child_layer_;
};
+// No remote test because LTH remote doesn't serialize device_color_space, so
+// LTH in process will always use the default color space here.
+// see crbug/658786.
SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestDeviceColorSpaceChange);
class LayerTreeHostTestSetNextCommitForcesRedraw : public LayerTreeHostTest {
@@ -2011,6 +2013,7 @@ class LayerTreeHostTestSetNextCommitForcesRedraw : public LayerTreeHostTest {
// This test blocks activation which is not supported for single thread mode.
MULTI_THREAD_BLOCKNOTIFY_TEST_F(LayerTreeHostTestSetNextCommitForcesRedraw);
+REMOTE_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.
@@ -2107,7 +2110,7 @@ class LayerTreeHostTestUndrawnLayersDamageLater : public LayerTreeHostTest {
scoped_refptr<FakePictureLayer> child_layer_;
};
-SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestUndrawnLayersDamageLater);
+SINGLE_MULTI_AND_REMOTE_TEST_F(LayerTreeHostTestUndrawnLayersDamageLater);
// 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.
@@ -2212,7 +2215,7 @@ class LayerTreeHostTestDamageWithScale : public LayerTreeHostTest {
scoped_refptr<Layer> child_layer_;
};
-SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestDamageWithScale);
+SINGLE_MULTI_AND_REMOTE_TEST_F(LayerTreeHostTestDamageWithScale);
// This test verifies that properties on the layer tree host are commited
// to the impl side.
@@ -2256,7 +2259,7 @@ class LayerTreeHostTestCommit : public LayerTreeHostTest {
void AfterTest() override {}
};
-MULTI_THREAD_TEST_F(LayerTreeHostTestCommit);
+REMOTE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestCommit);
// This test verifies that LayerTreeHostImpl's current frame time gets
// updated in consecutive frames when it doesn't draw due to tree
@@ -2314,6 +2317,7 @@ class LayerTreeHostTestFrameTimeUpdatesAfterActivationFails
// This test blocks activation which is not supported for single thread mode.
MULTI_THREAD_BLOCKNOTIFY_TEST_F(
LayerTreeHostTestFrameTimeUpdatesAfterActivationFails);
+REMOTE_TEST_F(LayerTreeHostTestFrameTimeUpdatesAfterActivationFails);
// This test verifies that LayerTreeHostImpl's current frame time gets
// updated in consecutive frames when it draws in each frame.
@@ -2362,7 +2366,7 @@ class LayerTreeHostTestFrameTimeUpdatesAfterDraw : public LayerTreeHostTest {
base::TimeTicks first_frame_time_;
};
-SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestFrameTimeUpdatesAfterDraw);
+SINGLE_MULTI_AND_REMOTE_TEST_F(LayerTreeHostTestFrameTimeUpdatesAfterDraw);
// Verifies that StartPageScaleAnimation events propagate correctly
// from LayerTreeHost to LayerTreeHostImpl in the MT compositor.
@@ -2440,6 +2444,7 @@ class LayerTreeHostTestStartPageScaleAnimation : public LayerTreeHostTest {
};
// Single thread proxy does not support impl-side page scale changes.
+// Remote test does not support page scale animation.
MULTI_THREAD_TEST_F(LayerTreeHostTestStartPageScaleAnimation);
class LayerTreeHostTestSetVisible : public LayerTreeHostTest {
@@ -2470,7 +2475,7 @@ class LayerTreeHostTestSetVisible : public LayerTreeHostTest {
int num_draws_;
};
-MULTI_THREAD_TEST_F(LayerTreeHostTestSetVisible);
+REMOTE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestSetVisible);
class LayerTreeHostTestDeviceScaleFactorScalesViewportAndLayers
: public LayerTreeHostTest {
@@ -2572,7 +2577,8 @@ class LayerTreeHostTestDeviceScaleFactorScalesViewportAndLayers
scoped_refptr<FakePictureLayer> child_layer_;
};
-MULTI_THREAD_TEST_F(LayerTreeHostTestDeviceScaleFactorScalesViewportAndLayers);
+REMOTE_AND_MULTI_THREAD_TEST_F(
+ LayerTreeHostTestDeviceScaleFactorScalesViewportAndLayers);
class LayerTreeHostTestContinuousInvalidate : public LayerTreeHostTest {
public:
@@ -2622,7 +2628,7 @@ class LayerTreeHostTestContinuousInvalidate : public LayerTreeHostTest {
int num_draw_layers_;
};
-SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestContinuousInvalidate);
+SINGLE_MULTI_AND_REMOTE_TEST_F(LayerTreeHostTestContinuousInvalidate);
class LayerTreeHostTestDeferCommits : public LayerTreeHostTest {
public:
@@ -2680,7 +2686,7 @@ class LayerTreeHostTestDeferCommits : public LayerTreeHostTest {
int num_send_begin_main_frame_;
};
-SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestDeferCommits);
+SINGLE_MULTI_AND_REMOTE_TEST_F(LayerTreeHostTestDeferCommits);
class LayerTreeHostTestCompositeImmediatelyStateTransitions
: public LayerTreeHostTest {
@@ -2839,7 +2845,7 @@ class LayerTreeHostTestLCDChange : public LayerTreeHostTest {
int num_tiles_rastered_;
};
-SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestLCDChange);
+SINGLE_MULTI_AND_REMOTE_TEST_F(LayerTreeHostTestLCDChange);
class LayerTreeHostTestBeginFrameNotificationShutdownWhileEnabled
: public LayerTreeHostTest {
@@ -2861,6 +2867,8 @@ class LayerTreeHostTestBeginFrameNotificationShutdownWhileEnabled
void AfterTest() override {}
};
+// No remote test since synchronous renderer compositor is not supported for LTH
+// remote.
MULTI_THREAD_TEST_F(
LayerTreeHostTestBeginFrameNotificationShutdownWhileEnabled);
@@ -2985,6 +2993,8 @@ class LayerTreeHostTestAbortedCommitDoesntStallSynchronousCompositor
OnDrawCompositorFrameSink* compositor_frame_sink_ = nullptr;
};
+// No remote test since synchronous renderer compositor is not supported for LTH
+// remote.
MULTI_THREAD_TEST_F(
LayerTreeHostTestAbortedCommitDoesntStallSynchronousCompositor);
@@ -3012,7 +3022,7 @@ class LayerTreeHostTestUninvertibleTransformDoesNotBlockActivation
FakeContentLayerClient client_;
};
-SINGLE_AND_MULTI_THREAD_TEST_F(
+SINGLE_MULTI_AND_REMOTE_TEST_F(
LayerTreeHostTestUninvertibleTransformDoesNotBlockActivation);
class LayerTreeHostTestNumFramesPending : public LayerTreeHostTest {
@@ -3061,7 +3071,7 @@ class LayerTreeHostTestNumFramesPending : public LayerTreeHostTest {
int frame_;
};
-SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestNumFramesPending);
+SINGLE_MULTI_AND_REMOTE_TEST_F(LayerTreeHostTestNumFramesPending);
class LayerTreeHostTestResourcelessSoftwareDraw : public LayerTreeHostTest {
protected:
@@ -3167,6 +3177,8 @@ class LayerTreeHostTestResourcelessSoftwareDraw : public LayerTreeHostTest {
};
// Resourceless is not used for SingleThreadProxy, so it is unimplemented.
+// No remote test since synchronous renderer compositor is not supported for LTH
+// remote.
MULTI_THREAD_TEST_F(LayerTreeHostTestResourcelessSoftwareDraw);
// Test for UI Resource management.
@@ -3263,6 +3275,8 @@ class LayerTreeHostTestUIResource : public LayerTreeHostTest {
int num_ui_resources_;
};
+// No remote test since LTH remote does not support UIResourceLayers and
+// PaintedScrollbarLayers, which uses UIResourceManager.
MULTI_THREAD_TEST_F(LayerTreeHostTestUIResource);
class PushPropertiesCountingLayerImpl : public LayerImpl {
@@ -3542,6 +3556,9 @@ class LayerTreeHostTestLayersPushProperties : public LayerTreeHostTest {
size_t expected_push_properties_leaf_layer_;
};
+// No remote test because LTH remote serializes the layers that needs to push
+// property into protos, but does not directly call PushPropertiesTo to sync
+// states to the impl side. See crbug/658913.
MULTI_THREAD_TEST_F(LayerTreeHostTestLayersPushProperties);
class LayerTreeHostTestImplLayersPushProperties
@@ -3739,6 +3756,9 @@ class LayerTreeHostTestImplLayersPushProperties
};
// In single thread there's no pending tree to push properties from.
+// No remote test because LTH remote serializes the layers that needs to push
+// property into protos, but does not directly call PushPropertiesTo to sync
+// states to the impl side. See crbug/658913.
MULTI_THREAD_TEST_F(LayerTreeHostTestImplLayersPushProperties);
class LayerTreeHostTestPropertyChangesDuringUpdateArePushed
@@ -3796,6 +3816,7 @@ class LayerTreeHostTestPropertyChangesDuringUpdateArePushed
scoped_refptr<FakePaintedScrollbarLayer> scrollbar_layer_;
};
+// No remote test since remote LTH does not support PaintedScrollbarLayer.
MULTI_THREAD_TEST_F(LayerTreeHostTestPropertyChangesDuringUpdateArePushed);
class LayerTreeHostTestSetDrawableCausesCommit : public LayerTreeHostTest {
@@ -3856,6 +3877,9 @@ class LayerTreeHostTestSetDrawableCausesCommit : public LayerTreeHostTest {
scoped_refptr<PushPropertiesCountingLayer> child_;
};
+// No remote test because LTH remote serializes the layers that needs to push
+// property into protos, but does not directly call PushPropertiesTo to sync
+// states to the impl side. See crbug/658913.
MULTI_THREAD_TEST_F(LayerTreeHostTestSetDrawableCausesCommit);
class LayerTreeHostTestCasePushPropertiesThreeGrandChildren
@@ -3929,6 +3953,9 @@ class LayerTreeHostTestPushPropertiesAddingToTreeRequiresPush
}
};
+// No remote test because LTH remote serializes the layers that needs to push
+// property into protos, but does not directly call PushPropertiesTo to sync
+// states to the impl side. See crbug/658913.
MULTI_THREAD_TEST_F(LayerTreeHostTestPushPropertiesAddingToTreeRequiresPush);
class LayerTreeHostTestPushPropertiesRemovingChildStopsRecursion
@@ -4012,7 +4039,8 @@ class LayerTreeHostTestPushPropertiesRemovingChildStopsRecursion
}
};
-MULTI_THREAD_TEST_F(LayerTreeHostTestPushPropertiesRemovingChildStopsRecursion);
+REMOTE_AND_MULTI_THREAD_TEST_F(
+ LayerTreeHostTestPushPropertiesRemovingChildStopsRecursion);
class LayerTreeHostTestPushPropertiesRemovingChildStopsRecursionWithPersistence
: public LayerTreeHostTestCasePushPropertiesThreeGrandChildren {
@@ -4060,6 +4088,9 @@ class LayerTreeHostTestPushPropertiesRemovingChildStopsRecursionWithPersistence
}
};
+// No remote test because persist_needs_push_properties_ is used in
+// PushPropertiesTo, and LTH remote does not directly call PushPropertiesTo to
+// synchronize states to the impl side. See crbug/658913.
MULTI_THREAD_TEST_F(
LayerTreeHostTestPushPropertiesRemovingChildStopsRecursionWithPersistence);
@@ -4129,7 +4160,7 @@ class LayerTreeHostTestPushPropertiesSetPropertiesWhileOutsideTree
}
};
-MULTI_THREAD_TEST_F(
+REMOTE_AND_MULTI_THREAD_TEST_F(
LayerTreeHostTestPushPropertiesSetPropertiesWhileOutsideTree);
class LayerTreeHostTestPushPropertiesSetPropertyInParentThenChild
@@ -4194,7 +4225,7 @@ class LayerTreeHostTestPushPropertiesSetPropertyInParentThenChild
}
};
-MULTI_THREAD_TEST_F(
+REMOTE_AND_MULTI_THREAD_TEST_F(
LayerTreeHostTestPushPropertiesSetPropertyInParentThenChild);
class LayerTreeHostTestPushPropertiesSetPropertyInChildThenParent
@@ -4259,7 +4290,7 @@ class LayerTreeHostTestPushPropertiesSetPropertyInChildThenParent
}
};
-MULTI_THREAD_TEST_F(
+REMOTE_AND_MULTI_THREAD_TEST_F(
LayerTreeHostTestPushPropertiesSetPropertyInChildThenParent);
// This test verifies that the tree activation callback is invoked correctly.
@@ -4318,7 +4349,7 @@ class LayerTreeHostTestTreeActivationCallback : public LayerTreeHostTest {
int callback_count_;
};
-SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestTreeActivationCallback);
+SINGLE_MULTI_AND_REMOTE_TEST_F(LayerTreeHostTestTreeActivationCallback);
class LayerInvalidateCausesDraw : public LayerTreeHostTest {
public:
@@ -4381,6 +4412,7 @@ class LayerTreeHostTestVideoLayerInvalidate : public LayerInvalidateCausesDraw {
FakeVideoFrameProvider provider_;
};
+// LTH remote does not support VideoLayer.
SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestVideoLayerInvalidate);
class LayerTreeHostTestPushHiddenLayer : public LayerTreeHostTest {
@@ -4448,7 +4480,7 @@ class LayerTreeHostTestPushHiddenLayer : public LayerTreeHostTest {
scoped_refptr<SolidColorLayer> child_layer_;
};
-SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestPushHiddenLayer);
+SINGLE_MULTI_AND_REMOTE_TEST_F(LayerTreeHostTestPushHiddenLayer);
class LayerTreeHostTestUpdateLayerInEmptyViewport : public LayerTreeHostTest {
protected:
@@ -4481,7 +4513,7 @@ class LayerTreeHostTestUpdateLayerInEmptyViewport : public LayerTreeHostTest {
scoped_refptr<FakePictureLayer> root_layer_;
};
-MULTI_THREAD_TEST_F(LayerTreeHostTestUpdateLayerInEmptyViewport);
+REMOTE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestUpdateLayerInEmptyViewport);
class LayerTreeHostTestElasticOverscroll : public LayerTreeHostTest {
public:
@@ -4576,6 +4608,7 @@ class LayerTreeHostTestElasticOverscroll : public LayerTreeHostTest {
int num_draws_;
};
+// Remote test does not support enable_elastic_overscroll.
MULTI_THREAD_TEST_F(LayerTreeHostTestElasticOverscroll);
struct TestSwapPromiseResult {
@@ -4680,6 +4713,9 @@ class PinnedLayerTreeSwapPromise : public LayerTreeHostTest {
TestSwapPromiseResult pinned_active_swap_promise_result_;
};
+// No remote test because this test compares the swap promises result between
+// LTH in process and LTH impl. LTH remote runs its own swap promise, and we
+// don't send swap promises to the client.
MULTI_THREAD_TEST_F(PinnedLayerTreeSwapPromise);
class LayerTreeHostTestBreakSwapPromise : public LayerTreeHostTest {
@@ -4777,6 +4813,8 @@ class LayerTreeHostTestBreakSwapPromise : public LayerTreeHostTest {
TestSwapPromiseResult swap_promise_result_[3];
};
+// No remote test because LTH remote runs its own swap promises, and we
+// don't send swap promises to the LTH in process on the client side.
MULTI_THREAD_TEST_F(LayerTreeHostTestBreakSwapPromise);
class LayerTreeHostTestKeepSwapPromise : public LayerTreeHostTest {
@@ -4868,6 +4906,8 @@ class LayerTreeHostTestKeepSwapPromise : public LayerTreeHostTest {
TestSwapPromiseResult swap_promise_result_;
};
+// No remote test because LTH remote runs its own swap promises, and we
+// don't send swap promises to the LTH in process on the client side.
SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestKeepSwapPromise);
class LayerTreeHostTestKeepSwapPromiseMFBA : public LayerTreeHostTest {
@@ -4982,6 +5022,8 @@ class LayerTreeHostTestKeepSwapPromiseMFBA : public LayerTreeHostTest {
TestSwapPromiseResult swap_promise_result_;
};
+// No remote test because LTH remote runs its own swap promises, and we
+// don't send swap promises to the LTH in process on the client side.
MULTI_THREAD_TEST_F(LayerTreeHostTestKeepSwapPromiseMFBA);
class LayerTreeHostTestBreakSwapPromiseForVisibility
@@ -5024,6 +5066,8 @@ class LayerTreeHostTestBreakSwapPromiseForVisibility
TestSwapPromiseResult swap_promise_result_;
};
+// No remote test because LTH remote runs its own swap promises, and we
+// don't send swap promises to the LTH in process on the client side.
SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestBreakSwapPromiseForVisibility);
class SimpleSwapPromiseMonitor : public SwapPromiseMonitor {
@@ -5107,6 +5151,8 @@ class LayerTreeHostTestSimpleSwapPromiseMonitor : public LayerTreeHostTest {
void AfterTest() override {}
};
+// No remote test because LTH remote runs its own swap promises, and we
+// don't send swap promises to the LTH in process on the client side.
SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestSimpleSwapPromiseMonitor);
class LayerTreeHostTestHighResRequiredAfterEvictingUIResources
@@ -5328,6 +5374,8 @@ class LayerTreeHostTestGpuRasterizationEnabled : public LayerTreeHostTest {
FakeRecordingSource* recording_source_;
};
+// No remote test since we does not send gpu rasterization flag to the client.
+// See crbug/650431.
MULTI_THREAD_TEST_F(LayerTreeHostTestGpuRasterizationEnabled);
class LayerTreeHostTestGpuRasterizationReenabled : public LayerTreeHostTest {
« 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