| Index: webrtc/modules/desktop_capture/desktop_capturer.h
|
| diff --git a/webrtc/modules/desktop_capture/desktop_capturer.h b/webrtc/modules/desktop_capture/desktop_capturer.h
|
| index 0c7b68e85d8ec9fd0502c9bb469c9efaf6095575..d758946b843d1451189f053b8bf642e2adc5867f 100644
|
| --- a/webrtc/modules/desktop_capture/desktop_capturer.h
|
| +++ b/webrtc/modules/desktop_capture/desktop_capturer.h
|
| @@ -31,11 +31,11 @@ class DesktopCapturer {
|
| SUCCESS,
|
|
|
| // There was a temporary error. The caller should continue calling
|
| - // Capture(), in the expectation that it will eventually recover.
|
| + // CaptureFrame(), in the expectation that it will eventually recover.
|
| ERROR_TEMPORARY,
|
|
|
| // Capture has failed and will keep failing if the caller tries calling
|
| - // Capture() again.
|
| + // CaptureFrame() again.
|
| ERROR_PERMANENT,
|
|
|
| MAX_VALUE = ERROR_PERMANENT
|
| @@ -61,17 +61,15 @@ class DesktopCapturer {
|
|
|
| // Sets SharedMemoryFactory that will be used to create buffers for the
|
| // captured frames. The factory can be invoked on a thread other than the one
|
| - // where Capture() is called. It will be destroyed on the same thread. Shared
|
| - // memory is currently supported only by some DesktopCapturer implementations.
|
| + // where CaptureFrame() is called. It will be destroyed on the same thread.
|
| + // Shared memory is currently supported only by some DesktopCapturer
|
| + // implementations.
|
| virtual void SetSharedMemoryFactory(
|
| std::unique_ptr<SharedMemoryFactory> shared_memory_factory) {}
|
|
|
| - // This is a legacy interface, consumers should call CaptureFrame() function.
|
| - virtual void Capture(const DesktopRegion& region) { CaptureFrame(); }
|
| -
|
| // Captures next frame, and involve callback provided by Start() function.
|
| // Pending capture requests are canceled when DesktopCapturer is deleted.
|
| - virtual void CaptureFrame() { Capture(DesktopRegion()); }
|
| + virtual void CaptureFrame() = 0;
|
|
|
| // Sets the window to be excluded from the captured image in the future
|
| // Capture calls. Used to exclude the screenshare notification window for
|
|
|