cc: Clean up PictureLayer API.

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 5bafbe5829a83a6dbf2bb4ad78e087f15e21b612..4b1a0ae6b08539b41e6e75991407332b1dfae2fa 100644
--- a/cc/layers/picture_layer.h
+++ b/cc/layers/picture_layer.h
@@ -37,7 +37,7 @@ class CC_EXPORT PictureLayer : public Layer {
 
   void RunMicroBenchmark(MicroBenchmark* benchmark) override;
 
-  ContentLayerClient* client() { return client_; }
+  ContentLayerClient* client() { return inputs_.client; }
 
   RecordingSource* GetRecordingSourceForTesting() {
     return recording_source_.get();
@@ -63,7 +63,6 @@ class CC_EXPORT PictureLayer : public Layer {
 
   void DropRecordingSourceContentIfInvalid();
 
-  ContentLayerClient* client_;
   std::unique_ptr<RecordingSource> recording_source_;
   devtools_instrumentation::
       ScopedLayerObjectTracker instrumentation_object_tracker_;
@@ -72,7 +71,14 @@ class CC_EXPORT PictureLayer : public Layer {
 
   int update_source_frame_number_;
   bool is_mask_;
-  bool nearest_neighbor_;
+
+  // Encapsulates all data, callbacks or interfaces received from the embedder.
+  struct Inputs {
+    ContentLayerClient* client;

[enne (OOO), 2016/07/11 18:17:30]

Can you initialize this too to nullptr?

[Menglin, 2016/07/11 18:26:05]

Done.

+    bool nearest_neighbor = false;
+  };
+
+  Inputs inputs_;
 
   DISALLOW_COPY_AND_ASSIGN(PictureLayer);
 };