diff options
| author | sergeyu <sergeyu@chromium.org> | 2016-01-25 13:40:57 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-25 21:43:48 +0000 |
| commit | f545a8581d72cdf8a39d4d5fec23e728e2ca089f (patch) | |
| tree | 5af85d29e92fdfbbd87bb7ff14f4264b65500740 /remoting/host/desktop_session_agent.cc | |
| parent | 8c375fbf2c234840400f28e8cf0303eddaa1dfca (diff) | |
| download | chromium_src-f545a8581d72cdf8a39d4d5fec23e728e2ca089f.zip chromium_src-f545a8581d72cdf8a39d4d5fec23e728e2ca089f.tar.gz chromium_src-f545a8581d72cdf8a39d4d5fec23e728e2ca089f.tar.bz2 | |
Remove invalid CHECK() from DesktopSessionAgent::OnCaptureCompleted.
crrev.com/370480 added a CHECK() in DesktopSessionAgent. It was
added there in last minute during review and it wasn't properly
validated.
It's supposed to verify that the screen capturer actually uses
the shared memory given to it by verifying that frame->data() and
shared_memory->data() return the same address. On windows the capturer
maps uses shared_memory->handle() to allocate bitmap, so the same
file mapping ends up mapped in two different addresses. So
frame->data() and shared_memory->data() are different addresses, but
the data they contain is always the same.
BUG=575427
Review URL: https://codereview.chromium.org/1630953003
Cr-Commit-Position: refs/heads/master@{#371321}
Diffstat (limited to 'remoting/host/desktop_session_agent.cc')
| -rw-r--r-- | remoting/host/desktop_session_agent.cc | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/remoting/host/desktop_session_agent.cc b/remoting/host/desktop_session_agent.cc index ed788de..538952f 100644 --- a/remoting/host/desktop_session_agent.cc +++ b/remoting/host/desktop_session_agent.cc @@ -316,9 +316,6 @@ void DesktopSessionAgent::OnCaptureCompleted(webrtc::DesktopFrame* frame) { current_size_ = frame->size(); - // Verify that the captured frame was stored in the shared memory buffer. - CHECK(frame->data() == frame->shared_memory()->data()); - // Serialize webrtc::DesktopFrame. SerializedDesktopFrame serialized_frame; serialized_frame.shared_buffer_id = frame->shared_memory()->id(); |