summaryrefslogtreecommitdiffstats
path: root/cc/trees/layer_tree_impl_unittest.cc
diff options
context:
space:
mode:
authorgab <gab@chromium.org>2015-03-11 12:46:25 -0700
committerCommit bot <commit-bot@chromium.org>2015-03-11 19:47:03 +0000
commitf0d5e0d31ba3659eb782d87baf95539ccd2b6d36 (patch)
tree1d8da0d173681c6b1c53363199cb0a88bb1decae /cc/trees/layer_tree_impl_unittest.cc
parent00d86e3ed50b7fd59f0dd0bbb0277361a27e0a5a (diff)
downloadchromium_src-f0d5e0d31ba3659eb782d87baf95539ccd2b6d36.zip
chromium_src-f0d5e0d31ba3659eb782d87baf95539ccd2b6d36.tar.gz
chromium_src-f0d5e0d31ba3659eb782d87baf95539ccd2b6d36.tar.bz2
Revert of Splitting of layers for correct intersections (patchset #20 id:370001 of https://codereview.chromium.org/595593002/)
Reason for revert: Appears to be adding new static initializers and is breaking Mac/Linux builders, e.g.: http://build.chromium.org/p/chromium/buildstatus?builder=Mac&number=34562 Original issue's description: > Splitting of layers for correct intersections > > Sorting 3d-sorted layers and rendering them in that order causes issues > when layers intersect. Instead place 3d-sorted layers in a bsp tree and > fragment any intersecting layers into non-rectangular quads. We can then > render the fragments in the correct sorted order regardless of > intersections. > > BUG=455918,159225,132122,230833 > > Committed: https://crrev.com/7e2af77dcd3b5df086be3421fad40b719779381c > Cr-Commit-Position: refs/heads/master@{#320096} TBR=enne@chromium.org,danakj@chromium.org,eroman@chromium.org,thakis@chromium.org,awoloszyn@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=455918,159225,132122,230833 Review URL: https://codereview.chromium.org/998023002 Cr-Commit-Position: refs/heads/master@{#320122}
Diffstat (limited to 'cc/trees/layer_tree_impl_unittest.cc')
-rw-r--r--cc/trees/layer_tree_impl_unittest.cc8
1 files changed, 8 insertions, 0 deletions
diff --git a/cc/trees/layer_tree_impl_unittest.cc b/cc/trees/layer_tree_impl_unittest.cc
index 06df3c2..67f98e65 100644
--- a/cc/trees/layer_tree_impl_unittest.cc
+++ b/cc/trees/layer_tree_impl_unittest.cc
@@ -920,6 +920,14 @@ TEST_F(LayerTreeImplTest, HitTestingForMultipleLayersAtVaryingDepths) {
ASSERT_TRUE(grand_child1);
ASSERT_EQ(1u, RenderSurfaceLayerList().size());
+ RenderSurfaceImpl* root_render_surface =
+ host_impl().active_tree()->root_layer()->render_surface();
+ ASSERT_EQ(4u, root_render_surface->layer_list().size());
+ ASSERT_EQ(3, root_render_surface->layer_list().at(0)->id());
+ ASSERT_EQ(1, root_render_surface->layer_list().at(1)->id());
+ ASSERT_EQ(2, root_render_surface->layer_list().at(2)->id());
+ ASSERT_EQ(4, root_render_surface->layer_list().at(3)->id());
+
// Nothing overlaps the root_layer at (1, 1), so hit testing there should find
// the root layer.
gfx::Point test_point = gfx::Point(1, 1);