Ensure SurfaceManager is only ever used from one thread.

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

Cr-Commit-Position: refs/heads/master@{#295818}

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));
 }

cc/surfaces/surface_manager.h

@@ -8,6 +8,7 @@
 #include "base/containers/hash_tables.h"
 #include "base/macros.h"
 #include "base/observer_list.h"
+#include "base/threading/thread_checker.h"
 #include "cc/surfaces/surface_damage_observer.h"
 #include "cc/surfaces/surface_id.h"
 #include "cc/surfaces/surfaces_export.h"
@@ -40,6 +41,7 @@ class CC_SURFACES_EXPORT SurfaceManager {
   typedef base::hash_map<SurfaceId, Surface*> SurfaceMap;
   SurfaceMap surface_map_;
   ObserverList<SurfaceDamageObserver> observer_list_;
+  base::ThreadChecker thread_checker_;
 
   DISALLOW_COPY_AND_ASSIGN(SurfaceManager);
 };