Update from https://crrev.com/308331

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 01a37a3018e121e4158168564ecc90a592fbbd15..648d1c93f142ea1d3c313f9a840cec9c478e9f98 100644
--- a/cc/layers/picture_layer.h
+++ b/cc/layers/picture_layer.h
@@ -23,6 +23,8 @@ class CC_EXPORT PictureLayer : public Layer {
 
   void ClearClient();
 
+  void SetNearestNeighbor(bool nearest_neighbor);
+
   // Layer interface.
   scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl) override;
   void SetLayerTreeHost(LayerTreeHost* host) override;
@@ -50,9 +52,12 @@ class CC_EXPORT PictureLayer : public Layer {
   ~PictureLayer() override;
 
   bool HasDrawableContent() const override;
-  bool UpdateCanUseLCDText();
+
+  bool is_mask() const { return is_mask_; }
 
  private:
+  bool UpdateCanUseLCDText();
+
   ContentLayerClient* client_;
   scoped_ptr<RecordingSource> recording_source_;
   devtools_instrumentation::
@@ -66,6 +71,7 @@ class CC_EXPORT PictureLayer : public Layer {
   int update_source_frame_number_;
   bool can_use_lcd_text_for_update_;
   bool is_mask_;
+  bool nearest_neighbor_;
 
   DISALLOW_COPY_AND_ASSIGN(PictureLayer);
 };