Remove static thread pointers from CC

cc/resource_provider.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 CCResourceProvider_h
 #define CCResourceProvider_h
 
+#include "IntRect.h"

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

?

[aelias_OOO_until_Jul13, 2012/10/25 06:11:06]

There's a mistaken forward-declaration of IntRect inside cc namespace below
which caused a compile error for me.  This is a drive-by fix.

[danakj, 2012/10/25 14:59:50]

Hm, well FWIW, this file also includes cc::IntRect from cc/stubs/

 #include "IntSize.h"
 #include "base/basictypes.h"
 #include "base/hash_tables.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/threading/thread_checker.h"
 #include "cc/graphics_context.h"
 #include "cc/texture_copier.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include <deque>
 #include <vector>
 
 namespace WebKit {
 class WebGraphicsContext3D;
 }
 
 namespace cc {
 
-class IntRect;
 class LayerTextureSubImage;
 class TextureCopier;
 class TextureUploader;
 
-// Thread-safety notes: this class is not thread-safe and can only be called
-// from the thread it was created on (in practice, the compositor thread).
+// This class is not thread-safe and can only be called from the thread it was
+// created on (in practice, the impl thread).
 class ResourceProvider {
 public:
     typedef unsigned ResourceId;
     typedef std::vector<ResourceId> ResourceIdArray;
     typedef base::hash_map<ResourceId, ResourceId> ResourceIdMap;
     enum TextureUsageHint { TextureUsageAny, TextureUsageFramebuffer };
     enum ResourceType {
         GLTexture = 1,
         Bitmap,
     };
@@ skipping 190 matching lines @@
     struct Child {
         Child();
         ~Child();
 
         int pool;
         ResourceIdMap childToParentMap;
         ResourceIdMap parentToChildMap;
     };
     typedef base::hash_map<int, Child> ChildMap;
 
-    explicit ResourceProvider(GraphicsContext*);
+    ResourceProvider(GraphicsContext*);
     bool initialize();
 
     const Resource* lockForRead(ResourceId);
     void unlockForRead(ResourceId);
     const Resource* lockForWrite(ResourceId);
     void unlockForWrite(ResourceId);
     static void populateSkBitmapWithResource(SkBitmap*, const Resource*);
 
     bool transferResource(WebKit::WebGraphicsContext3D*, ResourceId, TransferableResource*);
     void trimMailboxDeque();
     void deleteResourceInternal(ResourceMap::iterator it);
 
     GraphicsContext* m_context;
     ResourceId m_nextId;
     ResourceMap m_resources;
     int m_nextChild;
     ChildMap m_children;
 
     std::deque<Mailbox> m_mailboxes;
 
     ResourceType m_defaultResourceType;
     bool m_useTextureStorageExt;
     bool m_useTextureUsageHint;
     bool m_useShallowFlush;
     scoped_ptr<TextureUploader> m_textureUploader;
     scoped_ptr<AcceleratedTextureCopier> m_textureCopier;
     int m_maxTextureSize;
 
+    base::ThreadChecker m_threadChecker;
+
     DISALLOW_COPY_AND_ASSIGN(ResourceProvider);
 };
 
 }
 
 #endif