Commit 4b75946b authored by Tom Anderson's avatar Tom Anderson Committed by Commit Bot

Change DCHECKs to CHECKs in ui::XShmImagePool::DispatchShmCompletionEvent

This is to aid in debugging bug 1057943.

BUG=1057943
R=nickdiego

Change-Id: I29b2b77ac597ccdd154febb682dac14f7d92d13c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2088016
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
Auto-Submit: Thomas Anderson <thomasanderson@chromium.org>
Reviewed-by: default avatarNick Yamane <nickdiego@igalia.com>
Cr-Commit-Position: refs/heads/master@{#746951}
parent 5c178220
......@@ -273,9 +273,7 @@ void XShmImagePool::SwapBuffers(
swap_closures_.emplace();
SwapClosure& swap_closure = swap_closures_.back();
swap_closure.closure = base::BindOnce(std::move(callback), pixel_size_);
#ifndef NDEBUG
swap_closure.shmseg = frame_states_[current_frame_index_].shminfo_.shmseg;
#endif
current_frame_index_ = (current_frame_index_ + 1) % frame_states_.size();
}
......@@ -302,14 +300,13 @@ XShmImagePool::~XShmImagePool() {
}
void XShmImagePool::DispatchShmCompletionEvent(XShmCompletionEvent event) {
DCHECK(host_task_runner_->RunsTasksInCurrentSequence());
DCHECK(!swap_closures_.empty());
// DCHECKs replaced with CHECKs here for https://crbug.com/1057943
CHECK(host_task_runner_->RunsTasksInCurrentSequence());
CHECK(!swap_closures_.empty());
SwapClosure& swap_ack = swap_closures_.front();
#ifndef NDEBUG
DCHECK_EQ(event.shmseg, swap_ack.shmseg);
DCHECK_EQ(event.offset, 0UL);
#endif
CHECK_EQ(event.shmseg, swap_ack.shmseg);
CHECK_EQ(event.offset, 0UL);
std::move(swap_ack.closure).Run();
swap_closures_.pop();
......
......@@ -94,9 +94,7 @@ class COMPONENT_EXPORT(UI_BASE_X) XShmImagePool
~SwapClosure();
base::OnceClosure closure;
#ifndef NDEBUG
ShmSeg shmseg;
#endif
};
// XEventDispatcher:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment