Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(355)

Unified Diff: remoting/host/capturer.cc

Issue 6142009: Upating the app, ceee, chrome, ipc, media, and net directories to use the correct lock.h file. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Unified patch updating all references to the new base/synchronization/lock.h Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/host/capturer.h ('k') | remoting/host/chromoting_host.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/capturer.cc
diff --git a/remoting/host/capturer.cc b/remoting/host/capturer.cc
index 3e32070703a51185da899d41e624bee78908533a..cf1bac75638032f1c8e524c75756285abdd4cacd 100644
--- a/remoting/host/capturer.cc
+++ b/remoting/host/capturer.cc
@@ -38,7 +38,7 @@ media::VideoFrame::Format Capturer::pixel_format() const {
}
void Capturer::ClearInvalidRects() {
- AutoLock auto_inval_rects_lock(inval_rects_lock_);
+ base::AutoLock auto_inval_rects_lock(inval_rects_lock_);
inval_rects_.clear();
}
@@ -48,13 +48,13 @@ void Capturer::InvalidateRects(const InvalidRects& inval_rects) {
inval_rects.begin(), inval_rects.end(),
std::inserter(temp_rects, temp_rects.begin()));
{
- AutoLock auto_inval_rects_lock(inval_rects_lock_);
+ base::AutoLock auto_inval_rects_lock(inval_rects_lock_);
inval_rects_.swap(temp_rects);
}
}
void Capturer::InvalidateFullScreen() {
- AutoLock auto_inval_rects_lock(inval_rects_lock_);
+ base::AutoLock auto_inval_rects_lock(inval_rects_lock_);
inval_rects_.clear();
inval_rects_.insert(gfx::Rect(0, 0, width_, height_));
}
@@ -68,7 +68,7 @@ void Capturer::CaptureInvalidRects(CaptureCompletedCallback* callback) {
// Braced to scope the lock.
InvalidRects local_rects;
{
- AutoLock auto_inval_rects_lock(inval_rects_lock_);
+ base::AutoLock auto_inval_rects_lock(inval_rects_lock_);
local_rects.swap(inval_rects_);
}
« no previous file with comments | « remoting/host/capturer.h ('k') | remoting/host/chromoting_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698