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

Side by Side Diff: cc/trees/layer_tree_host_common_unittest.cc

Issue 2840143002: [cc] Change semantics of fixed-pos container layer
Patch Set: add back inner viewport container layer as fixed-pos container Created 3 years, 7 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 unified diff | Download patch
OLDNEW
1 // Copyright 2011 The Chromium Authors. All rights reserved. 1 // Copyright 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "cc/trees/layer_tree_host_common.h" 5 #include "cc/trees/layer_tree_host_common.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <memory> 10 #include <memory>
(...skipping 8002 matching lines...) Expand 10 before | Expand all | Expand 10 after
8013 // + root 8013 // + root
8014 // + container 8014 // + container
8015 // + scroller 8015 // + scroller
8016 // + fixed_pos 8016 // + fixed_pos
8017 // 8017 //
8018 scoped_refptr<Layer> root = Layer::Create(); 8018 scoped_refptr<Layer> root = Layer::Create();
8019 scoped_refptr<Layer> container = Layer::Create(); 8019 scoped_refptr<Layer> container = Layer::Create();
8020 scoped_refptr<Layer> scroller = Layer::Create(); 8020 scoped_refptr<Layer> scroller = Layer::Create();
8021 scoped_refptr<Layer> fixed_pos = Layer::Create(); 8021 scoped_refptr<Layer> fixed_pos = Layer::Create();
8022 8022
8023 scroller->SetIsContainerForFixedPositionLayers(true); 8023 container->SetIsContainerForFixedPositionLayers(true);
8024 8024
8025 root->AddChild(container); 8025 root->AddChild(container);
8026 container->AddChild(scroller); 8026 container->AddChild(scroller);
8027 scroller->AddChild(fixed_pos); 8027 scroller->AddChild(fixed_pos);
8028 host()->SetRootLayer(root); 8028 host()->SetRootLayer(root);
8029 8029
8030 LayerPositionConstraint fixed_position; 8030 LayerPositionConstraint fixed_position;
8031 fixed_position.set_is_fixed_position(true); 8031 fixed_position.set_is_fixed_position(true);
8032 scroller->SetScrollClipLayerId(container->id()); 8032 scroller->SetScrollClipLayerId(container->id());
8033 fixed_pos->SetPositionConstraint(fixed_position); 8033 fixed_pos->SetPositionConstraint(fixed_position);
(...skipping 857 matching lines...) Expand 10 before | Expand all | Expand 10 after
8891 root->AddChild(inner_viewport_container_layer); 8891 root->AddChild(inner_viewport_container_layer);
8892 inner_viewport_container_layer->AddChild(inner_viewport_scroll_layer); 8892 inner_viewport_container_layer->AddChild(inner_viewport_scroll_layer);
8893 inner_viewport_scroll_layer->AddChild(outer_viewport_container_layer); 8893 inner_viewport_scroll_layer->AddChild(outer_viewport_container_layer);
8894 outer_viewport_container_layer->AddChild(outer_viewport_scroll_layer); 8894 outer_viewport_container_layer->AddChild(outer_viewport_scroll_layer);
8895 8895
8896 inner_viewport_scroll_layer->SetScrollClipLayerId( 8896 inner_viewport_scroll_layer->SetScrollClipLayerId(
8897 inner_viewport_container_layer->id()); 8897 inner_viewport_container_layer->id());
8898 outer_viewport_scroll_layer->SetScrollClipLayerId( 8898 outer_viewport_scroll_layer->SetScrollClipLayerId(
8899 outer_viewport_container_layer->id()); 8899 outer_viewport_container_layer->id());
8900 8900
8901 inner_viewport_scroll_layer->SetIsContainerForFixedPositionLayers(true); 8901 inner_viewport_container_layer->SetIsContainerForFixedPositionLayers(true);
8902 outer_viewport_scroll_layer->SetIsContainerForFixedPositionLayers(true); 8902 outer_viewport_container_layer->SetIsContainerForFixedPositionLayers(true);
8903 8903
8904 host()->SetRootLayer(root); 8904 host()->SetRootLayer(root);
8905 host()->RegisterViewportLayers(nullptr, root, inner_viewport_scroll_layer, 8905 host()->RegisterViewportLayers(nullptr, root, inner_viewport_scroll_layer,
8906 outer_viewport_scroll_layer); 8906 outer_viewport_scroll_layer);
8907 8907
8908 scoped_refptr<Layer> fixed_to_inner = Layer::Create(); 8908 scoped_refptr<Layer> fixed_to_inner = Layer::Create();
8909 scoped_refptr<Layer> fixed_to_outer = Layer::Create(); 8909 scoped_refptr<Layer> fixed_to_outer = Layer::Create();
8910 8910
8911 inner_viewport_scroll_layer->AddChild(fixed_to_inner); 8911 inner_viewport_scroll_layer->AddChild(fixed_to_inner);
8912 outer_viewport_scroll_layer->AddChild(fixed_to_outer); 8912 outer_viewport_scroll_layer->AddChild(fixed_to_outer);
(...skipping 1961 matching lines...) Expand 10 before | Expand all | Expand 10 after
10874 10874
10875 // Check child layer draw properties. 10875 // Check child layer draw properties.
10876 EXPECT_EQ(gfx::Rect(10, 10), child->visible_layer_rect()); 10876 EXPECT_EQ(gfx::Rect(10, 10), child->visible_layer_rect());
10877 EXPECT_EQ(gfx::Transform(), child->DrawTransform()); 10877 EXPECT_EQ(gfx::Transform(), child->DrawTransform());
10878 EXPECT_EQ(gfx::Rect(10, 10), child->clip_rect()); 10878 EXPECT_EQ(gfx::Rect(10, 10), child->clip_rect());
10879 EXPECT_EQ(gfx::Rect(10, 10), child->drawable_content_rect()); 10879 EXPECT_EQ(gfx::Rect(10, 10), child->drawable_content_rect());
10880 } 10880 }
10881 10881
10882 } // namespace 10882 } // namespace
10883 } // namespace cc 10883 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698