Commit 1110874c authored by ckehoe's avatar ckehoe Committed by Commit bot

Fixing race condition in AudioDirectiveHandler

BUG=489442

Review URL: https://codereview.chromium.org/1151603003

Cr-Commit-Position: refs/heads/master@{#330855}
parent bf94627a
...@@ -30,12 +30,14 @@ namespace { ...@@ -30,12 +30,14 @@ namespace {
base::TimeTicks GetEarliestEventTime(AudioDirectiveList* list, base::TimeTicks GetEarliestEventTime(AudioDirectiveList* list,
base::TimeTicks event_time) { base::TimeTicks event_time) {
if (!list->GetActiveDirective()) scoped_ptr<AudioDirective> active_directive = list->GetActiveDirective();
if (!active_directive)
return event_time; return event_time;
if (event_time.is_null())
return active_directive->end_time;
return event_time.is_null() ? return std::min(active_directive->end_time, event_time);
list->GetActiveDirective()->end_time :
std::min(list->GetActiveDirective()->end_time, event_time);
} }
void ConvertDirectives(const std::vector<AudioDirective>& in_directives, void ConvertDirectives(const std::vector<AudioDirective>& in_directives,
......
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