cc: Push valid property values when CalcDrawProps skips layer.

cc/layers/picture_layer.cc

 // Copyright 2012 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/picture_layer.h"
 
 #include "cc/debug/benchmark_instrumentation.h"
 #include "cc/debug/devtools_instrumentation.h"
 #include "cc/layers/picture_layer_impl.h"
 #include "cc/trees/layer_tree_impl.h"
@@ skipping 51 matching lines @@
 void PictureLayer::SetNeedsDisplayRect(const gfx::RectF& layer_rect) {
   gfx::Rect rect = gfx::ToEnclosedRect(layer_rect);
   if (!rect.IsEmpty()) {
     // Clamp invalidation to the layer bounds.
     rect.Intersect(gfx::Rect(bounds()));
     pending_invalidation_.Union(rect);
   }
   Layer::SetNeedsDisplayRect(layer_rect);
 }
 
-bool PictureLayer::Update(ResourceUpdateQueue*,
-                          const OcclusionTracker*) {
+bool PictureLayer::Update(ResourceUpdateQueue* queue,
+                          const OcclusionTracker* occlusion) {
   // Do not early-out of this function so that PicturePile::Update has a chance
   // to record pictures due to changing visibility of this layer.
 
   TRACE_EVENT1(benchmark_instrumentation::kCategory,
                benchmark_instrumentation::kPictureLayerUpdate,
                benchmark_instrumentation::kSourceFrameNumber,
                layer_tree_host()->source_frame_number());
 
+  // Note: This layer does not use ContentsScalingLayer::Update().
+  // TODO(danakj): Maybe this should not inherit from ContentsScalingLayer then.

[enne (OOO), 2013/08/02 17:00:48]

Agreed.

+  bool updated = Layer::Update(queue, occlusion);
+
   pile_->Resize(paint_properties().bounds);
 
   // Calling paint in WebKit can sometimes cause invalidations, so save
   // off the invalidation prior to calling update.
   pending_invalidation_.Swap(&pile_invalidation_);
   pending_invalidation_.Clear();
 
   gfx::Rect visible_layer_rect = gfx::ScaleToEnclosingRect(
       visible_content_rect(), 1.f / contents_scale_x());
   if (layer_tree_host()->settings().using_synchronous_renderer_compositor) {
     // Workaround for http://crbug.com/235910 - to retain backwards compat
     // the full page content must always be provided in the picture layer.
     visible_layer_rect = gfx::Rect(bounds());
   }
   devtools_instrumentation::ScopedLayerTask paint_layer(
       devtools_instrumentation::kPaintLayer, id());
-  bool updated = pile_->Update(client_,
-                               SafeOpaqueBackgroundColor(),
-                               contents_opaque(),
-                               pile_invalidation_,
-                               visible_layer_rect,
-                               rendering_stats_instrumentation());
+  updated |= pile_->Update(client_,
+                           SafeOpaqueBackgroundColor(),
+                           contents_opaque(),
+                           pile_invalidation_,
+                           visible_layer_rect,
+                           rendering_stats_instrumentation());
   if (updated) {
     SetNeedsPushProperties();
   } else {
     // If this invalidation did not affect the pile, then it can be cleared as
     // an optimization.
     pile_invalidation_.Clear();
   }
 
   return updated;
 }
 
 void PictureLayer::SetIsMask(bool is_mask) {
   is_mask_ = is_mask;
 }
 
 bool PictureLayer::SupportsLCDText() const {
   return true;
 }
 
 }  // namespace cc