Commit d253f0c0 authored by Omer Katz's avatar Omer Katz Committed by Commit Bot

Revert "Speculative CHECK to pinpoint crash."

This reverts commit 0a610db7.

Reason for revert: The same stack trace still appears on new crashes.

Original change's description:
> Speculative CHECK to pinpoint crash.
> 
> The issue below correlates to element_under_pointer_.at returning a
> nullptr. All calls to element_under_pointer_.at but one are prefaced
> with an if(element_under_pointer_.Contains(...)) check.
> That one call is prefaced with a DCHECK. Most likely culprit is that
> there is a real-world case in which the DCHECK doesn't hold and is
> not covered by our tests.
> Making the DCHECK a CHECK should confirm that. We'd still get the
> same number of crashes overall, but with a different stacktrace.
> 
> Bug: 1114579
> Change-Id: Ie28c971ed2114cf4a780f9eb5366c60d7669315c
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2359081
> Reviewed-by: Kentaro Hara <haraken@chromium.org>
> Commit-Queue: Omer Katz <omerkatz@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#798657}

TBR=haraken@chromium.org,omerkatz@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 1114579
Change-Id: I9ff7e81bbe50484718ced3fd1cc97f900427be07
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2372366Reviewed-by: default avatarOmer Katz <omerkatz@chromium.org>
Commit-Queue: Omer Katz <omerkatz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#801029}
parent 09e7c30a
......@@ -256,7 +256,8 @@ void PointerEventManager::SetElementUnderPointer(PointerEvent* pointer_event,
element_under_pointer_.at(pointer_event->pointerId());
if (!target) {
element_under_pointer_.erase(pointer_event->pointerId());
} else if (target != node->target) {
} else if (target !=
element_under_pointer_.at(pointer_event->pointerId())->target) {
element_under_pointer_.Set(
pointer_event->pointerId(),
MakeGarbageCollected<EventTargetAttributes>(target));
......@@ -304,7 +305,7 @@ void PointerEventManager::HandlePointerInterruption(
for (auto pointer_event : canceled_pointer_events) {
// If we are sending a pointercancel we have sent the pointerevent to some
// target before.
CHECK(element_under_pointer_.Contains(pointer_event->pointerId()));
DCHECK(element_under_pointer_.Contains(pointer_event->pointerId()));
Element* target =
element_under_pointer_.at(pointer_event->pointerId())->target;
......
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