diff options
| author | dpranke <dpranke@chromium.org> | 2015-07-13 11:52:02 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-13 18:53:46 +0000 |
| commit | fac82b6338c8c7b49e5c97fda5f5a68af121170a (patch) | |
| tree | 8193d7a10c3c3342a490c8424f0c76d65f09cef4 /cc/trees/layer_tree_impl_unittest.cc | |
| parent | 8d362cae9e8b300a6c614a9e1a6397637bf09049 (diff) | |
| download | chromium_src-fac82b6338c8c7b49e5c97fda5f5a68af121170a.zip chromium_src-fac82b6338c8c7b49e5c97fda5f5a68af121170a.tar.gz chromium_src-fac82b6338c8c7b49e5c97fda5f5a68af121170a.tar.bz2 | |
Revert of Compute if a layer is clipped outside CalcDrawProps (patchset #9 id:160001 of https://codereview.chromium.org/1231453002/)
Reason for revert:
It looks like this is causing MSAN failures from an uninitialized variable in the webkit_tests:
http://build.chromium.org/p/chromium.webkit/builders/WebKit%20Linux%20MSAN/builds/4378/steps/webkit_tests/logs/stdio
10:00:36.214 29049 ==29058==WARNING: MemorySanitizer: use-of-uninitialized-value
10:00:36.214 29049 #0 0x7f620bf62c3e in set_is_clipped cc/layers/layer.h:503:9
10:00:36.214 29049 #1 0x7f620bf62c3e in AddClipNodeIfNeeded<cc::Layer> cc/trees/property_tree_builder.cc:149:0
10:00:36.214 29049 #2 0x7f620bf62c3e in void cc::(anonymous namespace)::BuildPropertyTreesInternal<cc::Layer>(cc::Layer*, cc::(anonymous namespace)::DataForRecursion<cc::Layer> const&) cc/trees/property_tree_builder.cc:386:0
10:00:36.214 29049 #3 0x7f620bf5d128 in void cc::BuildPropertyTreesTopLevelInternal<cc::Layer>(cc::Layer*, cc::Layer const*, cc::Layer const*, cc::Layer const*, float, float, gfx::Rect const&, gfx::Transform const&, cc::PropertyTrees*) cc/trees/property_tree_builder.cc:466:3
10:00:36.214 29049 #4 0x7f620c206ee6 in cc::BuildPropertyTreesAndComputeVisibleRects(cc::Layer*, cc::Layer const*, cc::Layer const*, cc::Layer const*, float, float, gfx::Rect const&, gfx::Transform const&, cc::PropertyTrees*, std::__1::vector<scoped_refptr<cc::Layer>, std::__1::allocator<scoped_refptr<cc::Layer> > >*) cc/trees/draw_property_utils.cc:473:3
10:00:36.214 29049 #5 0x7f620be94a2f in cc::LayerTreeHost::DoUpdateLayers(cc::Layer*) cc/trees/layer_tree_host.cc:789:5
on pretty much every test.
So I'm reverting this. Sorry!
Original issue's description:
> Compute if a layer is clipped outside CalcDrawProps
>
> We need to know if a layer is clipped to compute its drawable
> visible rect. So, we need to compute it outside CalcDrawProps to move
> drawable visible rect computation outside CalcDrawProps.
>
> Committed: https://crrev.com/2af7226e29be65a8ea4a279b9358a6fcfada5cd3
> Cr-Commit-Position: refs/heads/master@{#338515}
TBR=ajuma@chromium.org,enne@chromium.org,vollick@chromium.org,jaydasika@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/1236943002
Cr-Commit-Position: refs/heads/master@{#338542}
Diffstat (limited to 'cc/trees/layer_tree_impl_unittest.cc')
| -rw-r--r-- | cc/trees/layer_tree_impl_unittest.cc | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/cc/trees/layer_tree_impl_unittest.cc b/cc/trees/layer_tree_impl_unittest.cc index 9e8fee5..81a566f 100644 --- a/cc/trees/layer_tree_impl_unittest.cc +++ b/cc/trees/layer_tree_impl_unittest.cc @@ -972,9 +972,6 @@ TEST_F(LayerTreeImplTest, HitTestingRespectsScrollParents) { // This should cause scroll child and its descendants to be affected by // |child|'s clip. scroll_child->SetScrollParent(child.get()); - scoped_ptr<std::set<LayerImpl*>> scroll_children(new std::set<LayerImpl*>); - scroll_children->insert(scroll_child.get()); - child->SetScrollChildren(scroll_children.release()); SetLayerPropertiesForTesting(grand_child.get(), identity_matrix, transform_origin, position, bounds, true, |