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

cc/prioritized_texture.h

 // 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.
 
 #ifndef CC_PRIORITIZED_TEXTURE_H_
 #define CC_PRIORITIZED_TEXTURE_H_
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/cc_export.h"
 #include "cc/priority_calculator.h"
 #include "cc/resource_provider.h"
 #include "cc/texture.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
 #include "ui/gfx/vector2d.h"
 #include "third_party/khronos/GLES2/gl2.h"
 
 namespace cc {
 
 class PrioritizedTextureManager;
-class Proxy;
 
 class CC_EXPORT PrioritizedTexture {
 public:
     static scoped_ptr<PrioritizedTexture> create(PrioritizedTextureManager* manager, gfx::Size size, GLenum format)
     {
         return make_scoped_ptr(new PrioritizedTexture(manager, size, format));
     }
     static scoped_ptr<PrioritizedTexture> create(PrioritizedTextureManager* manager)
     {
         return make_scoped_ptr(new PrioritizedTexture(manager, gfx::Size(), 0));
@@ skipping 68 matching lines @@
         PrioritizedTexture* owner() { return m_owner; }
         bool canBeRecycled() const;
         int requestPriorityAtLastPriorityUpdate() const { return m_priorityAtLastPriorityUpdate; }
         bool wasAbovePriorityCutoffAtLastPriorityUpdate() const { return m_wasAbovePriorityCutoffAtLastPriorityUpdate; }
         bool inDrawingImplTree() const { return m_inDrawingImplTree; }
 
         void deleteResource(ResourceProvider*);
         bool resourceHasBeenDeleted() const;
 
     private:
-        const Proxy* proxy() const;
-
         friend class PrioritizedTexture;
         PrioritizedTexture* m_owner;
         int m_priorityAtLastPriorityUpdate;
         bool m_wasAbovePriorityCutoffAtLastPriorityUpdate;
 
         // Set if this is currently-drawing impl tree.
         bool m_inDrawingImplTree;
 
         bool m_resourceHasBeenDeleted;
 #ifndef NDEBUG
         ResourceProvider* m_resourceProvider;
 #endif
+
         DISALLOW_COPY_AND_ASSIGN(Backing);
     };
 
     PrioritizedTexture(PrioritizedTextureManager*, gfx::Size, GLenum format);
 
     bool isAbovePriorityCutoff() { return m_isAbovePriorityCutoff; }
     void setAbovePriorityCutoff(bool isAbovePriorityCutoff) { m_isAbovePriorityCutoff = isAbovePriorityCutoff; }
     void setManagerInternal(PrioritizedTextureManager* manager) { m_manager = manager; }
 
     Backing* backing() const { return m_backing; }
@@ skipping 11 matching lines @@
 
     Backing* m_backing;
     PrioritizedTextureManager* m_manager;
 
     DISALLOW_COPY_AND_ASSIGN(PrioritizedTexture);
 };
 
 }  // namespace cc
 
 #endif  // CC_PRIORITIZED_TEXTURE_H_