DevTools: FrameRecorder: add cancelRecordingFrames command

content/browser/devtools/protocol/frame_recorder.h

Index: content/browser/devtools/protocol/frame_recorder.h
diff --git a/content/browser/devtools/protocol/frame_recorder.h b/content/browser/devtools/protocol/frame_recorder.h
index ac082b1e3e1c5445d26fb2a44d4e800cd165c5da..fdcef3553a07382a06f878a9f3e6e2942a7330ec 100644
--- a/content/browser/devtools/protocol/frame_recorder.h
+++ b/content/browser/devtools/protocol/frame_recorder.h
@@ -6,9 +6,11 @@
 #define CONTENT_BROWSER_DEVTOOLS_PROTOCOL_FRAME_RECORDER_H_
 
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "base/callback.h"
+#include "base/cancelable_callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time/time.h"
@@ -24,6 +26,8 @@ class RenderViewHostImpl;
 namespace devtools {
 namespace page {
 
+typedef std::pair<std::string, double> EncodedFrame;

[dgozman, 2015/01/30 10:06:23]

|using| instead of |typedef|

[eustas, 2015/01/30 12:08:16]

Surely

+
 class FrameRecorder {
  public:
   using Response = DevToolsProtocolClient::Response;
@@ -35,6 +39,7 @@ class FrameRecorder {
 
   Response StartRecordingFrames(int max_frame_count);
   Response StopRecordingFrames(StopRecordingFramesCallback callback);
+  Response CancelRecordingFrames();
 
   void SetRenderViewHost(RenderViewHostImpl* host);
   void OnSwapCompositorFrame();
@@ -47,7 +52,7 @@ class FrameRecorder {
   };
 
   void FrameCaptured(const SkBitmap& bitmap, ReadbackResponse response);
-  void FrameEncoded(double timestamp, const std::string& encoded_frame);
+  void FrameEncoded(const scoped_ptr<EncodedFrame>& encoded_frame);

[dgozman, 2015/01/30 10:06:23]

Why const ref? You are passing ownership, so use plain scoped_ptr.

[eustas, 2015/01/30 12:08:16]

Acknowledged.

   void MaybeSendResponse();
 
   RenderViewHostImpl* host_;
@@ -59,6 +64,8 @@ class FrameRecorder {
   base::Time last_captured_frame_timestamp_;
   std::vector<scoped_refptr<devtools::page::RecordedFrame>> frames_;
 
+  base::CancelableCallback<void(const scoped_ptr<EncodedFrame>&)>
+      frame_encoded_callback_;
   base::WeakPtrFactory<FrameRecorder> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(FrameRecorder);