Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1595)

Unified Diff: webrtc/modules/desktop_capture/desktop_frame.h

Issue 2767003002: Revert of Add DesktopCapturerId and attach it to DesktopFrame (Closed)
Patch Set: Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/modules/desktop_capture/desktop_frame.h
diff --git a/webrtc/modules/desktop_capture/desktop_frame.h b/webrtc/modules/desktop_capture/desktop_frame.h
index c0eaf03aa6d33f064c8b94dfc22c8a7af09030be..d491135029fe45f79940e81d1c042961ef0ab7cf 100644
--- a/webrtc/modules/desktop_capture/desktop_frame.h
+++ b/webrtc/modules/desktop_capture/desktop_frame.h
@@ -14,7 +14,6 @@
#include <memory>
#include "webrtc/base/constructormagic.h"
-#include "webrtc/modules/desktop_capture/desktop_capture_types.h"
#include "webrtc/modules/desktop_capture/desktop_geometry.h"
#include "webrtc/modules/desktop_capture/desktop_region.h"
#include "webrtc/modules/desktop_capture/shared_memory.h"
@@ -69,14 +68,6 @@
// A helper to return the data pointer of a frame at the specified position.
uint8_t* GetFrameDataAtPos(const DesktopVector& pos) const;
- // The DesktopCapturer implementation which generates current DesktopFrame.
- // Not all DesktopCapturer implementations set this field; it's set to
- // kUnknown by default.
- uint32_t capturer_id() const { return capturer_id_; }
- void set_capturer_id(uint32_t capturer_id) {
- capturer_id_ = capturer_id;
- }
-
protected:
DesktopFrame(DesktopSize size,
int stride,
@@ -96,7 +87,6 @@
DesktopRegion updated_region_;
DesktopVector dpi_;
int64_t capture_time_ms_;
- uint32_t capturer_id_;
RTC_DISALLOW_COPY_AND_ASSIGN(DesktopFrame);
};
« no previous file with comments | « webrtc/modules/desktop_capture/desktop_capture_types.h ('k') | webrtc/modules/desktop_capture/desktop_frame.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698