Merge 194269

cc/trees/layer_tree_host.cc

Index: cc/trees/layer_tree_host.cc
===================================================================
--- cc/trees/layer_tree_host.cc	(revision 194303)
+++ cc/trees/layer_tree_host.cc	(working copy)
@@ -97,7 +97,8 @@
       trigger_idle_updates_(true),
       background_color_(SK_ColorWHITE),
       has_transparent_background_(false),
-      partial_texture_update_requests_(0) {
+      partial_texture_update_requests_(0),
+      in_paint_layer_contents_(false) {
   if (settings_.accelerated_animation_enabled)
     animation_registrar_ = AnimationRegistrar::Create();
   s_num_layer_tree_instances++;
@@ -935,6 +936,8 @@
   RenderingStats* stats_ptr =
       debug_state_.RecordRenderingStats() ? &stats : NULL;
 
+  in_paint_layer_contents_ = true;
+
   LayerIteratorType end = LayerIteratorType::End(&render_surface_layer_list);
   for (LayerIteratorType it =
            LayerIteratorType::Begin(&render_surface_layer_list);
@@ -947,7 +950,7 @@
              it->render_surface()->draw_opacity_is_animating());
       need_more_updates |= PaintMasksForRenderSurface(*it, queue, stats_ptr);
     } else if (it.represents_itself()) {
-      DCHECK(!it->bounds().IsEmpty());
+      DCHECK(!it->paint_properties().bounds.IsEmpty());
       it->Update(queue, &occlusion_tracker, stats_ptr);
       need_more_updates |= it->NeedMoreUpdates();
     }
@@ -955,6 +958,8 @@
     occlusion_tracker.LeaveLayer(it);
   }
 
+  in_paint_layer_contents_ = false;
+
   rendering_stats_instrumentation_->AddStats(stats);
 
   occlusion_tracker.overdraw_metrics()->RecordMetrics(this);