| Index: cc/throttled_texture_uploader.cc
|
| diff --git a/cc/throttled_texture_uploader.cc b/cc/throttled_texture_uploader.cc
|
| index b457f397ad0326844a6b81a2e7dcf75b5f0f10e3..db8c6d8317f9c6220290fa219cf4f8ed3fa09762 100644
|
| --- a/cc/throttled_texture_uploader.cc
|
| +++ b/cc/throttled_texture_uploader.cc
|
| @@ -171,7 +171,7 @@ void ThrottledTextureUploader::endQuery()
|
| m_numBlockingTextureUploads++;
|
| }
|
|
|
| -void ThrottledTextureUploader::uploadTexture(CCResourceProvider* resourceProvider, Parameters upload)
|
| +void ThrottledTextureUploader::uploadTexture(ResourceProvider* resourceProvider, Parameters upload)
|
| {
|
| bool isFullUpload = upload.geometry.destOffset.isZero() &&
|
| upload.geometry.sourceRect.size() == upload.texture->size();
|
| @@ -190,10 +190,10 @@ void ThrottledTextureUploader::uploadTexture(CCResourceProvider* resourceProvide
|
| upload.bitmap->unlockPixels();
|
| }
|
|
|
| - // TODO(reveman): Move this logic to CCTextureUpdateController after
|
| + // TODO(reveman): Move this logic to TextureUpdateController after
|
| // removing Parameters struct.
|
| if (upload.picture) {
|
| - CCPrioritizedTexture* texture = upload.texture;
|
| + PrioritizedTexture* texture = upload.texture;
|
| IntRect pictureRect = upload.geometry.contentRect;
|
| IntRect sourceRect = upload.geometry.sourceRect;
|
| IntSize destOffset = upload.geometry.destOffset;
|
| @@ -202,12 +202,12 @@ void ThrottledTextureUploader::uploadTexture(CCResourceProvider* resourceProvide
|
| ASSERT(texture->haveBackingTexture());
|
|
|
| ASSERT(resourceProvider->resourceType(texture->resourceId()) ==
|
| - CCResourceProvider::GLTexture);
|
| + ResourceProvider::GLTexture);
|
|
|
| - WebGraphicsContext3D* paintContext = CCProxy::hasImplThread() ?
|
| + WebGraphicsContext3D* paintContext = Proxy::hasImplThread() ?
|
| WebSharedGraphicsContext3D::compositorThreadContext() :
|
| WebSharedGraphicsContext3D::mainThreadContext();
|
| - GrContext* paintGrContext = CCProxy::hasImplThread() ?
|
| + GrContext* paintGrContext = Proxy::hasImplThread() ?
|
| WebSharedGraphicsContext3D::compositorThreadGrContext() :
|
| WebSharedGraphicsContext3D::mainThreadGrContext();
|
|
|
| @@ -216,7 +216,7 @@ void ThrottledTextureUploader::uploadTexture(CCResourceProvider* resourceProvide
|
| // because the backing texture is created in one context while it is
|
| // being written to in another.
|
| resourceProvider->flush();
|
| - CCResourceProvider::ScopedWriteLockGL lock(
|
| + ResourceProvider::ScopedWriteLockGL lock(
|
| resourceProvider, texture->resourceId());
|
|
|
| // Make sure ganesh uses the correct GL context.
|
|
|