Remove static thread pointers from CC

cc/prioritized_texture.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 
 #include "cc/prioritized_texture.h"
 
 #include "cc/platform_color.h"
 #include "cc/prioritized_texture_manager.h"
 #include "cc/priority_calculator.h"
-#include "cc/proxy.h"
 #include <algorithm>
 
 using namespace std;
 
 namespace cc {
 
 PrioritizedTexture::PrioritizedTexture(PrioritizedTextureManager* manager, IntSize size, GLenum format)
     : m_size(size)
     , m_format(format)
     , m_bytes(0)
@@ skipping 123 matching lines @@
 }
 
 PrioritizedTexture::Backing::~Backing()
 {
     DCHECK(!m_owner);
     DCHECK(m_resourceHasBeenDeleted);
 }
 
 void PrioritizedTexture::Backing::deleteResource(ResourceProvider* resourceProvider)
 {
-    DCHECK(Proxy::isImplThread());
+    DCHECK(m_threadChecker.CalledOnValidThread());
     DCHECK(!m_resourceHasBeenDeleted);
 #ifndef NDEBUG
     DCHECK(resourceProvider == m_resourceProvider);
 #endif
 
     resourceProvider->deleteResource(id());
     setId(0);
     m_resourceHasBeenDeleted = true;
 }
 
 bool PrioritizedTexture::Backing::resourceHasBeenDeleted() const
 {
-    DCHECK(Proxy::isImplThread());
+    DCHECK(m_threadChecker.CalledOnValidThread());
     return m_resourceHasBeenDeleted;
 }
 
 bool PrioritizedTexture::Backing::canBeRecycled() const
 {
-    DCHECK(Proxy::isImplThread());
+    DCHECK(m_threadChecker.CalledOnValidThread());
     return !m_wasAbovePriorityCutoffAtLastPriorityUpdate && !m_inDrawingImplTree;
 }
 
 void PrioritizedTexture::Backing::updatePriority()
 {
-    DCHECK(Proxy::isImplThread() && Proxy::isMainThreadBlocked());
+    DCHECK(m_threadChecker.CalledOnValidThread());

[danakj, 2012/10/25 05:06:06]

The main thread is blocked part here is kinda important, I'm not sure it makes
sense to remove that.

How about adding a for-debug method on PTM and have this call that? Since PTM
has a Proxy*

     if (m_owner) {
         m_priorityAtLastPriorityUpdate = m_owner->requestPriority();
         m_wasAbovePriorityCutoffAtLastPriorityUpdate = m_owner->isAbovePriorityCutoff();
     } else {
         m_priorityAtLastPriorityUpdate = PriorityCalculator::lowestPriority();
         m_wasAbovePriorityCutoffAtLastPriorityUpdate = false;
     }
 }
 
 void PrioritizedTexture::Backing::updateInDrawingImplTree()
 {
-    DCHECK(Proxy::isImplThread() && Proxy::isMainThreadBlocked());
+    DCHECK(m_threadChecker.CalledOnValidThread());

[danakj, 2012/10/25 05:06:06]

ditto

     m_inDrawingImplTree = !!owner();
     if (!m_inDrawingImplTree)
         DCHECK(m_priorityAtLastPriorityUpdate == PriorityCalculator::lowestPriority());
 }
 
 } // namespace cc