The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/9d01b1b4fb103fb74319a072cc8591dc3e196685

commit 9d01b1b4fb103fb74319a072cc8591dc3e196685
Author: ajuma <ajuma@chromium.org>
Date: Fri Dec 02 16:39:45 2016

Revert of cc: Remove map lookup from RenderSurfaceImpl::EffectTreeIndex (patchset #1 id:1 of https://codereview.chromium.org/2540333002/ )

Reason for revert:
This is causing crashes: http://crbug.com/670679

Original issue's description:
> cc: Remove map lookup from RenderSurfaceImpl::EffectTreeIndex
>
> The map lookup was added by http://crrev.com/434349, but caused a
> 5-10% regression in CalcDrawPropsTests cc_perftests. This CL sets
> the effect tree index on the surface during the surface update step
> (when EffectNode::render_surface gets updated).
>
> BUG= 670074 
> CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_trusty_blink_rel
>
> Committed: https://crrev.com/2d1272d61ee51ba2e2171c77c3cc4545cd288d99
> Cr-Commit-Position: refs/heads/master@{#435672}

TBR=weiliangc@chromium.org,jaydasika@chromium.org

BUG= 670074 ,670679

Review-Url: https://codereview.chromium.org/2544063003
Cr-Commit-Position: refs/heads/master@{#435951}

[modify] https://crrev.com/9d01b1b4fb103fb74319a072cc8591dc3e196685/cc/layers/render_surface_impl.cc
[modify] https://crrev.com/9d01b1b4fb103fb74319a072cc8591dc3e196685/cc/layers/render_surface_impl.h
[modify] https://crrev.com/9d01b1b4fb103fb74319a072cc8591dc3e196685/cc/layers/render_surface_unittest.cc
[modify] https://crrev.com/9d01b1b4fb103fb74319a072cc8591dc3e196685/cc/trees/draw_property_utils.cc

I'm confused at the state of this bug. The revert is the first thing on here but it's reverting a CL that points at this bug... the original CL seems to point here but its not shown in the bug comments.

Can you clarify? This is marked P1 but has been idle some time.

The current state of this bug is a fix landed but got reverted (bugdroid seems to have missed adding a comment for the original CL).

I'm working on a better fix.

Ok thanks!

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/8cd27b3cd1d1fe047bcf2c169106ccac7261d4ed

commit 8cd27b3cd1d1fe047bcf2c169106ccac7261d4ed
Author: ajuma <ajuma@chromium.org>
Date: Thu Jan 05 21:01:49 2017

cc: Remove map lookup from RenderSurfaceImpl::EffectTreeIndex

This relands http://crrev.com/2540333002 with a fix for the crashes
that caused that CL to get reverted.

The previous CL set the effect tree index on surfaces during the surface
update step (when EffectNode::render_surface gets updated). This is not
sufficient, however, since the surface update step will be skipped when
we can't draw, even though property trees can still change and surfaces
can still get destroyed (because of their owning layer getting destroyed).
This CL also updates the effect tree index on surfaces when new property
trees are set (that is, at commit time and at activation time).

BUG= 670074 
CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_trusty_blink_rel

Review-Url: https://codereview.chromium.org/2571263002
Cr-Commit-Position: refs/heads/master@{#441747}

[modify] https://crrev.com/8cd27b3cd1d1fe047bcf2c169106ccac7261d4ed/cc/layers/render_surface_impl.cc
[modify] https://crrev.com/8cd27b3cd1d1fe047bcf2c169106ccac7261d4ed/cc/layers/render_surface_impl.h
[modify] https://crrev.com/8cd27b3cd1d1fe047bcf2c169106ccac7261d4ed/cc/layers/render_surface_unittest.cc
[modify] https://crrev.com/8cd27b3cd1d1fe047bcf2c169106ccac7261d4ed/cc/trees/draw_property_utils.cc
[modify] https://crrev.com/8cd27b3cd1d1fe047bcf2c169106ccac7261d4ed/cc/trees/layer_tree_host_in_process.cc
[modify] https://crrev.com/8cd27b3cd1d1fe047bcf2c169106ccac7261d4ed/cc/trees/layer_tree_host_unittest.cc
[modify] https://crrev.com/8cd27b3cd1d1fe047bcf2c169106ccac7261d4ed/cc/trees/layer_tree_impl.cc
[modify] https://crrev.com/8cd27b3cd1d1fe047bcf2c169106ccac7261d4ed/cc/trees/property_tree.cc
[modify] https://crrev.com/8cd27b3cd1d1fe047bcf2c169106ccac7261d4ed/cc/trees/property_tree.h
[modify] https://crrev.com/8cd27b3cd1d1fe047bcf2c169106ccac7261d4ed/cc/trees/property_tree_builder.cc