Update from https://crrev.com/308996

cc/layers/picture_layer_impl.h

Index: cc/layers/picture_layer_impl.h
diff --git a/cc/layers/picture_layer_impl.h b/cc/layers/picture_layer_impl.h
index f17743d421b51a0835dc63279fe0da07216ff2a1..7ad4e7ee42ee62443f2b5aae13d63d0bed3b214e 100644
--- a/cc/layers/picture_layer_impl.h
+++ b/cc/layers/picture_layer_impl.h
@@ -46,6 +46,8 @@ class CC_EXPORT PictureLayerImpl
   }
   ~PictureLayerImpl() override;
 
+  bool is_mask() const { return is_mask_; }
+
   scoped_ptr<TilingSetEvictionQueue> CreateEvictionQueue(
       TreePriority tree_priority);
   scoped_ptr<TilingSetRasterQueue> CreateRasterQueue(bool prioritize_low_res);
@@ -78,8 +80,9 @@ class CC_EXPORT PictureLayerImpl
   WhichTree GetTree() const override;
   bool RequiresHighResToDraw() const override;
 
-  // PushPropertiesTo active tree => pending tree.
-  void SyncTiling(const PictureLayerTiling* tiling);
+  void UpdateRasterSource(scoped_refptr<RasterSource> raster_source,
+                          Region* new_invalidation,
+                          const PictureLayerTilingSet* pending_set);
 
   // Mask-related functions.
   void GetContentsResourceId(ResourceProvider::ResourceId* resource_id,
@@ -121,15 +124,6 @@ class CC_EXPORT PictureLayerImpl
   void ResetRasterScale();
   gfx::Rect GetViewportForTilePriorityInContentSpace() const;
   PictureLayerImpl* GetRecycledTwinLayer() const;
-  void UpdateRasterSource(scoped_refptr<RasterSource> raster_source,
-                          Region* new_invalidation,
-                          const PictureLayerTilingSet* pending_set);
-
-  void DoPostCommitInitializationIfNeeded() {
-    if (needs_post_commit_initialization_)
-      DoPostCommitInitialization();
-  }
-  void DoPostCommitInitialization();
 
   bool CanHaveTilingWithScale(float contents_scale) const;
   void SanityCheckTilingState() const;
@@ -168,7 +162,6 @@ class CC_EXPORT PictureLayerImpl
 
   bool raster_source_scale_is_fixed_;
   bool was_screen_space_transform_animating_;
-  bool needs_post_commit_initialization_;
   // A sanity state check to make sure UpdateTilePriorities only gets called
   // after a CalculateContentsScale/ManageTilings.
   bool should_update_tile_priorities_;
@@ -185,7 +178,6 @@ class CC_EXPORT PictureLayerImpl
   // frame that has a valid viewport for prioritizing tiles.
   gfx::Rect visible_rect_for_tile_priority_;
 
-  friend class PictureLayer;
   DISALLOW_COPY_AND_ASSIGN(PictureLayerImpl);
 };