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

Unified Diff: cc/surfaces/surface_manager.cc

Issue 590613002: Ensure SurfaceManager is only ever used from one thread. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 | « cc/surfaces/surface_manager.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/surfaces/surface_manager.cc
diff --git a/cc/surfaces/surface_manager.cc b/cc/surfaces/surface_manager.cc
index 363f0924439f54ca259ab10ccafd99defc8abeec..1e3699d30a5c82afe399c92c5288247ff56f943c 100644
--- a/cc/surfaces/surface_manager.cc
+++ b/cc/surfaces/surface_manager.cc
@@ -10,24 +10,29 @@
namespace cc {
SurfaceManager::SurfaceManager() {
+ thread_checker_.DetachFromThread();
}
SurfaceManager::~SurfaceManager() {
+ DCHECK(thread_checker_.CalledOnValidThread());
}
void SurfaceManager::RegisterSurface(Surface* surface) {
+ DCHECK(thread_checker_.CalledOnValidThread());
DCHECK(surface);
DCHECK(!surface_map_.count(surface->surface_id()));
surface_map_[surface->surface_id()] = surface;
}
void SurfaceManager::DeregisterSurface(SurfaceId surface_id) {
+ DCHECK(thread_checker_.CalledOnValidThread());
SurfaceMap::iterator it = surface_map_.find(surface_id);
DCHECK(it != surface_map_.end());
surface_map_.erase(it);
}
Surface* SurfaceManager::GetSurfaceForId(SurfaceId surface_id) {
+ DCHECK(thread_checker_.CalledOnValidThread());
SurfaceMap::iterator it = surface_map_.find(surface_id);
if (it == surface_map_.end())
return NULL;
@@ -35,6 +40,7 @@ Surface* SurfaceManager::GetSurfaceForId(SurfaceId surface_id) {
}
void SurfaceManager::SurfaceModified(SurfaceId surface_id) {
+ DCHECK(thread_checker_.CalledOnValidThread());
FOR_EACH_OBSERVER(
SurfaceDamageObserver, observer_list_, OnSurfaceDamaged(surface_id));
}
« no previous file with comments | « cc/surfaces/surface_manager.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698