A speculative Revert for r165872 - Remove static thread pointers from CC, attempt 2

cc/single_thread_proxy.h

 // Copyright 2011 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.
 
 #ifndef CC_SINGLE_THREAD_PROXY_H_
 #define CC_SINGLE_THREAD_PROXY_H_
 
 #include <limits>
 
 #include "base/time.h"
@@ skipping 73 matching lines @@
     bool m_nextFrameIsNewlyCommittedFrame;
 
     base::TimeDelta m_totalCommitTime;
     size_t m_totalCommitCount;
 };
 
 // For use in the single-threaded case. In debug builds, it pretends that the
 // code is running on the impl thread to satisfy assertion checks.
 class DebugScopedSetImplThread {
 public:
-    explicit DebugScopedSetImplThread(Proxy* proxy)
-        : m_proxy(proxy)
+    DebugScopedSetImplThread()
     {
 #ifndef NDEBUG
-        m_previousValue = m_proxy->m_implThreadIsOverridden;
-        m_proxy->setCurrentThreadIsImplThread(true);
+        Proxy::setCurrentThreadIsImplThread(true);
 #endif
     }
     ~DebugScopedSetImplThread()
     {
 #ifndef NDEBUG
-        m_proxy->setCurrentThreadIsImplThread(m_previousValue);
+        Proxy::setCurrentThreadIsImplThread(false);
 #endif
     }
-private:
-    bool m_previousValue;
-    Proxy* m_proxy;
 };
 
 // For use in the single-threaded case. In debug builds, it pretends that the
 // code is running on the main thread to satisfy assertion checks.
 class DebugScopedSetMainThread {
 public:
-    explicit DebugScopedSetMainThread(Proxy* proxy)
-        : m_proxy(proxy)
+    DebugScopedSetMainThread()
     {
 #ifndef NDEBUG
-        m_previousValue = m_proxy->m_implThreadIsOverridden;
-        m_proxy->setCurrentThreadIsImplThread(false);
+        Proxy::setCurrentThreadIsImplThread(false);
 #endif
     }
     ~DebugScopedSetMainThread()
     {
 #ifndef NDEBUG
-        m_proxy->setCurrentThreadIsImplThread(m_previousValue);
+        Proxy::setCurrentThreadIsImplThread(true);
 #endif
     }
-private:
-    bool m_previousValue;
-    Proxy* m_proxy;
 };
 
 // For use in the single-threaded case. In debug builds, it pretends that the
 // code is running on the impl thread and that the main thread is blocked to
 // satisfy assertion checks
 class DebugScopedSetImplThreadAndMainThreadBlocked {
-public:
-    explicit DebugScopedSetImplThreadAndMainThreadBlocked(Proxy* proxy)
-        : m_implThread(proxy)
-        , m_mainThreadBlocked(proxy)
-    {
-    }
 private:
     DebugScopedSetImplThread m_implThread;
     DebugScopedSetMainThreadBlocked m_mainThreadBlocked;
 };
 
 } // namespace cc
 
 #endif  // CC_SINGLE_THREAD_PROXY_H_