Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3516)

Unified Diff: cc/resource_provider.h

Issue 11189043: cc: Rename cc classes and members to match filenames (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: cc/resource_provider.h
diff --git a/cc/resource_provider.h b/cc/resource_provider.h
index 3c2ba509bfc18e8057cec5125cbb4d3e2cb12e69..935ba81fbb1f718e33deef3732a81bb1a799b86a 100644
--- a/cc/resource_provider.h
+++ b/cc/resource_provider.h
@@ -30,7 +30,7 @@ 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).
-class CCResourceProvider {
+class ResourceProvider {
public:
typedef unsigned ResourceId;
typedef std::vector<ResourceId> ResourceIdArray;
@@ -58,9 +58,9 @@ public:
unsigned syncPoint;
};
- static scoped_ptr<CCResourceProvider> create(CCGraphicsContext*);
+ static scoped_ptr<ResourceProvider> create(GraphicsContext*);
- virtual ~CCResourceProvider();
+ virtual ~ResourceProvider();
WebKit::WebGraphicsContext3D* graphicsContext3D();
TextureUploader* textureUploader() const { return m_textureUploader.get(); }
@@ -115,13 +115,13 @@ public:
// Prepares resources to be transfered to the parent, moving them to
// mailboxes and serializing meta-data into TransferableResources.
- // Resources are not removed from the CCResourceProvider, but are markes as
+ // Resources are not removed from the ResourceProvider, but are markes as
// "in use".
TransferableResourceList prepareSendToParent(const ResourceIdArray&);
// Prepares resources to be transfered back to the child, moving them to
// mailboxes and serializing meta-data into TransferableResources.
- // Resources are removed from the CCResourceProvider. Note: the resource IDs
+ // Resources are removed from the ResourceProvider. Note: the resource IDs
// passed are in the parent namespace and will be translated to the child
// namespace when returned.
TransferableResourceList prepareSendToChild(int child, const ResourceIdArray&);
@@ -142,20 +142,20 @@ public:
// Only for testing
size_t mailboxCount() const { return m_mailboxes.size(); }
- // The following lock classes are part of the CCResourceProvider API and are
+ // The following lock classes are part of the ResourceProvider API and are
// needed to read and write the resource contents. The user must ensure
// that they only use GL locks on GL resources, etc, and this is enforced
// by assertions.
class ScopedReadLockGL {
public:
- ScopedReadLockGL(CCResourceProvider*, CCResourceProvider::ResourceId);
+ ScopedReadLockGL(ResourceProvider*, ResourceProvider::ResourceId);
~ScopedReadLockGL();
unsigned textureId() const { return m_textureId; }
private:
- CCResourceProvider* m_resourceProvider;
- CCResourceProvider::ResourceId m_resourceId;
+ ResourceProvider* m_resourceProvider;
+ ResourceProvider::ResourceId m_resourceId;
unsigned m_textureId;
DISALLOW_COPY_AND_ASSIGN(ScopedReadLockGL);
@@ -163,14 +163,14 @@ public:
class ScopedWriteLockGL {
public:
- ScopedWriteLockGL(CCResourceProvider*, CCResourceProvider::ResourceId);
+ ScopedWriteLockGL(ResourceProvider*, ResourceProvider::ResourceId);
~ScopedWriteLockGL();
unsigned textureId() const { return m_textureId; }
private:
- CCResourceProvider* m_resourceProvider;
- CCResourceProvider::ResourceId m_resourceId;
+ ResourceProvider* m_resourceProvider;
+ ResourceProvider::ResourceId m_resourceId;
unsigned m_textureId;
DISALLOW_COPY_AND_ASSIGN(ScopedWriteLockGL);
@@ -178,14 +178,14 @@ public:
class ScopedReadLockSoftware {
public:
- ScopedReadLockSoftware(CCResourceProvider*, CCResourceProvider::ResourceId);
+ ScopedReadLockSoftware(ResourceProvider*, ResourceProvider::ResourceId);
~ScopedReadLockSoftware();
const SkBitmap* skBitmap() const { return &m_skBitmap; }
private:
- CCResourceProvider* m_resourceProvider;
- CCResourceProvider::ResourceId m_resourceId;
+ ResourceProvider* m_resourceProvider;
+ ResourceProvider::ResourceId m_resourceId;
SkBitmap m_skBitmap;
DISALLOW_COPY_AND_ASSIGN(ScopedReadLockSoftware);
@@ -193,14 +193,14 @@ public:
class ScopedWriteLockSoftware {
public:
- ScopedWriteLockSoftware(CCResourceProvider*, CCResourceProvider::ResourceId);
+ ScopedWriteLockSoftware(ResourceProvider*, ResourceProvider::ResourceId);
~ScopedWriteLockSoftware();
SkCanvas* skCanvas() { return m_skCanvas.get(); }
private:
- CCResourceProvider* m_resourceProvider;
- CCResourceProvider::ResourceId m_resourceId;
+ ResourceProvider* m_resourceProvider;
+ ResourceProvider::ResourceId m_resourceId;
SkBitmap m_skBitmap;
scoped_ptr<SkCanvas> m_skCanvas;
@@ -236,7 +236,7 @@ private:
};
typedef base::hash_map<int, Child> ChildMap;
- explicit CCResourceProvider(CCGraphicsContext*);
+ explicit ResourceProvider(GraphicsContext*);
bool initialize();
const Resource* lockForRead(ResourceId);
@@ -249,7 +249,7 @@ private:
void trimMailboxDeque();
void deleteResourceInternal(ResourceMap::iterator it);
- CCGraphicsContext* m_context;
+ GraphicsContext* m_context;
ResourceId m_nextId;
ResourceMap m_resources;
int m_nextChild;
@@ -266,7 +266,7 @@ private:
scoped_ptr<AcceleratedTextureCopier> m_textureCopier;
int m_maxTextureSize;
- DISALLOW_COPY_AND_ASSIGN(CCResourceProvider);
+ DISALLOW_COPY_AND_ASSIGN(ResourceProvider);
};
}
« cc/active_animation.h ('K') | « cc/rendering_stats.h ('k') | cc/resource_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698