Commit 94df7bb0 authored by Dale Curtis's avatar Dale Curtis

Revert "Fix ClusterFuzz NPD"

This reverts commit 82e54baf.

Reason for revert: Fix not landed in time.

Original change's description:
> Fix ClusterFuzz NPD
>
> playerIDs were getting added to dead players, then removed from the
> player map - when it came time to delete players, the dead players
> tried to be removed again. Looks like CF was running without DCHECK
> enabled, so it never hit the check for iter != players_.end().
>
> Bug: 1148757
> Change-Id: I13486c59ec362b023ddbf93462d359bec7707512
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2537789
> Reviewed-by: Dale Curtis <dalecurtis@chromium.org>
> Reviewed-by: Andrey Kosyakov <caseq@chromium.org>
> Commit-Queue: Dale Curtis <dalecurtis@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#827464}

TBR=dalecurtis@chromium.org,caseq@chromium.org,tmathmeyer@chromium.org

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

Bug: 1148757
Change-Id: I61920a94635369846e0781ac22b072f0cd7ee4c7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2547423Reviewed-by: default avatarDale Curtis <dalecurtis@chromium.org>
Commit-Queue: Dale Curtis <dalecurtis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#828774}
parent 70fee986
......@@ -88,13 +88,11 @@ WebString MediaInspectorContextImpl::CreatePlayer() {
}
void MediaInspectorContextImpl::RemovePlayer(WebString playerId) {
const auto& player_iter = players_.find(playerId);
DCHECK(player_iter != players_.end());
const Member<MediaPlayer>& player = player_iter->value;
DCHECK(player);
const auto& player = players_.find(playerId);
DCHECK(player != players_.end());
total_event_count_ -=
player->errors.size() + player->events.size() + player->messages.size();
(player->value->errors.size() + player->value->events.size() +
player->value->messages.size());
players_.erase(playerId);
}
......@@ -136,6 +134,7 @@ void MediaInspectorContextImpl::DestroyPlayer(const WebString& playerId) {
// unsent players become dead when destroyed.
unsent_players_.EraseAt(unsent_players_.Find(String(playerId)));
dead_players_.push_back(playerId);
players_.erase(playerId);
} else {
expendable_players_.push_back(playerId);
}
......
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