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

Unified Diff: cc/trees/layer_tree_host_unittest_scroll.cc

Issue 1783613004: CC Animation: Erase cc::LayerSettings everywhere. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@eraseandroid
Patch Set: Rebase. Created 4 years, 9 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_scroll.cc
diff --git a/cc/trees/layer_tree_host_unittest_scroll.cc b/cc/trees/layer_tree_host_unittest_scroll.cc
index 4df2e0b4d7fce179cba96d6db899656b98359d7e..6e1cdff3b5e76be345ad591e0348c42989256b17 100644
--- a/cc/trees/layer_tree_host_unittest_scroll.cc
+++ b/cc/trees/layer_tree_host_unittest_scroll.cc
@@ -70,12 +70,9 @@ class LayerTreeHostScrollTest : public LayerTreeTest {
gfx::Size scroll_layer_bounds(root_layer->bounds().width() + 100,
root_layer->bounds().height() + 100);
- CreateVirtualViewportLayers(root_layer,
- root_layer->bounds(),
- root_layer->bounds(),
- scroll_layer_bounds,
- layer_tree_host(),
- layer_settings());
+ CreateVirtualViewportLayers(root_layer, root_layer->bounds(),
+ root_layer->bounds(), scroll_layer_bounds,
+ layer_tree_host());
}
};
@@ -506,25 +503,19 @@ class LayerTreeHostScrollTestCaseWithChild : public LayerTreeHostScrollTest {
void SetupTree() override {
layer_tree_host()->SetDeviceScaleFactor(device_scale_factor_);
- scoped_refptr<Layer> root_layer = Layer::Create(layer_settings());
+ scoped_refptr<Layer> root_layer = Layer::Create();
root_layer->SetBounds(gfx::Size(10, 10));
- root_scroll_layer_ =
- FakePictureLayer::Create(layer_settings(), &fake_content_layer_client_);
+ root_scroll_layer_ = FakePictureLayer::Create(&fake_content_layer_client_);
root_scroll_layer_->SetBounds(gfx::Size(110, 110));
root_scroll_layer_->SetPosition(gfx::PointF());
root_scroll_layer_->SetIsDrawable(true);
- CreateVirtualViewportLayers(root_layer.get(),
- root_scroll_layer_,
- root_layer->bounds(),
- root_layer->bounds(),
- layer_tree_host(),
- layer_settings());
+ CreateVirtualViewportLayers(root_layer.get(), root_scroll_layer_,
+ root_layer->bounds(), root_layer->bounds(),
+ layer_tree_host());
-
- child_layer_ =
- FakePictureLayer::Create(layer_settings(), &fake_content_layer_client_);
+ child_layer_ = FakePictureLayer::Create(&fake_content_layer_client_);
child_layer_->set_did_scroll_callback(
base::Bind(&LayerTreeHostScrollTestCaseWithChild::DidScroll,
base::Unretained(this)));
@@ -1334,12 +1325,9 @@ class LayerTreeHostScrollTestLayerStructureChange
Layer* root_layer = layer_tree_host()->root_layer();
root_layer->SetBounds(gfx::Size(10, 10));
- CreateVirtualViewportLayers(root_layer,
- root_layer->bounds(),
- root_layer->bounds(),
- root_layer->bounds(),
- layer_tree_host(),
- layer_settings());
+ CreateVirtualViewportLayers(root_layer, root_layer->bounds(),
+ root_layer->bounds(), root_layer->bounds(),
+ layer_tree_host());
Layer* outer_scroll_layer =
layer_tree_host()->outer_viewport_scroll_layer();
@@ -1393,7 +1381,7 @@ class LayerTreeHostScrollTestLayerStructureChange
Layer* CreateScrollLayer(Layer* parent, FakeLayerScrollClient* client) {
scoped_refptr<PictureLayer> scroll_layer =
- PictureLayer::Create(layer_settings(), &fake_content_layer_client_);
+ PictureLayer::Create(&fake_content_layer_client_);
scroll_layer->SetBounds(gfx::Size(110, 110));
scroll_layer->SetPosition(gfx::PointF());
scroll_layer->SetIsDrawable(true);

Powered by Google App Engine
This is Rietveld 408576698