| Index: cc/throttled_texture_uploader.cc
|
| diff --git a/cc/throttled_texture_uploader.cc b/cc/throttled_texture_uploader.cc
|
| index 81a5cf748b7804af38b47bceb83b3d382e607461..d335ea2800cd7c943528e0f89ca11ed1ca7befe4 100644
|
| --- a/cc/throttled_texture_uploader.cc
|
| +++ b/cc/throttled_texture_uploader.cc
|
| @@ -136,7 +136,7 @@ void ThrottledTextureUploader::markPendingUploadsAsNonBlocking()
|
| it->get()->markAsNonBlocking();
|
| }
|
|
|
| - ASSERT(!m_numBlockingTextureUploads);
|
| + CC_DCHECK(!m_numBlockingTextureUploads);
|
| }
|
|
|
| double ThrottledTextureUploader::estimatedTexturesPerSecond()
|
| @@ -144,7 +144,7 @@ double ThrottledTextureUploader::estimatedTexturesPerSecond()
|
| processQueries();
|
|
|
| // The history should never be empty because we initialize all elements with an estimate.
|
| - ASSERT(m_texturesPerSecondHistory.size() == uploadHistorySize);
|
| + CC_DCHECK(m_texturesPerSecondHistory.size() == uploadHistorySize);
|
|
|
| // Sort the history and use the median as our estimate.
|
| std::vector<double> sortedHistory(m_texturesPerSecondHistory.begin(),
|
| @@ -199,10 +199,10 @@ void ThrottledTextureUploader::uploadTexture(CCResourceProvider* resourceProvide
|
| IntSize destOffset = upload.geometry.destOffset;
|
|
|
| texture->acquireBackingTexture(resourceProvider);
|
| - ASSERT(texture->haveBackingTexture());
|
| + CC_DCHECK(texture->haveBackingTexture());
|
|
|
| - ASSERT(resourceProvider->resourceType(texture->resourceId()) ==
|
| - CCResourceProvider::GLTexture);
|
| + CC_DCHECK(resourceProvider->resourceType(texture->resourceId()) ==
|
| + CCResourceProvider::GLTexture);
|
|
|
| WebGraphicsContext3D* paintContext = CCProxy::hasImplThread() ?
|
| WebSharedGraphicsContext3D::compositorThreadContext() :
|
|
|