cc: Rename cc classes and members to match filenames

cc/resource_provider.cc

Index: cc/resource_provider.cc
diff --git a/cc/resource_provider.cc b/cc/resource_provider.cc
index 34b0aa67bd5bc795899cc821ba100a155987ec60..14e2815ba22e71c6fd4f4329491e99f5a8d2d628 100644
--- a/cc/resource_provider.cc
+++ b/cc/resource_provider.cc
@@ -51,15 +51,15 @@ static bool isTextureFormatSupportedForStorage(GC3Denum format)
     return (format == GraphicsContext3D::RGBA || format == Extensions3D::BGRA_EXT);
 }
 
-CCResourceProvider::TransferableResourceList::TransferableResourceList()
+ResourceProvider::TransferableResourceList::TransferableResourceList()
 {
 }
 
-CCResourceProvider::TransferableResourceList::~TransferableResourceList()
+ResourceProvider::TransferableResourceList::~TransferableResourceList()
 {
 }
 
-CCResourceProvider::Resource::Resource()
+ResourceProvider::Resource::Resource()
     : glId(0)
     , pixels(0)
     , pool(0)
@@ -74,7 +74,7 @@ CCResourceProvider::Resource::Resource()
 {
 }
 
-CCResourceProvider::Resource::Resource(unsigned textureId, int pool, const IntSize& size, GC3Denum format)
+ResourceProvider::Resource::Resource(unsigned textureId, int pool, const IntSize& size, GC3Denum format)
     : glId(textureId)
     , pixels(0)
     , pool(pool)
@@ -89,7 +89,7 @@ CCResourceProvider::Resource::Resource(unsigned textureId, int pool, const IntSi
 {
 }
 
-CCResourceProvider::Resource::Resource(uint8_t* pixels, int pool, const IntSize& size, GC3Denum format)
+ResourceProvider::Resource::Resource(uint8_t* pixels, int pool, const IntSize& size, GC3Denum format)
     : glId(0)
     , pixels(pixels)
     , pool(pool)
@@ -104,23 +104,23 @@ CCResourceProvider::Resource::Resource(uint8_t* pixels, int pool, const IntSize&
 {
 }
 
-CCResourceProvider::Child::Child()
+ResourceProvider::Child::Child()
 {
 }
 
-CCResourceProvider::Child::~Child()
+ResourceProvider::Child::~Child()
 {
 }
 
-scoped_ptr<CCResourceProvider> CCResourceProvider::create(CCGraphicsContext* context)
+scoped_ptr<ResourceProvider> ResourceProvider::create(GraphicsContext* context)
 {
-    scoped_ptr<CCResourceProvider> resourceProvider(new CCResourceProvider(context));
+    scoped_ptr<ResourceProvider> resourceProvider(new ResourceProvider(context));
     if (!resourceProvider->initialize())
-        return scoped_ptr<CCResourceProvider>();
+        return scoped_ptr<ResourceProvider>();
     return resourceProvider.Pass();
 }
 
-CCResourceProvider::~CCResourceProvider()
+ResourceProvider::~ResourceProvider()
 {
     WebGraphicsContext3D* context3d = m_context->context3D();
     if (!context3d || !context3d->makeContextCurrent())
@@ -129,22 +129,22 @@ CCResourceProvider::~CCResourceProvider()
     m_textureCopier.reset();
 }
 
-WebGraphicsContext3D* CCResourceProvider::graphicsContext3D()
+WebGraphicsContext3D* ResourceProvider::graphicsContext3D()
 {
-    ASSERT(CCProxy::isImplThread());
+    ASSERT(Proxy::isImplThread());
     return m_context->context3D();
 }
 
-bool CCResourceProvider::inUseByConsumer(ResourceId id)
+bool ResourceProvider::inUseByConsumer(ResourceId id)
 {
-    ASSERT(CCProxy::isImplThread());
+    ASSERT(Proxy::isImplThread());
     ResourceMap::iterator it = m_resources.find(id);
     CHECK(it != m_resources.end());
     Resource* resource = &it->second;
     return !!resource->lockForReadCount || resource->exported;
 }
 
-CCResourceProvider::ResourceId CCResourceProvider::createResource(int pool, const IntSize& size, GC3Denum format, TextureUsageHint hint)
+ResourceProvider::ResourceId ResourceProvider::createResource(int pool, const IntSize& size, GC3Denum format, TextureUsageHint hint)
 {
     switch (m_defaultResourceType) {
     case GLTexture:
@@ -158,9 +158,9 @@ CCResourceProvider::ResourceId CCResourceProvider::createResource(int pool, cons
     return 0;
 }
 
-CCResourceProvider::ResourceId CCResourceProvider::createGLTexture(int pool, const IntSize& size, GC3Denum format, TextureUsageHint hint)
+ResourceProvider::ResourceId ResourceProvider::createGLTexture(int pool, const IntSize& size, GC3Denum format, TextureUsageHint hint)
 {
-    ASSERT(CCProxy::isImplThread());
+    ASSERT(Proxy::isImplThread());
     unsigned textureId = 0;
     WebGraphicsContext3D* context3d = m_context->context3D();
     ASSERT(context3d);
@@ -184,9 +184,9 @@ CCResourceProvider::ResourceId CCResourceProvider::createGLTexture(int pool, con
     return id;
 }
 
-CCResourceProvider::ResourceId CCResourceProvider::createBitmap(int pool, const IntSize& size)
+ResourceProvider::ResourceId ResourceProvider::createBitmap(int pool, const IntSize& size)
 {
-    ASSERT(CCProxy::isImplThread());
+    ASSERT(Proxy::isImplThread());
 
     uint8_t* pixels = new uint8_t[size.width() * size.height() * 4];
 
@@ -196,9 +196,9 @@ CCResourceProvider::ResourceId CCResourceProvider::createBitmap(int pool, const
     return id;
 }
 
-CCResourceProvider::ResourceId CCResourceProvider::createResourceFromExternalTexture(unsigned textureId)
+ResourceProvider::ResourceId ResourceProvider::createResourceFromExternalTexture(unsigned textureId)
 {
-    ASSERT(CCProxy::isImplThread());
+    ASSERT(Proxy::isImplThread());
     ASSERT(m_context->context3D());
     ResourceId id = m_nextId++;
     Resource resource(textureId, 0, IntSize(), 0);
@@ -207,9 +207,9 @@ CCResourceProvider::ResourceId CCResourceProvider::createResourceFromExternalTex
     return id;
 }
 
-void CCResourceProvider::deleteResource(ResourceId id)
+void ResourceProvider::deleteResource(ResourceId id)
 {
-    ASSERT(CCProxy::isImplThread());
+    ASSERT(Proxy::isImplThread());
     ResourceMap::iterator it = m_resources.find(id);
     CHECK(it != m_resources.end());
     Resource* resource = &it->second;
@@ -224,7 +224,7 @@ void CCResourceProvider::deleteResource(ResourceId id)
         deleteResourceInternal(it);
 }
 
-void CCResourceProvider::deleteResourceInternal(ResourceMap::iterator it)
+void ResourceProvider::deleteResourceInternal(ResourceMap::iterator it)
 {
     Resource* resource = &it->second;
     if (resource->glId && !resource->external) {
@@ -238,9 +238,9 @@ void CCResourceProvider::deleteResourceInternal(ResourceMap::iterator it)
     m_resources.erase(it);
 }
 
-void CCResourceProvider::deleteOwnedResources(int pool)
+void ResourceProvider::deleteOwnedResources(int pool)
 {
-    ASSERT(CCProxy::isImplThread());
+    ASSERT(Proxy::isImplThread());
     ResourceIdArray toDelete;
     for (ResourceMap::iterator it = m_resources.begin(); it != m_resources.end(); ++it) {
         if (it->second.pool == pool && !it->second.external && !it->second.markedForDeletion)
@@ -250,7 +250,7 @@ void CCResourceProvider::deleteOwnedResources(int pool)
         deleteResource(*it);
 }
 
-CCResourceProvider::ResourceType CCResourceProvider::resourceType(ResourceId id)
+ResourceProvider::ResourceType ResourceProvider::resourceType(ResourceId id)
 {
     ResourceMap::iterator it = m_resources.find(id);
     CHECK(it != m_resources.end());
@@ -258,9 +258,9 @@ CCResourceProvider::ResourceType CCResourceProvider::resourceType(ResourceId id)
     return resource->type;
 }
 
-void CCResourceProvider::upload(ResourceId id, const uint8_t* image, const IntRect& imageRect, const IntRect& sourceRect, const IntSize& destOffset)
+void ResourceProvider::upload(ResourceId id, const uint8_t* image, const IntRect& imageRect, const IntRect& sourceRect, const IntSize& destOffset)
 {
-    ASSERT(CCProxy::isImplThread());
+    ASSERT(Proxy::isImplThread());
     ResourceMap::iterator it = m_resources.find(id);
     CHECK(it != m_resources.end());
     Resource* resource = &it->second;
@@ -292,17 +292,17 @@ void CCResourceProvider::upload(ResourceId id, const uint8_t* image, const IntRe
     }
 }
 
-void CCResourceProvider::flush()
+void ResourceProvider::flush()
 {
-    ASSERT(CCProxy::isImplThread());
+    ASSERT(Proxy::isImplThread());
     WebGraphicsContext3D* context3d = m_context->context3D();
     if (context3d)
         context3d->flush();
 }
 
-bool CCResourceProvider::shallowFlushIfSupported()
+bool ResourceProvider::shallowFlushIfSupported()
 {
-    ASSERT(CCProxy::isImplThread());
+    ASSERT(Proxy::isImplThread());
     WebGraphicsContext3D* context3d = m_context->context3D();
     if (!context3d || !m_useShallowFlush)
         return false;
@@ -311,9 +311,9 @@ bool CCResourceProvider::shallowFlushIfSupported()
     return true;
 }
 
-const CCResourceProvider::Resource* CCResourceProvider::lockForRead(ResourceId id)
+const ResourceProvider::Resource* ResourceProvider::lockForRead(ResourceId id)
 {
-    ASSERT(CCProxy::isImplThread());
+    ASSERT(Proxy::isImplThread());
     ResourceMap::iterator it = m_resources.find(id);
     CHECK(it != m_resources.end());
 
@@ -324,9 +324,9 @@ const CCResourceProvider::Resource* CCResourceProvider::lockForRead(ResourceId i
     return resource;
 }
 
-void CCResourceProvider::unlockForRead(ResourceId id)
+void ResourceProvider::unlockForRead(ResourceId id)
 {
-    ASSERT(CCProxy::isImplThread());
+    ASSERT(Proxy::isImplThread());
     ResourceMap::iterator it = m_resources.find(id);
     CHECK(it != m_resources.end());
     Resource* resource = &it->second;
@@ -335,9 +335,9 @@ void CCResourceProvider::unlockForRead(ResourceId id)
     resource->lockForReadCount--;
 }
 
-const CCResourceProvider::Resource* CCResourceProvider::lockForWrite(ResourceId id)
+const ResourceProvider::Resource* ResourceProvider::lockForWrite(ResourceId id)
 {
-    ASSERT(CCProxy::isImplThread());
+    ASSERT(Proxy::isImplThread());
     ResourceMap::iterator it = m_resources.find(id);
     CHECK(it != m_resources.end());
     Resource* resource = &it->second;
@@ -349,9 +349,9 @@ const CCResourceProvider::Resource* CCResourceProvider::lockForWrite(ResourceId
     return resource;
 }
 
-void CCResourceProvider::unlockForWrite(ResourceId id)
+void ResourceProvider::unlockForWrite(ResourceId id)
 {
-    ASSERT(CCProxy::isImplThread());
+    ASSERT(Proxy::isImplThread());
     ResourceMap::iterator it = m_resources.find(id);
     CHECK(it != m_resources.end());
     Resource* resource = &it->second;
@@ -361,7 +361,7 @@ void CCResourceProvider::unlockForWrite(ResourceId id)
     resource->lockedForWrite = false;
 }
 
-CCResourceProvider::ScopedReadLockGL::ScopedReadLockGL(CCResourceProvider* resourceProvider, CCResourceProvider::ResourceId resourceId)
+ResourceProvider::ScopedReadLockGL::ScopedReadLockGL(ResourceProvider* resourceProvider, ResourceProvider::ResourceId resourceId)
     : m_resourceProvider(resourceProvider)
     , m_resourceId(resourceId)
     , m_textureId(resourceProvider->lockForRead(resourceId)->glId)
@@ -369,12 +369,12 @@ CCResourceProvider::ScopedReadLockGL::ScopedReadLockGL(CCResourceProvider* resou
     ASSERT(m_textureId);
 }
 
-CCResourceProvider::ScopedReadLockGL::~ScopedReadLockGL()
+ResourceProvider::ScopedReadLockGL::~ScopedReadLockGL()
 {
     m_resourceProvider->unlockForRead(m_resourceId);
 }
 
-CCResourceProvider::ScopedWriteLockGL::ScopedWriteLockGL(CCResourceProvider* resourceProvider, CCResourceProvider::ResourceId resourceId)
+ResourceProvider::ScopedWriteLockGL::ScopedWriteLockGL(ResourceProvider* resourceProvider, ResourceProvider::ResourceId resourceId)
     : m_resourceProvider(resourceProvider)
     , m_resourceId(resourceId)
     , m_textureId(resourceProvider->lockForWrite(resourceId)->glId)
@@ -382,12 +382,12 @@ CCResourceProvider::ScopedWriteLockGL::ScopedWriteLockGL(CCResourceProvider* res
     ASSERT(m_textureId);
 }
 
-CCResourceProvider::ScopedWriteLockGL::~ScopedWriteLockGL()
+ResourceProvider::ScopedWriteLockGL::~ScopedWriteLockGL()
 {
     m_resourceProvider->unlockForWrite(m_resourceId);
 }
 
-void CCResourceProvider::populateSkBitmapWithResource(SkBitmap* skBitmap, const Resource* resource)
+void ResourceProvider::populateSkBitmapWithResource(SkBitmap* skBitmap, const Resource* resource)
 {
     ASSERT(resource->pixels);
     ASSERT(resource->format == GraphicsContext3D::RGBA);
@@ -395,32 +395,32 @@ void CCResourceProvider::populateSkBitmapWithResource(SkBitmap* skBitmap, const
     skBitmap->setPixels(resource->pixels);
 }
 
-CCResourceProvider::ScopedReadLockSoftware::ScopedReadLockSoftware(CCResourceProvider* resourceProvider, CCResourceProvider::ResourceId resourceId)
+ResourceProvider::ScopedReadLockSoftware::ScopedReadLockSoftware(ResourceProvider* resourceProvider, ResourceProvider::ResourceId resourceId)
     : m_resourceProvider(resourceProvider)
     , m_resourceId(resourceId)
 {
-    CCResourceProvider::populateSkBitmapWithResource(&m_skBitmap, resourceProvider->lockForRead(resourceId));
+    ResourceProvider::populateSkBitmapWithResource(&m_skBitmap, resourceProvider->lockForRead(resourceId));
 }
 
-CCResourceProvider::ScopedReadLockSoftware::~ScopedReadLockSoftware()
+ResourceProvider::ScopedReadLockSoftware::~ScopedReadLockSoftware()
 {
     m_resourceProvider->unlockForRead(m_resourceId);
 }
 
-CCResourceProvider::ScopedWriteLockSoftware::ScopedWriteLockSoftware(CCResourceProvider* resourceProvider, CCResourceProvider::ResourceId resourceId)
+ResourceProvider::ScopedWriteLockSoftware::ScopedWriteLockSoftware(ResourceProvider* resourceProvider, ResourceProvider::ResourceId resourceId)
     : m_resourceProvider(resourceProvider)
     , m_resourceId(resourceId)
 {
-    CCResourceProvider::populateSkBitmapWithResource(&m_skBitmap, resourceProvider->lockForWrite(resourceId));
+    ResourceProvider::populateSkBitmapWithResource(&m_skBitmap, resourceProvider->lockForWrite(resourceId));
     m_skCanvas.reset(new SkCanvas(m_skBitmap));
 }
 
-CCResourceProvider::ScopedWriteLockSoftware::~ScopedWriteLockSoftware()
+ResourceProvider::ScopedWriteLockSoftware::~ScopedWriteLockSoftware()
 {
     m_resourceProvider->unlockForWrite(m_resourceId);
 }
 
-CCResourceProvider::CCResourceProvider(CCGraphicsContext* context)
+ResourceProvider::ResourceProvider(GraphicsContext* context)
     : m_context(context)
     , m_nextId(1)
     , m_nextChild(1)
@@ -432,9 +432,9 @@ CCResourceProvider::CCResourceProvider(CCGraphicsContext* context)
 {
 }
 
-bool CCResourceProvider::initialize()
+bool ResourceProvider::initialize()
 {
-    ASSERT(CCProxy::isImplThread());
+    ASSERT(Proxy::isImplThread());
     WebGraphicsContext3D* context3d = m_context->context3D();
     if (!context3d) {
         m_maxTextureSize = INT_MAX / 2;
@@ -470,9 +470,9 @@ bool CCResourceProvider::initialize()
     return true;
 }
 
-int CCResourceProvider::createChild(int pool)
+int ResourceProvider::createChild(int pool)
 {
-    ASSERT(CCProxy::isImplThread());
+    ASSERT(Proxy::isImplThread());
     Child childInfo;
     childInfo.pool = pool;
     int child = m_nextChild++;
@@ -480,9 +480,9 @@ int CCResourceProvider::createChild(int pool)
     return child;
 }
 
-void CCResourceProvider::destroyChild(int child)
+void ResourceProvider::destroyChild(int child)
 {
-    ASSERT(CCProxy::isImplThread());
+    ASSERT(Proxy::isImplThread());
     ChildMap::iterator it = m_children.find(child);
     ASSERT(it != m_children.end());
     deleteOwnedResources(it->second.pool);
@@ -490,17 +490,17 @@ void CCResourceProvider::destroyChild(int child)
     trimMailboxDeque();
 }
 
-const CCResourceProvider::ResourceIdMap& CCResourceProvider::getChildToParentMap(int child) const
+const ResourceProvider::ResourceIdMap& ResourceProvider::getChildToParentMap(int child) const
 {
-    ASSERT(CCProxy::isImplThread());
+    ASSERT(Proxy::isImplThread());
     ChildMap::const_iterator it = m_children.find(child);
     ASSERT(it != m_children.end());
     return it->second.childToParentMap;
 }
 
-CCResourceProvider::TransferableResourceList CCResourceProvider::prepareSendToParent(const ResourceIdArray& resources)
+ResourceProvider::TransferableResourceList ResourceProvider::prepareSendToParent(const ResourceIdArray& resources)
 {
-    ASSERT(CCProxy::isImplThread());
+    ASSERT(Proxy::isImplThread());
     TransferableResourceList list;
     list.syncPoint = 0;
     WebGraphicsContext3D* context3d = m_context->context3D();
@@ -520,9 +520,9 @@ CCResourceProvider::TransferableResourceList CCResourceProvider::prepareSendToPa
     return list;
 }
 
-CCResourceProvider::TransferableResourceList CCResourceProvider::prepareSendToChild(int child, const ResourceIdArray& resources)
+ResourceProvider::TransferableResourceList ResourceProvider::prepareSendToChild(int child, const ResourceIdArray& resources)
 {
-    ASSERT(CCProxy::isImplThread());
+    ASSERT(Proxy::isImplThread());
     TransferableResourceList list;
     list.syncPoint = 0;
     WebGraphicsContext3D* context3d = m_context->context3D();
@@ -547,9 +547,9 @@ CCResourceProvider::TransferableResourceList CCResourceProvider::prepareSendToCh
     return list;
 }
 
-void CCResourceProvider::receiveFromChild(int child, const TransferableResourceList& resources)
+void ResourceProvider::receiveFromChild(int child, const TransferableResourceList& resources)
 {
-    ASSERT(CCProxy::isImplThread());
+    ASSERT(Proxy::isImplThread());
     WebGraphicsContext3D* context3d = m_context->context3D();
     if (!context3d || !context3d->makeContextCurrent()) {
         // FIXME: Implement this path for software compositing.
@@ -579,9 +579,9 @@ void CCResourceProvider::receiveFromChild(int child, const TransferableResourceL
     }
 }
 
-void CCResourceProvider::receiveFromParent(const TransferableResourceList& resources)
+void ResourceProvider::receiveFromParent(const TransferableResourceList& resources)
 {
-    ASSERT(CCProxy::isImplThread());
+    ASSERT(Proxy::isImplThread());
     WebGraphicsContext3D* context3d = m_context->context3D();
     if (!context3d || !context3d->makeContextCurrent()) {
         // FIXME: Implement this path for software compositing.
@@ -603,9 +603,9 @@ void CCResourceProvider::receiveFromParent(const TransferableResourceList& resou
     }
 }
 
-bool CCResourceProvider::transferResource(WebGraphicsContext3D* context, ResourceId id, TransferableResource* resource)
+bool ResourceProvider::transferResource(WebGraphicsContext3D* context, ResourceId id, TransferableResource* resource)
 {
-    ASSERT(CCProxy::isImplThread());
+    ASSERT(Proxy::isImplThread());
     ResourceMap::const_iterator it = m_resources.find(id);
     CHECK(it != m_resources.end());
     const Resource* source = &it->second;
@@ -628,7 +628,7 @@ bool CCResourceProvider::transferResource(WebGraphicsContext3D* context, Resourc
     return true;
 }
 
-void CCResourceProvider::trimMailboxDeque()
+void ResourceProvider::trimMailboxDeque()
 {
     // Trim the mailbox deque to the maximum number of resources we may need to
     // send.