cc: Don't swap PictureLayerTilingSet on activate.

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 "base/auto_reset.h"
 #include "cc/layers/content_layer_client.h"
 #include "cc/layers/picture_layer_impl.h"
 #include "cc/resources/display_list_recording_source.h"
@@ skipping 19 matching lines @@
 PictureLayer::PictureLayer(ContentLayerClient* client,
                            scoped_ptr<RecordingSource> source)
     : PictureLayer(client) {
   recording_source_ = source.Pass();
 }
 
 PictureLayer::~PictureLayer() {
 }
 
 scoped_ptr<LayerImpl> PictureLayer::CreateLayerImpl(LayerTreeImpl* tree_impl) {
-  return PictureLayerImpl::Create(tree_impl, id());
+  return PictureLayerImpl::Create(tree_impl, id(), is_mask_);
 }
 
 void PictureLayer::PushPropertiesTo(LayerImpl* base_layer) {
   Layer::PushPropertiesTo(base_layer);
   PictureLayerImpl* layer_impl = static_cast<PictureLayerImpl*>(base_layer);
+  // TODO(danakj): Make is_mask_ a constructor parameter for PictureLayer.
+  DCHECK_EQ(layer_impl->is_mask_, is_mask_);
 
   int source_frame_number = layer_tree_host()->source_frame_number();
   gfx::Size impl_bounds = layer_impl->bounds();
   gfx::Size recording_source_bounds = recording_source_->GetSize();
 
   // If update called, then recording source size must match bounds pushed to
   // impl layer.
   DCHECK_IMPLIES(update_source_frame_number_ == source_frame_number,
                  impl_bounds == recording_source_bounds)
       << " bounds " << impl_bounds.ToString() << " recording source "
       << recording_source_bounds.ToString();
 
   if (update_source_frame_number_ != source_frame_number &&
       recording_source_bounds != impl_bounds) {
     // Update may not get called for the layer (if it's not in the viewport
     // for example, even though it has resized making the recording source no
     // longer valid. In this case just destroy the recording source.
     recording_source_->SetEmptyBounds();
   }
 
-  // Unlike other properties, invalidation must always be set on layer_impl.
-  // See PictureLayerImpl::PushPropertiesTo for more details.
-  layer_impl->invalidation_.Clear();
-  layer_impl->invalidation_.Swap(&recording_invalidation_);
-  layer_impl->set_is_mask(is_mask_);
   scoped_refptr<RasterSource> raster_source =
       recording_source_->CreateRasterSource();
   raster_source->SetBackgoundColor(SafeOpaqueBackgroundColor());
   raster_source->SetRequiresClear(!contents_opaque() &&
                                   !client_->FillsBoundsCompletely());
-  layer_impl->UpdateRasterSource(raster_source);
+  layer_impl->UpdateRasterSource(raster_source, &recording_invalidation_,
+                                 nullptr);
+  DCHECK(recording_invalidation_.IsEmpty());
 }
 
 void PictureLayer::SetLayerTreeHost(LayerTreeHost* host) {
   Layer::SetLayerTreeHost(host);
   if (host) {
     if (!recording_source_) {
       if (host->settings().use_display_lists) {
         recording_source_.reset(new DisplayListRecordingSource);
       } else {
         recording_source_.reset(new PicturePile);
@@ skipping 121 matching lines @@
 
 bool PictureLayer::HasDrawableContent() const {
   return client_ && Layer::HasDrawableContent();
 }
 
 void PictureLayer::RunMicroBenchmark(MicroBenchmark* benchmark) {
   benchmark->RunOnLayer(this);
 }
 
 }  // namespace cc