cc: Workaround invalid property tree state on Layers.

cc/trees/draw_property_utils.cc

Index: cc/trees/draw_property_utils.cc
diff --git a/cc/trees/draw_property_utils.cc b/cc/trees/draw_property_utils.cc
index bd0375f2ceabd1058af4290c95d3cc5c4b2606e2..db42684d35a9a1103b8c79367e144803908d2f39 100644
--- a/cc/trees/draw_property_utils.cc
+++ b/cc/trees/draw_property_utils.cc
@@ -458,15 +458,6 @@ static inline bool LayerShouldBeSkippedInternal(
       transform_tree.Node(layer->transform_tree_index());
   const EffectNode* effect_node = effect_tree.Node(layer->effect_tree_index());
 
-  DCHECK(effect_node);
-  DCHECK(transform_node);
-  // TODO(crbug.com/726423) : This is a workaround for crbug.com/726225 to
-  // avoid crashing when there is no effect or transform node. Effect node and
-  // transform node should always exist here and this workaround should be
-  // removed.
-  if (!transform_node || !effect_node)
-    return true;
-
   if (effect_node->has_render_surface && effect_node->subtree_has_copy_request)
     return false;
 
@@ -857,7 +848,7 @@ void FindLayersThatNeedUpdates(LayerTreeImpl* layer_tree_impl,
     // TODO(crbug.com/726423) : This is a workaround for crbug.com/725851 to
     // avoid crashing when layer_impl is nullptr. This workaround should be
     // removed as layer_impl should not be nullptr here.
-    if (!layer_impl)
+    if (!layer_impl || !layer_impl->HasValidPropertyTreeIndices())
       continue;
     if (!IsRootLayer(layer_impl) &&
         LayerShouldBeSkippedForDrawPropertiesComputation(