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 d433c424463e12fd7a226eb2a913d3a0c3f91c91..6be91eacae53cf2a4d12906b1e6e8150d04f3250 100644 |
--- a/cc/trees/layer_tree_host_unittest_scroll.cc |
+++ b/cc/trees/layer_tree_host_unittest_scroll.cc |
@@ -450,43 +450,88 @@ class LayerTreeHostScrollTestCaseWithChild |
scoped_refptr<Layer> expected_no_scroll_layer_; |
}; |
-TEST_F(LayerTreeHostScrollTestCaseWithChild, DeviceScaleFactor1_ScrollChild) { |
+TEST_F(LayerTreeHostScrollTestCaseWithChild, |
+ DeviceScaleFactor1_ScrollChild_DirectRenderer) { |
device_scale_factor_ = 1.f; |
scroll_child_layer_ = true; |
- RunTest(true); |
+ RunTest(true, false); |
} |
-TEST_F(LayerTreeHostScrollTestCaseWithChild, DeviceScaleFactor15_ScrollChild) { |
+TEST_F(LayerTreeHostScrollTestCaseWithChild, |
+ DeviceScaleFactor1_ScrollChild_DelegatingRenderer) { |
+ device_scale_factor_ = 1.f; |
+ scroll_child_layer_ = true; |
+ RunTest(true, true); |
+} |
+ |
+TEST_F(LayerTreeHostScrollTestCaseWithChild, |
+ DeviceScaleFactor15_ScrollChild_DirectRenderer) { |
device_scale_factor_ = 1.5f; |
scroll_child_layer_ = true; |
- RunTest(true); |
+ RunTest(true, false); |
} |
-TEST_F(LayerTreeHostScrollTestCaseWithChild, DeviceScaleFactor2_ScrollChild) { |
+TEST_F(LayerTreeHostScrollTestCaseWithChild, |
+ DeviceScaleFactor15_ScrollChild_DelegatingRenderer) { |
+ device_scale_factor_ = 1.5f; |
+ scroll_child_layer_ = true; |
+ RunTest(true, true); |
+} |
+ |
+TEST_F(LayerTreeHostScrollTestCaseWithChild, |
+ DeviceScaleFactor2_ScrollChild_DirectRenderer) { |
device_scale_factor_ = 2.f; |
scroll_child_layer_ = true; |
- RunTest(true); |
+ RunTest(true, false); |
} |
TEST_F(LayerTreeHostScrollTestCaseWithChild, |
- DeviceScaleFactor1_ScrollRootScrollLayer) { |
+ DeviceScaleFactor2_ScrollChild_DelegatingRenderer) { |
+ device_scale_factor_ = 2.f; |
+ scroll_child_layer_ = true; |
+ RunTest(true, true); |
+} |
+ |
+TEST_F(LayerTreeHostScrollTestCaseWithChild, |
+ DeviceScaleFactor1_ScrollRootScrollLayer_DirectRenderer) { |
+ device_scale_factor_ = 1.f; |
+ scroll_child_layer_ = false; |
+ RunTest(true, false); |
+} |
+ |
+TEST_F(LayerTreeHostScrollTestCaseWithChild, |
+ DeviceScaleFactor1_ScrollRootScrollLayer_DelegatingRenderer) { |
device_scale_factor_ = 1.f; |
scroll_child_layer_ = false; |
- RunTest(true); |
+ RunTest(true, true); |
+} |
+ |
+TEST_F(LayerTreeHostScrollTestCaseWithChild, |
+ DeviceScaleFactor15_ScrollRootScrollLayer_DirectRenderer) { |
+ device_scale_factor_ = 1.5f; |
+ scroll_child_layer_ = false; |
+ RunTest(true, false); |
} |
TEST_F(LayerTreeHostScrollTestCaseWithChild, |
- DeviceScaleFactor15_ScrollRootScrollLayer) { |
+ DeviceScaleFactor15_ScrollRootScrollLayer_DelegatingRenderer) { |
device_scale_factor_ = 1.5f; |
scroll_child_layer_ = false; |
- RunTest(true); |
+ RunTest(true, true); |
+} |
+ |
+TEST_F(LayerTreeHostScrollTestCaseWithChild, |
+ DeviceScaleFactor2_ScrollRootScrollLayer_DirectRenderer) { |
+ device_scale_factor_ = 2.f; |
+ scroll_child_layer_ = false; |
+ RunTest(true, false); |
} |
TEST_F(LayerTreeHostScrollTestCaseWithChild, |
- DeviceScaleFactor2_ScrollRootScrollLayer) { |
+ DeviceScaleFactor2_ScrollRootScrollLayer_DelegatingRenderer) { |
device_scale_factor_ = 2.f; |
scroll_child_layer_ = false; |
- RunTest(true); |
+ RunTest(true, true); |
} |
class ImplSidePaintingScrollTest : public LayerTreeHostScrollTest { |