Update from chromium https://crrev.com/304586

cc/layers/picture_layer.h

Index: cc/layers/picture_layer.h
diff --git a/cc/layers/picture_layer.h b/cc/layers/picture_layer.h
index 2969ee1850650f8cc205c648b272802d44a17c69..e4acb1f09392c9880414578131a6b1ea52e4d37e 100644
--- a/cc/layers/picture_layer.h
+++ b/cc/layers/picture_layer.h
@@ -45,6 +45,8 @@ class CC_EXPORT PictureLayer : public Layer {
 
  protected:
   explicit PictureLayer(ContentLayerClient* client);
+  // Allow tests to inject a recording source.
+  PictureLayer(ContentLayerClient* client, scoped_ptr<RecordingSource> source);
   ~PictureLayer() override;
 
   bool HasDrawableContent() const override;
@@ -63,6 +65,7 @@ class CC_EXPORT PictureLayer : public Layer {
 
   int update_source_frame_number_;
   bool can_use_lcd_text_last_frame_;
+  bool is_mask_;
 
   DISALLOW_COPY_AND_ASSIGN(PictureLayer);
 };