cc : Delete LayerImpl::opacity

cc/trees/property_tree_builder.cc

Index: cc/trees/property_tree_builder.cc
diff --git a/cc/trees/property_tree_builder.cc b/cc/trees/property_tree_builder.cc
index ba8b1b89face876004b002cef688ac108e7ba254..9f0d76f33288e904c21cd84ad14a50562f725850 100644
--- a/cc/trees/property_tree_builder.cc
+++ b/cc/trees/property_tree_builder.cc
@@ -661,8 +661,17 @@ static inline float EffectiveOpacity(Layer* layer) {
 }
 
 static inline float EffectiveOpacity(LayerImpl* layer) {
-  return layer->test_properties()->hide_layer_and_subtree ? 0.f
-                                                          : layer->opacity();
+  return layer->test_properties()->hide_layer_and_subtree
+             ? 0.f
+             : layer->test_properties()->opacity;
+}
+
+static inline float Opacity(Layer* layer) {
+  return layer->opacity();
+}
+
+static inline float Opacity(LayerImpl* layer) {
+  return layer->test_properties()->opacity;
 }
 
 static inline bool HideLayerAndSubtree(Layer* layer) {
@@ -823,7 +832,7 @@ bool AddEffectNodeIfNeeded(
         .push_back(node.owner_id);
   }
 
-  node.data.opacity = layer->opacity();
+  node.data.opacity = Opacity(layer);
   node.data.has_render_surface = should_create_render_surface;
   node.data.has_copy_request = layer->HasCopyRequest();
   node.data.has_background_filters = !layer->background_filters().IsEmpty();