cc: Push valid property values when CalcDrawProps skips layer.

cc/layers/scrollbar_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/scrollbar_layer.h"
 
 #include "base/auto_reset.h"
 #include "base/basictypes.h"
 #include "base/debug/trace_event.h"
@@ skipping 284 matching lines @@
   }
 }
 
 bool ScrollbarLayer::Update(ResourceUpdateQueue* queue,
                             const OcclusionTracker* occlusion) {
   track_rect_ = scrollbar_->TrackRect();
 
   if (layer_tree_host()->settings().solid_color_scrollbars)
     return false;
 
+  bool updated = false;
+
   {
     base::AutoReset<bool> ignore_set_needs_commit(&ignore_set_needs_commit_,
                                                   true);
-    ContentsScalingLayer::Update(queue, occlusion);
+    updated = ContentsScalingLayer::Update(queue, occlusion);
   }
 
   dirty_rect_.Union(update_rect_);
   if (content_bounds().IsEmpty())
     return false;
   if (visible_content_rect().IsEmpty())
     return false;
 
   CreateUpdaterIfNeeded();
 
   gfx::Rect content_rect = ScrollbarLayerRectToContentRect(
       gfx::Rect(scrollbar_->Location(), bounds()));
-  bool updated = UpdatePart(track_updater_.get(), track_.get(), content_rect,
-                            queue);
+  updated |= UpdatePart(track_updater_.get(), track_.get(), content_rect,
+                        queue);
 
   if (scrollbar_->HasThumb()) {
     thumb_thickness_ = scrollbar_->ThumbThickness();
     thumb_length_ = scrollbar_->ThumbLength();
     gfx::Rect origin_thumb_rect = OriginThumbRect();
     if (!origin_thumb_rect.IsEmpty()) {
       updated |= UpdatePart(thumb_updater_.get(), thumb_.get(),
                             origin_thumb_rect, queue);
     }
   }
 
   dirty_rect_ = gfx::RectF();
   return updated;
 }
 
 gfx::Rect ScrollbarLayer::OriginThumbRect() const {
   gfx::Size thumb_size;
   if (Orientation() == HORIZONTAL) {
     thumb_size = gfx::Size(scrollbar_->ThumbLength(),
                            scrollbar_->ThumbThickness());
   } else {
     thumb_size = gfx::Size(scrollbar_->ThumbThickness(),
                            scrollbar_->ThumbLength());
   }
   return ScrollbarLayerRectToContentRect(gfx::Rect(thumb_size));
 }
 
 }  // namespace cc