cc: Add property tree verification for compositor thread

Depends on https://codereview.chromium.org/1134753005 to turn off
verify_property_trees everywhere so that this doesn't break the world.

This verification is turned off by default, and can be enabled
locally everywhere by reverting the above patch.

R=ajuma@chromium.org,vollick@chromium.org
BUG=481585

Review URL: https://codereview.chromium.org/1135393007

Cr-Commit-Position: refs/heads/master@{#330639}

cc/trees/layer_tree_host_common.cc

@@ -2598,16 +2598,9 @@ static bool ApproximatelyEqual(const gfx::Transform& a,
   return true;
 }
 
-void VerifyPropertyTreeValues(
-    LayerTreeHostCommon::CalcDrawPropsMainInputs* inputs) {
-  LayerIterator<Layer> it, end;
-  for (it = LayerIterator<Layer>::Begin(inputs->render_surface_layer_list),
-      end = LayerIterator<Layer>::End(inputs->render_surface_layer_list);
-       it != end; ++it) {
-    Layer* current_layer = *it;
-    if (!it.represents_itself() || !current_layer->DrawsContent())
-      continue;
-
+template <typename LayerType>
+void VerifyPropertyTreeValuesForLayer(LayerType* current_layer,
+                                      PropertyTrees* property_trees) {
   const bool visible_rects_match =
       ApproximatelyEqual(current_layer->visible_content_rect(),
                          current_layer->visible_rect_from_property_trees());
@@ -2616,33 +2609,49 @@ void VerifyPropertyTreeValues(
       << " actual: "
       << current_layer->visible_rect_from_property_trees().ToString();
 
-    const bool draw_transforms_match = ApproximatelyEqual(
-        current_layer->draw_transform(),
-        DrawTransformFromPropertyTrees(current_layer,
-                                       inputs->property_trees->transform_tree));
+  const bool draw_transforms_match =
+      ApproximatelyEqual(current_layer->draw_transform(),
+                         DrawTransformFromPropertyTrees(
+                             current_layer, property_trees->transform_tree));
   CHECK(draw_transforms_match)
       << "expected: " << current_layer->draw_transform().ToString()
       << " actual: "
       << DrawTransformFromPropertyTrees(
-               current_layer, inputs->property_trees->transform_tree)
-               .ToString();
+             current_layer, property_trees->transform_tree).ToString();
 
   const bool draw_opacities_match =
       current_layer->draw_opacity() ==
-        DrawOpacityFromPropertyTrees(current_layer,
-                                     inputs->property_trees->opacity_tree);
+      DrawOpacityFromPropertyTrees(current_layer, property_trees->opacity_tree);
   CHECK(draw_opacities_match)
-        << "expected: " << current_layer->draw_opacity() << " actual: "
-        << DrawOpacityFromPropertyTrees(current_layer,
-                                        inputs->property_trees->opacity_tree);
+      << "expected: " << current_layer->draw_opacity()
+      << " actual: " << DrawOpacityFromPropertyTrees(
+                            current_layer, property_trees->opacity_tree);
+}
+
+void VerifyPropertyTreeValues(
+    LayerTreeHostCommon::CalcDrawPropsMainInputs* inputs) {
+  LayerIterator<Layer> it, end;
+  for (it = LayerIterator<Layer>::Begin(inputs->render_surface_layer_list),
+      end = LayerIterator<Layer>::End(inputs->render_surface_layer_list);
+       it != end; ++it) {
+    Layer* current_layer = *it;
+    if (!it.represents_itself() || !current_layer->DrawsContent())
+      continue;
+    VerifyPropertyTreeValuesForLayer(current_layer, inputs->property_trees);
   }
 }
 
 void VerifyPropertyTreeValues(
     LayerTreeHostCommon::CalcDrawPropsImplInputs* inputs) {
-  // TODO(enne): need to synchronize compositor thread changes
-  // for animation and scrolling to the property trees before these
-  // can be correct.
+  LayerIterator<LayerImpl> it, end;
+  for (it = LayerIterator<LayerImpl>::Begin(inputs->render_surface_layer_list),
+      end = LayerIterator<LayerImpl>::End(inputs->render_surface_layer_list);
+       it != end; ++it) {
+    LayerImpl* current_layer = *it;
+    if (!it.represents_itself() || !current_layer->DrawsContent())
+      continue;
+    VerifyPropertyTreeValuesForLayer(current_layer, inputs->property_trees);
+  }
 }
 
 enum PropertyTreeOption {