Merge 194269

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/devtools_instrumentation.h"
 #include "cc/layers/picture_layer_impl.h"
 #include "cc/trees/layer_tree_impl.h"
 #include "ui/gfx/rect_conversions.h"
@@ skipping 57 matching lines @@
   }
   Layer::SetNeedsDisplayRect(layer_rect);
 }
 
 void PictureLayer::Update(ResourceUpdateQueue*,
                           const OcclusionTracker*,
                           RenderingStats* stats) {
   // Do not early-out of this function so that PicturePile::Update has a chance
   // to record pictures due to changing visibility of this layer.
 
-  pile_->Resize(bounds());
+  pile_->Resize(paint_properties().bounds);
 
   // Calling paint in WebKit can sometimes cause invalidations, so save
   // off the invalidation prior to calling update.
   pile_invalidation_.Swap(&pending_invalidation_);
   pending_invalidation_.Clear();
 
   gfx::Rect visible_layer_rect = gfx::ToEnclosingRect(
       gfx::ScaleRect(visible_content_rect(), 1.f / contents_scale_x()));
   devtools_instrumentation::ScopedPaintLayer paint_layer(id());
   pile_->Update(client_,
                 background_color(),
                 pile_invalidation_,
                 visible_layer_rect,
                 stats);
 }
 
 void PictureLayer::SetIsMask(bool is_mask) {
   is_mask_ = is_mask;
 }
 
 }  // namespace cc