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..17fd27907707ac7512165a5936a97481453dbdbb 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;
 
@@ -44,6 +49,20 @@ class CC_EXPORT PictureLayer : public Layer {
   }
 
  protected:
+  // Encapsulates all data, callbacks or interfaces received from the embedder.
+  struct Inputs {
+    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_;

[vmpstr, 2016/07/25 22:03:26]

Variables should be after functions though :)

protected:
 Types;

 Functions;

 Variables;

Sorry for confusion!

[Menglin, 2016/07/26 17:49:41]

thanks for the correction!

+
   explicit PictureLayer(ContentLayerClient* client);
   // Allow tests to inject a recording source.
   PictureLayer(ContentLayerClient* client,
@@ -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);
 };