Update from https://crrev.com/318214

cc/layers/layer.h

Index: cc/layers/layer.h
diff --git a/cc/layers/layer.h b/cc/layers/layer.h
index 8eb7c3d02509d84418e8525498e37f8c44c0c594..a82da2466cec06575a495b992a53ac747630109a 100644
--- a/cc/layers/layer.h
+++ b/cc/layers/layer.h
@@ -410,6 +410,7 @@ class CC_EXPORT Layer : public base::RefCounted<Layer>,
   bool AddAnimation(scoped_ptr<Animation> animation);
   void PauseAnimation(int animation_id, double time_offset);
   void RemoveAnimation(int animation_id);
+  void RemoveAnimation(int animation_id, Animation::TargetProperty property);
 
   LayerAnimationController* layer_animation_controller() {
     return layer_animation_controller_.get();
@@ -472,8 +473,10 @@ class CC_EXPORT Layer : public base::RefCounted<Layer>,
 
   void set_transform_tree_index(int index) { transform_tree_index_ = index; }
   void set_clip_tree_index(int index) { clip_tree_index_ = index; }
+  void set_opacity_tree_index(int index) { opacity_tree_index_ = index; }
   int clip_tree_index() const { return clip_tree_index_; }
   int transform_tree_index() const { return transform_tree_index_; }
+  int opacity_tree_index() const { return opacity_tree_index_; }
 
   void set_offset_to_transform_parent(gfx::Vector2dF offset) {
     offset_to_transform_parent_ = offset;
@@ -499,6 +502,7 @@ class CC_EXPORT Layer : public base::RefCounted<Layer>,
       const TransformTree& tree) const;
   gfx::Transform draw_transform_from_property_trees(
       const TransformTree& tree) const;
+  float DrawOpacityFromPropertyTrees(const OpacityTree& tree) const;
 
   // TODO(vollick): These values are temporary and will be removed as soon as
   // render surface determinations are moved out of CDP. They only exist because