cc: Clean up RecordingSource 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 447a936be981de3302a485e4d2ff0f2ec9a73db0..292fdd66da930267923f85c903cc26608a9999cf 100644
--- a/cc/layers/picture_layer.h
+++ b/cc/layers/picture_layer.h
@@ -13,7 +13,12 @@
 
 namespace cc {
 
+namespace proto {
+class PictureLayerProperties;
+}
+
 class ContentLayerClient;
+class DisplayItemList;
 class RecordingSource;
 class ResourceUpdateQueue;
 
@@ -58,6 +63,20 @@ class CC_EXPORT PictureLayer : public Layer {
 
   bool is_mask() const { return is_mask_; }
 
+  // Encapsulates all data, callbacks or interfaces received from the embedder.
+  struct Inputs {

[vmpstr, 2016/07/25 20:29:14]

types should be defined at the beginning of the access block (right after
"protected:" in this case)

[Menglin, 2016/07/25 21:58:52]

Done.

+    Inputs();
+    ~Inputs();
+
+    ContentLayerClient* client = nullptr;
+    bool nearest_neighbor = false;
+    gfx::Rect recorded_viewport;
+    scoped_refptr<DisplayItemList> display_list;
+    size_t painter_reported_memory_usage = 0;
+  };
+
+  Inputs inputs_;
+
  private:
   friend class TestSerializationPictureLayer;
 
@@ -72,14 +91,6 @@ class CC_EXPORT PictureLayer : public Layer {
   int update_source_frame_number_;
   bool is_mask_;
 
-  // Encapsulates all data, callbacks or interfaces received from the embedder.
-  struct Inputs {
-    ContentLayerClient* client = nullptr;
-    bool nearest_neighbor = false;
-  };
-
-  Inputs inputs_;
-
   DISALLOW_COPY_AND_ASSIGN(PictureLayer);
 };