cc: Push valid property values when CalcDrawProps skips layer.

cc/layers/tiled_layer.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/layers/tiled_layer.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/auto_reset.h"
@@ skipping 309 matching lines @@
   return !tile->dirty_rect.Contains(tiler_->TileRect(tile)) &&
          tile->managed_resource()->have_backing_texture();
 }
 
 bool TiledLayer::UpdateTiles(int left,
                              int top,
                              int right,
                              int bottom,
                              ResourceUpdateQueue* queue,
                              const OcclusionTracker* occlusion,
-                             bool* did_paint) {
+                             bool* updated) {
   CreateUpdaterIfNeeded();
 
   bool ignore_occlusions = !occlusion;
   if (!HaveTexturesForTiles(left, top, right, bottom, ignore_occlusions)) {
     failed_update_ = true;
     return false;
   }
 
   gfx::Rect paint_rect =
       MarkTilesForUpdate(left, top, right, bottom, ignore_occlusions);
 
   if (occlusion)
     occlusion->overdraw_metrics()->DidPaint(paint_rect);
 
   if (paint_rect.IsEmpty())
     return true;
 
-  *did_paint = true;
+  *updated = true;
   UpdateTileTextures(
       paint_rect, left, top, right, bottom, queue, occlusion);
   return true;
 }
 
 void TiledLayer::MarkOcclusionsAndRequestTextures(
     int left,
     int top,
     int right,
     int bottom,
@@ skipping 364 matching lines @@
     bound.Intersect(gfx::Rect(content_bounds()));
     predicted_visible_rect_.Intersect(bound);
   }
   previous_content_bounds_ = content_bounds();
   previous_visible_rect_ = visible_content_rect();
 }
 
 bool TiledLayer::Update(ResourceUpdateQueue* queue,
                         const OcclusionTracker* occlusion) {
   DCHECK(!skips_draw_ && !failed_update_);  // Did ResetUpdateState get skipped?
+
+  bool updated = false;
+
   {
     base::AutoReset<bool> ignore_set_needs_commit(&ignore_set_needs_commit_,
                                                   true);
 
-    ContentsScalingLayer::Update(queue, occlusion);
+    updated |= ContentsScalingLayer::Update(queue, occlusion);
     UpdateBounds();
   }
 
   if (tiler_->has_empty_bounds() || !DrawsContent())
     return false;
 
-  bool did_paint = false;
-
   // Animation pre-paint. If the layer is small, try to paint it all
   // immediately whether or not it is occluded, to avoid paint/upload
   // hiccups while it is animating.
   if (IsSmallAnimatedLayer()) {
     int left, top, right, bottom;
     tiler_->ContentRectToTileIndices(gfx::Rect(content_bounds()),
                                      &left,
                                      &top,
                                      &right,
                                      &bottom);
-    UpdateTiles(left, top, right, bottom, queue, NULL, &did_paint);
-    if (did_paint)
-      return did_paint;
+    UpdateTiles(left, top, right, bottom, queue, NULL, &updated);
+    if (updated)
+      return updated;
     // This was an attempt to paint the entire layer so if we fail it's okay,
     // just fallback on painting visible etc. below.
     failed_update_ = false;
   }
 
   if (predicted_visible_rect_.IsEmpty())
-    return did_paint;
+    return updated;
 
   // Visible painting. First occlude visible tiles and paint the non-occluded
   // tiles.
   int left, top, right, bottom;
   tiler_->ContentRectToTileIndices(
       predicted_visible_rect_, &left, &top, &right, &bottom);
   MarkOcclusionsAndRequestTextures(left, top, right, bottom, occlusion);
   skips_draw_ = !UpdateTiles(
-      left, top, right, bottom, queue, occlusion, &did_paint);
+      left, top, right, bottom, queue, occlusion, &updated);
   if (skips_draw_)
     tiler_->reset();
-  if (skips_draw_ || did_paint)
+  if (skips_draw_ || updated)
     return true;
 
   // If we have already painting everything visible. Do some pre-painting while
   // idle.
   gfx::Rect idle_paint_content_rect = IdlePaintRect();
   if (idle_paint_content_rect.IsEmpty())
-    return did_paint;
+    return updated;
 
   // Prepaint anything that was occluded but inside the layer's visible region.
-  if (!UpdateTiles(left, top, right, bottom, queue, NULL, &did_paint) ||
-      did_paint)
-    return did_paint;
+  if (!UpdateTiles(left, top, right, bottom, queue, NULL, &updated) ||
+      updated)
+    return updated;
 
   int prepaint_left, prepaint_top, prepaint_right, prepaint_bottom;
   tiler_->ContentRectToTileIndices(idle_paint_content_rect,
                                    &prepaint_left,
                                    &prepaint_top,
                                    &prepaint_right,
                                    &prepaint_bottom);
 
   // Then expand outwards one row/column at a time until we find a dirty
   // row/column to update. Increment along the major and minor scroll directions
   // first.
   gfx::Vector2d delta = -predicted_scroll_;
   delta = gfx::Vector2d(delta.x() == 0 ? 1 : delta.x(),
                         delta.y() == 0 ? 1 : delta.y());
   gfx::Vector2d major_delta =
       (std::abs(delta.x()) > std::abs(delta.y())) ? gfx::Vector2d(delta.x(), 0)
                                         : gfx::Vector2d(0, delta.y());
   gfx::Vector2d minor_delta =
       (std::abs(delta.x()) <= std::abs(delta.y())) ? gfx::Vector2d(delta.x(), 0)
                                          : gfx::Vector2d(0, delta.y());
   gfx::Vector2d deltas[4] = { major_delta, minor_delta, -major_delta,
                               -minor_delta };
   for (int i = 0; i < 4; i++) {
     if (deltas[i].y() > 0) {
       while (bottom < prepaint_bottom) {
         ++bottom;
         if (!UpdateTiles(
-                left, bottom, right, bottom, queue, NULL, &did_paint) ||
-            did_paint)
-          return did_paint;
+                left, bottom, right, bottom, queue, NULL, &updated) ||
+            updated)
+          return updated;
       }
     }
     if (deltas[i].y() < 0) {
       while (top > prepaint_top) {
         --top;
         if (!UpdateTiles(
-                left, top, right, top, queue, NULL, &did_paint) ||
-            did_paint)
-          return did_paint;
+                left, top, right, top, queue, NULL, &updated) ||
+            updated)
+          return updated;
       }
     }
     if (deltas[i].x() < 0) {
       while (left > prepaint_left) {
         --left;
         if (!UpdateTiles(
-                left, top, left, bottom, queue, NULL, &did_paint) ||
-            did_paint)
-          return did_paint;
+                left, top, left, bottom, queue, NULL, &updated) ||
+            updated)
+          return updated;
       }
     }
     if (deltas[i].x() > 0) {
       while (right < prepaint_right) {
         ++right;
         if (!UpdateTiles(
-                right, top, right, bottom, queue, NULL, &did_paint) ||
-            did_paint)
-          return did_paint;
+                right, top, right, bottom, queue, NULL, &updated) ||
+            updated)
+          return updated;
       }
     }
   }
-  return did_paint;
+  return updated;
 }
 
 bool TiledLayer::NeedsIdlePaint() {
   // Don't trigger more paints if we failed (as we'll just fail again).
   if (failed_update_ || visible_content_rect().IsEmpty() ||
       tiler_->has_empty_bounds() || !DrawsContent())
     return false;
 
   gfx::Rect idle_paint_content_rect = IdlePaintRect();
   if (idle_paint_content_rect.IsEmpty())
@@ skipping 30 matching lines @@
   gfx::Rect prepaint_rect = visible_content_rect();
   prepaint_rect.Inset(-tiler_->tile_size().width() * kPrepaintColumns,
                       -tiler_->tile_size().height() * kPrepaintRows);
   gfx::Rect content_rect(content_bounds());
   prepaint_rect.Intersect(content_rect);
 
   return prepaint_rect;
 }
 
 }  // namespace cc