cc : Fix occlusion tracking bug for contributing surface

cc/trees/draw_property_utils.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/trees/draw_property_utils.h"
 
 #include <stddef.h>
 
 #include <vector>
 
@@ skipping 36 matching lines @@
   EffectNode* effect_node =
       layer->layer_tree_impl()->property_trees()->effect_tree.Node(
           layer->effect_tree_index());
   if (effect_node->owner_id != layer->id())
     return;
   DCHECK_EQ(effect_node->mask_layer_id, -1) << "layer: " << layer->id();
   DCHECK_EQ(effect_node->replica_layer_id, -1) << "layer: " << layer->id();
   DCHECK(effect_node->background_filters.IsEmpty());
 }
 
-#endif
-
-static void ApplySublayerScale(const int effect_node_id,
-                               const EffectTree& effect_tree,
-                               gfx::Transform* transform) {
-  const EffectNode* effect_node = effect_tree.Node(effect_node_id);
-  const EffectNode* target_effect_node =
-      effect_node->has_render_surface
-          ? effect_node
-          : effect_tree.Node(effect_node->target_id);
-  transform->matrix().postScale(target_effect_node->sublayer_scale.x(),
-                                target_effect_node->sublayer_scale.y(), 1.f);
-}
-
-#if DCHECK_IS_ON()
 void VerifySublayerScalesMatch(const int effect_node_id,
                                const int target_transform_id,
                                const EffectTree& effect_tree,
                                const TransformTree& transform_tree) {
   const TransformNode* target_transform_node =
       transform_tree.Node(target_transform_id);
   const EffectNode* effect_node = effect_tree.Node(effect_node_id);
   const EffectNode* target_effect_node =
       effect_node->has_render_surface
           ? effect_node
@@ skipping 19 matching lines @@
 
   gfx::Transform clip_to_target;
   if (clip_node->target_transform_id > target_node_id) {
     // In this case, layer has a scroll parent. We need to keep the scale
     // at the layer's target but remove the scale at the scroll parent's
     // target.
     if (transform_tree.ComputeTransform(clip_node->target_transform_id,
                                         target_node_id, &clip_to_target)) {
       // We don't have to apply sublayer scale when target is root.
       if (target_node_id != 0) {
-        ApplySublayerScale(layer->effect_tree_index(), effect_tree,
-                           &clip_to_target);
+        PostConcatSublayerScale(layer->effect_tree_index(), effect_tree,
+                                &clip_to_target);
 #if DCHECK_IS_ON()
         VerifySublayerScalesMatch(layer->effect_tree_index(), target_node_id,
                                   effect_tree, transform_tree);
 #endif
       }
 
       const TransformNode* source_node =
           transform_tree.Node(clip_node->target_transform_id);
       if (source_node->sublayer_scale.x() != 0.f &&
           source_node->sublayer_scale.y() != 0.f)
@@ skipping 47 matching lines @@
     int current_transform_id,
     int target_transform_id,
     int target_effect_id) {
   gfx::Transform current_to_target;
   if (!transform_tree.ComputeTransform(current_transform_id,
                                        target_transform_id, &current_to_target))
     // If transform is not invertible, cannot apply clip.
     return ConditionalClip{false, gfx::RectF()};
   // We don't have to apply sublayer scale when target is root.
   if (target_transform_id != 0) {
-    ApplySublayerScale(target_effect_id, effect_tree, &current_to_target);
+    PostConcatSublayerScale(target_effect_id, effect_tree, &current_to_target);
 #if DCHECK_IS_ON()
     VerifySublayerScalesMatch(target_effect_id, target_transform_id,
                               effect_tree, transform_tree);
 #endif
   }
 
   if (current_transform_id > target_transform_id)
     return ConditionalClip{true,  // is_clipped.
                            MathUtil::MapClippedRect(current_to_target, rect)};
 
@@ skipping 517 matching lines @@
     }
   }
 }
 
 static void ResetIfHasNanCoordinate(gfx::RectF* rect) {
   if (std::isnan(rect->x()) || std::isnan(rect->y()) ||
       std::isnan(rect->right()) || std::isnan(rect->bottom()))
     *rect = gfx::RectF();
 }
 
+void PostConcatSublayerScale(const int effect_node_id,
+                             const EffectTree& effect_tree,
+                             gfx::Transform* transform) {
+  // TODO(jaydasika): This function should not compute target effect node id. It
+  // should receive it from callers.
+  const EffectNode* effect_node = effect_tree.Node(effect_node_id);
+  const EffectNode* target_effect_node =
+      effect_node->has_render_surface
+          ? effect_node
+          : effect_tree.Node(effect_node->target_id);
+  transform->matrix().postScale(target_effect_node->sublayer_scale.x(),
+                                target_effect_node->sublayer_scale.y(), 1.f);
+}
+
+void ConcatInverseSublayerScale(const int effect_node_id,
+                                const EffectTree& effect_tree,
+                                gfx::Transform* transform) {
+  const EffectNode* effect_node = effect_tree.Node(effect_node_id);
+  if (effect_node->sublayer_scale.x() != 0.0 &&
+      effect_node->sublayer_scale.y() != 0.0)
+    transform->Scale(1.0 / effect_node->sublayer_scale.x(),
+                     1.0 / effect_node->sublayer_scale.y());
+}
+
 void ComputeClips(ClipTree* clip_tree,
                   const TransformTree& transform_tree,
                   const EffectTree& effect_tree,
                   bool non_root_surfaces_enabled) {
   if (!clip_tree->needs_update())
     return;
   for (int i = 1; i < static_cast<int>(clip_tree->size()); ++i) {
     ClipNode* clip_node = clip_tree->Node(i);
 
     if (clip_node->id == 1) {
@@ skipping 26 matching lines @@
     gfx::RectF parent_clip_in_target_space =
         parent_clip_node->clip_in_target_space;
     if (parent_target_transform_node &&
         parent_target_transform_node->id != clip_node->target_transform_id &&
         non_root_surfaces_enabled) {
       success &= transform_tree.ComputeTransform(
           parent_target_transform_node->id, clip_node->target_transform_id,
           &parent_to_current);
       // We don't have to apply sublayer scale when target is root.
       if (clip_node->target_transform_id != 0) {
-        ApplySublayerScale(clip_node->target_effect_id, effect_tree,
-                           &parent_to_current);
+        PostConcatSublayerScale(clip_node->target_effect_id, effect_tree,
+                                &parent_to_current);
 #if DCHECK_IS_ON()
         VerifySublayerScalesMatch(clip_node->target_effect_id,
                                   clip_node->target_transform_id, effect_tree,
                                   transform_tree);
 #endif
       }
       if (parent_target_transform_node->sublayer_scale.x() > 0 &&
           parent_target_transform_node->sublayer_scale.y() > 0)
         parent_to_current.Scale(
             1.f / parent_target_transform_node->sublayer_scale.x(),
@@ skipping 52 matching lines @@
         source_to_target = transform_tree.ToScreen(clip_node->transform_id);
       } else if (transform_tree.ContentTargetId(transform_node->id) ==
                  clip_node->target_transform_id) {
         source_to_target = transform_tree.ToTarget(clip_node->transform_id);
       } else {
         success = transform_tree.ComputeTransform(
             transform_node->id, clip_node->target_transform_id,
             &source_to_target);
         // We don't have to apply sublayer scale when target is root.
         if (clip_node->target_transform_id != 0) {
-          ApplySublayerScale(clip_node->target_effect_id, effect_tree,
-                             &source_to_target);
+          PostConcatSublayerScale(clip_node->target_effect_id, effect_tree,
+                                  &source_to_target);
 #if DCHECK_IS_ON()
           VerifySublayerScalesMatch(clip_node->target_effect_id,
                                     clip_node->target_transform_id, effect_tree,
                                     transform_tree);
 #endif
         }
         // source_to_target computation should be successful as target is an
         // ancestor of the transform node.
         DCHECK(success);
       }
@@ skipping 140 matching lines @@
 static void VerifyDrawTransformsMatch(LayerImpl* layer,
                                       PropertyTrees* property_trees) {
   const int source_id = layer->transform_tree_index();
   int destination_id = FindTargetTransformTreeIndexFromEffectTree(
       property_trees->effect_tree, layer->effect_tree_index());
   gfx::Transform draw_transform;
   property_trees->transform_tree.ComputeTransform(source_id, destination_id,
                                                   &draw_transform);
   // We don't have to apply sublayer scale when target is root.
   if (destination_id != 0) {
-    ApplySublayerScale(layer->effect_tree_index(), property_trees->effect_tree,
-                       &draw_transform);
+    PostConcatSublayerScale(layer->effect_tree_index(),
+                            property_trees->effect_tree, &draw_transform);
 #if DCHECK_IS_ON()
     VerifySublayerScalesMatch(layer->effect_tree_index(), destination_id,
                               property_trees->effect_tree,
                               property_trees->transform_tree);
 #endif
   }
   if (layer->should_flatten_transform_from_property_tree())
     draw_transform.FlattenTo2d();
   draw_transform.Translate(layer->offset_to_transform_parent().x(),
                            layer->offset_to_transform_parent().y());
@@ skipping 175 matching lines @@
     return;
   }
 
   gfx::Transform render_surface_transform;
   const TransformNode* target_transform_node =
       transform_tree.Node(transform_tree.TargetId(transform_node->id));
   transform_tree.ComputeTransform(transform_node->id, target_transform_node->id,
                                   &render_surface_transform);
   // We don't have to apply sublayer scale when target is root.
   if (target_transform_node->id != 0) {
-    ApplySublayerScale(effect_node->target_id, effect_tree,
-                       &render_surface_transform);
+    PostConcatSublayerScale(effect_node->target_id, effect_tree,
+                            &render_surface_transform);
 #if DCHECK_IS_ON()
     VerifySublayerScalesMatch(effect_node->target_id, target_transform_node->id,
                               effect_tree, transform_tree);
 #endif
   }
 
   DCHECK(transform_node->sublayer_scale == effect_node->sublayer_scale);
   if (effect_node->sublayer_scale.x() != 0.0 &&
       effect_node->sublayer_scale.y() != 0.0)
     render_surface_transform.Scale(1.0 / effect_node->sublayer_scale.x(),
@@ skipping 36 matching lines @@
       transform_tree.TargetId(transform_node->id),
       &clip_parent_target_to_target);
 
   if (!success) {
     render_surface->SetClipRect(gfx::Rect());
     return;
   }
 
   // We don't have to apply sublayer scale when target is root.
   if (transform_tree.TargetId(transform_node->id) != 0) {
-    ApplySublayerScale(render_surface->EffectTreeIndex(), effect_tree,
-                       &clip_parent_target_to_target);
+    PostConcatSublayerScale(render_surface->EffectTreeIndex(), effect_tree,
+                            &clip_parent_target_to_target);
 #if DCHECK_IS_ON()
     VerifySublayerScalesMatch(render_surface->EffectTreeIndex(),
                               transform_tree.TargetId(transform_node->id),
                               effect_tree, transform_tree);
 #endif
   }
 
   DCHECK_LT(parent_clip_node->target_transform_id,
             transform_tree.TargetId(transform_node->id));
   render_surface->SetClipRect(gfx::ToEnclosingRect(MathUtil::ProjectClippedRect(
@@ skipping 260 matching lines @@
 void UpdateElasticOverscroll(PropertyTrees* property_trees,
                              const Layer* overscroll_elasticity_layer,
                              const gfx::Vector2dF& elastic_overscroll) {
   UpdateElasticOverscrollInternal(property_trees, overscroll_elasticity_layer,
                                   elastic_overscroll);
 }
 
 }  // namespace draw_property_utils
 
 }  // namespace cc