summaryrefslogtreecommitdiffstats
path: root/cc/trees/layer_tree_host_unittest_damage.cc
diff options
context:
space:
mode:
authorloyso <loyso@chromium.org>2015-05-24 20:26:44 -0700
committerCommit bot <commit-bot@chromium.org>2015-05-25 03:27:26 +0000
commita6edaaff54e9b948c64a896edff992c04e63205d (patch)
treeaf7fe7c050ec5d675d33d3d92acb69170b0a29ed /cc/trees/layer_tree_host_unittest_damage.cc
parent6f6374ee312ec0f8e07e208056a8f9135d97087f (diff)
downloadchromium_src-a6edaaff54e9b948c64a896edff992c04e63205d.zip
chromium_src-a6edaaff54e9b948c64a896edff992c04e63205d.tar.gz
chromium_src-a6edaaff54e9b948c64a896edff992c04e63205d.tar.bz2
CC: Plumb LayerSettings parameter for cc::Layer construction.
Next episode: https://codereview.chromium.org/1101823002/ This is a prerequisite to implement compositor animation timelines. https://codereview.chromium.org/947033002/ BUG=394777 R=ajuma@chromium.org R=vollick@chromium.org R=piman@chromium.org R=danakj@chromium.org CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel Review URL: https://codereview.chromium.org/1122393003 Cr-Commit-Position: refs/heads/master@{#331256}
Diffstat (limited to 'cc/trees/layer_tree_host_unittest_damage.cc')
-rw-r--r--cc/trees/layer_tree_host_unittest_damage.cc26
1 files changed, 15 insertions, 11 deletions
diff --git a/cc/trees/layer_tree_host_unittest_damage.cc b/cc/trees/layer_tree_host_unittest_damage.cc
index daff40b..db00fb5 100644
--- a/cc/trees/layer_tree_host_unittest_damage.cc
+++ b/cc/trees/layer_tree_host_unittest_damage.cc
@@ -28,7 +28,8 @@ class LayerTreeHostDamageTestSetNeedsRedraw
: public LayerTreeHostDamageTest {
void SetupTree() override {
// Viewport is 10x10.
- scoped_refptr<FakeContentLayer> root = FakeContentLayer::Create(&client_);
+ scoped_refptr<FakeContentLayer> root =
+ FakeContentLayer::Create(layer_settings(), &client_);
root->SetBounds(gfx::Size(10, 10));
layer_tree_host()->SetRootLayer(root);
@@ -89,7 +90,8 @@ class LayerTreeHostDamageTestSetViewportSize
: public LayerTreeHostDamageTest {
void SetupTree() override {
// Viewport is 10x10.
- scoped_refptr<FakeContentLayer> root = FakeContentLayer::Create(&client_);
+ scoped_refptr<FakeContentLayer> root =
+ FakeContentLayer::Create(layer_settings(), &client_);
root->SetBounds(gfx::Size(10, 10));
layer_tree_host()->SetRootLayer(root);
@@ -155,11 +157,12 @@ class LayerTreeHostDamageTestNoDamageDoesNotSwap
}
void SetupTree() override {
- scoped_refptr<FakeContentLayer> root = FakeContentLayer::Create(&client_);
+ scoped_refptr<FakeContentLayer> root =
+ FakeContentLayer::Create(layer_settings(), &client_);
root->SetBounds(gfx::Size(10, 10));
// Most of the layer isn't visible.
- content_ = FakeContentLayer::Create(&client_);
+ content_ = FakeContentLayer::Create(layer_settings(), &client_);
content_->SetBounds(gfx::Size(2000, 100));
root->AddChild(content_);
@@ -240,8 +243,8 @@ class LayerTreeHostDamageTestForcedFullDamage : public LayerTreeHostDamageTest {
void BeginTest() override { PostSetNeedsCommitToMainThread(); }
void SetupTree() override {
- root_ = FakeContentLayer::Create(&client_);
- child_ = FakeContentLayer::Create(&client_);
+ root_ = FakeContentLayer::Create(layer_settings(), &client_);
+ child_ = FakeContentLayer::Create(layer_settings(), &client_);
root_->SetBounds(gfx::Size(500, 500));
child_->SetPosition(gfx::Point(100, 100));
@@ -349,13 +352,14 @@ SINGLE_AND_MULTI_THREAD_NOIMPL_TEST_F(LayerTreeHostDamageTestForcedFullDamage);
class LayerTreeHostScrollbarDamageTest : public LayerTreeHostDamageTest {
void SetupTree() override {
- scoped_refptr<Layer> root_layer = Layer::Create();
+ scoped_refptr<Layer> root_layer = Layer::Create(layer_settings());
root_layer->SetBounds(gfx::Size(400, 400));
root_layer->SetMasksToBounds(true);
layer_tree_host()->SetRootLayer(root_layer);
- scoped_refptr<Layer> scroll_clip_layer = Layer::Create();
- scoped_refptr<Layer> content_layer = FakeContentLayer::Create(&client_);
+ scoped_refptr<Layer> scroll_clip_layer = Layer::Create(layer_settings());
+ scoped_refptr<Layer> content_layer =
+ FakeContentLayer::Create(layer_settings(), &client_);
content_layer->SetScrollClipLayerId(scroll_clip_layer->id());
content_layer->SetScrollOffset(gfx::ScrollOffset(10, 20));
content_layer->SetBounds(gfx::Size(100, 200));
@@ -365,8 +369,8 @@ class LayerTreeHostScrollbarDamageTest : public LayerTreeHostDamageTest {
scroll_clip_layer->AddChild(content_layer);
root_layer->AddChild(scroll_clip_layer);
- scoped_refptr<Layer> scrollbar_layer =
- FakePaintedScrollbarLayer::Create(false, true, content_layer->id());
+ scoped_refptr<Layer> scrollbar_layer = FakePaintedScrollbarLayer::Create(
+ layer_settings(), false, true, content_layer->id());
scrollbar_layer->SetPosition(gfx::Point(300, 300));
scrollbar_layer->SetBounds(gfx::Size(10, 100));
scrollbar_layer->ToScrollbarLayer()->SetClipLayer(scroll_clip_layer->id());