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

Unified Diff: cc/trees/layer_tree_host_unittest_scroll.cc

Issue 2231233002: cc: Remove the lie of "DirectRenderer" in LayerTreeTests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: no-ltt-delegating: ccpt Created 4 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
« no previous file with comments | « cc/trees/layer_tree_host_unittest_copyrequest.cc ('k') | 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_scroll.cc
diff --git a/cc/trees/layer_tree_host_unittest_scroll.cc b/cc/trees/layer_tree_host_unittest_scroll.cc
index 340c0f2e1de16b95778c562955a2f46b167c25d6..3c2f289c8d9fdf15aa404a8ff0ab869a94784e6f 100644
--- a/cc/trees/layer_tree_host_unittest_scroll.cc
+++ b/cc/trees/layer_tree_host_unittest_scroll.cc
@@ -772,88 +772,43 @@ class LayerTreeHostScrollTestCaseWithChild : public LayerTreeHostScrollTest {
scoped_refptr<Layer> expected_no_scroll_layer_;
};
-TEST_F(LayerTreeHostScrollTestCaseWithChild,
- DeviceScaleFactor1_ScrollChild_DirectRenderer) {
+TEST_F(LayerTreeHostScrollTestCaseWithChild, DeviceScaleFactor1_ScrollChild) {
device_scale_factor_ = 1.f;
scroll_child_layer_ = true;
- RunTest(CompositorMode::THREADED, false);
+ RunTest(CompositorMode::THREADED);
}
-TEST_F(LayerTreeHostScrollTestCaseWithChild,
- DeviceScaleFactor1_ScrollChild_DelegatingRenderer) {
- device_scale_factor_ = 1.f;
- scroll_child_layer_ = true;
- RunTest(CompositorMode::THREADED, true);
-}
-
-TEST_F(LayerTreeHostScrollTestCaseWithChild,
- DeviceScaleFactor15_ScrollChild_DirectRenderer) {
+TEST_F(LayerTreeHostScrollTestCaseWithChild, DeviceScaleFactor15_ScrollChild) {
device_scale_factor_ = 1.5f;
scroll_child_layer_ = true;
- RunTest(CompositorMode::THREADED, false);
+ RunTest(CompositorMode::THREADED);
}
-TEST_F(LayerTreeHostScrollTestCaseWithChild,
- DeviceScaleFactor15_ScrollChild_DelegatingRenderer) {
- device_scale_factor_ = 1.5f;
- scroll_child_layer_ = true;
- RunTest(CompositorMode::THREADED, true);
-}
-
-TEST_F(LayerTreeHostScrollTestCaseWithChild,
- DeviceScaleFactor2_ScrollChild_DirectRenderer) {
+TEST_F(LayerTreeHostScrollTestCaseWithChild, DeviceScaleFactor2_ScrollChild) {
device_scale_factor_ = 2.f;
scroll_child_layer_ = true;
- RunTest(CompositorMode::THREADED, false);
+ RunTest(CompositorMode::THREADED);
}
TEST_F(LayerTreeHostScrollTestCaseWithChild,
- DeviceScaleFactor2_ScrollChild_DelegatingRenderer) {
- device_scale_factor_ = 2.f;
- scroll_child_layer_ = true;
- RunTest(CompositorMode::THREADED, true);
-}
-
-TEST_F(LayerTreeHostScrollTestCaseWithChild,
- DeviceScaleFactor1_ScrollRootScrollLayer_DirectRenderer) {
- device_scale_factor_ = 1.f;
- scroll_child_layer_ = false;
- RunTest(CompositorMode::THREADED, false);
-}
-
-TEST_F(LayerTreeHostScrollTestCaseWithChild,
- DeviceScaleFactor1_ScrollRootScrollLayer_DelegatingRenderer) {
+ DeviceScaleFactor1_ScrollRootScrollLayer) {
device_scale_factor_ = 1.f;
scroll_child_layer_ = false;
- RunTest(CompositorMode::THREADED, true);
-}
-
-TEST_F(LayerTreeHostScrollTestCaseWithChild,
- DeviceScaleFactor15_ScrollRootScrollLayer_DirectRenderer) {
- device_scale_factor_ = 1.5f;
- scroll_child_layer_ = false;
- RunTest(CompositorMode::THREADED, false);
+ RunTest(CompositorMode::THREADED);
}
TEST_F(LayerTreeHostScrollTestCaseWithChild,
- DeviceScaleFactor15_ScrollRootScrollLayer_DelegatingRenderer) {
+ DeviceScaleFactor15_ScrollRootScrollLayer) {
device_scale_factor_ = 1.5f;
scroll_child_layer_ = false;
- RunTest(CompositorMode::THREADED, true);
-}
-
-TEST_F(LayerTreeHostScrollTestCaseWithChild,
- DeviceScaleFactor2_ScrollRootScrollLayer_DirectRenderer) {
- device_scale_factor_ = 2.f;
- scroll_child_layer_ = false;
- RunTest(CompositorMode::THREADED, false);
+ RunTest(CompositorMode::THREADED);
}
TEST_F(LayerTreeHostScrollTestCaseWithChild,
- DeviceScaleFactor2_ScrollRootScrollLayer_DelegatingRenderer) {
+ DeviceScaleFactor2_ScrollRootScrollLayer) {
device_scale_factor_ = 2.f;
scroll_child_layer_ = false;
- RunTest(CompositorMode::THREADED, true);
+ RunTest(CompositorMode::THREADED);
}
class LayerTreeHostScrollTestSimple : public LayerTreeHostScrollTest {
@@ -1497,12 +1452,12 @@ class LayerTreeHostScrollTestLayerStructureChange
};
TEST_F(LayerTreeHostScrollTestLayerStructureChange, ScrollDestroyLayer) {
- RunTest(CompositorMode::THREADED, false);
+ RunTest(CompositorMode::THREADED);
}
TEST_F(LayerTreeHostScrollTestLayerStructureChange, ScrollDestroyWholeTree) {
scroll_destroy_whole_tree_ = true;
- RunTest(CompositorMode::THREADED, false);
+ RunTest(CompositorMode::THREADED);
}
class LayerTreeHostScrollTestScrollMFBA : public LayerTreeHostScrollTest {
« no previous file with comments | « cc/trees/layer_tree_host_unittest_copyrequest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698