| 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..eef90e46bfc30489948dbfed2a23941c46f6cb69 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"
|
| @@ -34,7 +36,8 @@ class FrameRecorder {
|
| virtual ~FrameRecorder();
|
|
|
| Response StartRecordingFrames(int max_frame_count);
|
| - Response StopRecordingFrames(StopRecordingFramesCallback callback);
|
| + Response StopRecordingFrames(
|
| + StopRecordingFramesCallback callback, bool cancel);
|
|
|
| void SetRenderViewHost(RenderViewHostImpl* host);
|
| void OnSwapCompositorFrame();
|
| @@ -47,7 +50,7 @@ class FrameRecorder {
|
| };
|
|
|
| void FrameCaptured(const SkBitmap& bitmap, ReadbackResponse response);
|
| - void FrameEncoded(double timestamp, const std::string& encoded_frame);
|
| + void FrameEncoded(const std::pair<std::string, double>& encoded_frame);
|
| void MaybeSendResponse();
|
|
|
| RenderViewHostImpl* host_;
|
| @@ -59,6 +62,8 @@ class FrameRecorder {
|
| base::Time last_captured_frame_timestamp_;
|
| std::vector<scoped_refptr<devtools::page::RecordedFrame>> frames_;
|
|
|
| + base::CancelableCallback<void(const std::pair<std::string, double>&)>
|
| + frame_encoded_callback_;
|
| base::WeakPtrFactory<FrameRecorder> weak_factory_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(FrameRecorder);
|
|
|