Draw Transform of Render Surface From Property Trees

cc/trees/layer_tree_host_common.cc

 // Copyright 2011 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/layer_tree_host_common.h"
 
 #include <algorithm>
 
 #include "base/trace_event/trace_event.h"
 #include "cc/base/math_util.h"
@@ skipping 2422 matching lines @@
       const float tolerance =
           col == 3 && row < 3 ? translation_tolerance : component_tolerance;
       if (delta > tolerance)
         return false;
     }
   }
 
   return true;
 }
 
+void VerifyPropertyTreeValuesForSurfaces(RenderSurfaceImpl* render_surface,

[ajuma, 2015/07/23 15:57:03]

Nit: s/Surfaces/Surface

[jaydasika, 2015/07/23 16:56:26]

Done.

+                                         PropertyTrees* property_trees) {
+  const bool render_surface_draw_transforms_match =
+      ApproximatelyEqual(render_surface->draw_transform(),
+                         DrawTransformOfRenderSurfaceFromPropertyTrees(
+                             render_surface, property_trees->transform_tree));
+  CHECK(render_surface_draw_transforms_match)
+      << "expected: " << render_surface->draw_transform().ToString()
+      << " actual: "
+      << DrawTransformOfRenderSurfaceFromPropertyTrees(
+             render_surface, property_trees->transform_tree)
+             .ToString();
+}
+
 void VerifyPropertyTreeValuesForLayer(LayerImpl* current_layer,
                                       PropertyTrees* property_trees,
                                       bool layers_always_allowed_lcd_text,
                                       bool can_use_lcd_text) {
   const bool visible_rects_match =
       ApproximatelyEqual(current_layer->visible_layer_rect(),
                          current_layer->visible_rect_from_property_trees());
   CHECK(visible_rects_match)
       << "expected: " << current_layer->visible_layer_rect().ToString()
       << " actual: "
@@ skipping 28 matching lines @@
     LayerTreeHostCommon::CalcDrawPropsMainInputs* inputs) {
 }
 
 void VerifyPropertyTreeValues(
     LayerTreeHostCommon::CalcDrawPropsImplInputs* inputs) {
   LayerIterator it, end;
   for (it = LayerIterator::Begin(inputs->render_surface_layer_list),
       end = LayerIterator::End(inputs->render_surface_layer_list);
        it != end; ++it) {
     LayerImpl* current_layer = *it;
+    if (current_layer->parent() && current_layer->render_surface())

[ajuma, 2015/07/23 15:57:03]

I think you can instead just check if (it.represents_target_render_surface())
(and then assume current_layer->render_surface() is non-null). Also, can we
remove the parent() check? The root render surface should still have a draw
transform, even if it always happens to be the identity.

[jaydasika, 2015/07/23 16:56:26]

Done.

+      VerifyPropertyTreeValuesForSurfaces(current_layer->render_surface(),
+                                          inputs->property_trees);
     if (!it.represents_itself() || !current_layer->DrawsContent())
       continue;
     VerifyPropertyTreeValuesForLayer(current_layer, inputs->property_trees,
                                      inputs->layers_always_allowed_lcd_text,
                                      inputs->can_use_lcd_text);
   }
 }
 
 enum PropertyTreeOption {
   BUILD_PROPERTY_TREES_IF_NEEDED,
@@ skipping 108 matching lines @@
 
 PropertyTrees* GetPropertyTrees(Layer* layer) {
   return layer->layer_tree_host()->property_trees();
 }
 
 PropertyTrees* GetPropertyTrees(LayerImpl* layer) {
   return layer->layer_tree_impl()->property_trees();
 }
 
 }  // namespace cc