cc: Don't swap PictureLayerTilingSet on activate.

When activating, create new tilings on the active tree and make new
shared tiles. This way we don't have tilings on the recycle tree from
two frames ago, and the path which data travels is much more clear.

BUG=387116

Review URL: https://codereview.chromium.org/640063010

Cr-Commit-Position: refs/heads/master@{#307816}

1 files changed, 4 insertions, 3 deletions

diff --git a/cc/layers/picture_image_layer_impl.h b/cc/layers/picture_image_layer_impl.h
index 7a363a1..f478951 100644
--- a/cc/layers/picture_image_layer_impl.h
+++ b/cc/layers/picture_image_layer_impl.h
@@ -12,8 +12,9 @@ namespace cc {
 class CC_EXPORT PictureImageLayerImpl : public PictureLayerImpl {
  public:
   static scoped_ptr<PictureImageLayerImpl> Create(LayerTreeImpl* tree_impl,
-                                                  int id) {
-    return make_scoped_ptr(new PictureImageLayerImpl(tree_impl, id));
+                                                  int id,
+                                                  bool is_mask) {
+    return make_scoped_ptr(new PictureImageLayerImpl(tree_impl, id, is_mask));
   }
   ~PictureImageLayerImpl() override;
 
@@ -22,7 +23,7 @@ class CC_EXPORT PictureImageLayerImpl : public PictureLayerImpl {
   scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl) override;
 
  protected:
-  PictureImageLayerImpl(LayerTreeImpl* tree_impl, int id);
+  PictureImageLayerImpl(LayerTreeImpl* tree_impl, int id, bool is_mask);
 
   bool ShouldAdjustRasterScale() const override;
   void RecalculateRasterScales() override;