Skip to content

Commit

Permalink
Extend invalid_rects_ lock to protect read as well as update.
Browse files Browse the repository at this point in the history
BUG=79450
TEST=

Review URL: http://codereview.chromium.org/6852022

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81725 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
jamiewalch@chromium.org committed Apr 15, 2011
1 parent 6e3616e commit 9def5f0
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions remoting/host/capturer_helper.cc
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,12 @@ void CapturerHelper::ClearInvalidRects() {
}

void CapturerHelper::InvalidateRects(const InvalidRects& inval_rects) {
base::AutoLock auto_inval_rects_lock(inval_rects_lock_);
InvalidRects temp_rects;
std::set_union(inval_rects_.begin(), inval_rects_.end(),
inval_rects.begin(), inval_rects.end(),
std::inserter(temp_rects, temp_rects.begin()));
{
base::AutoLock auto_inval_rects_lock(inval_rects_lock_);
inval_rects_.swap(temp_rects);
}
inval_rects_.swap(temp_rects);
}

void CapturerHelper::InvalidateScreen(const gfx::Size& size) {
Expand Down

0 comments on commit 9def5f0

Please sign in to comment.