| Index: cc/resource_provider.cc
|
| diff --git a/cc/resource_provider.cc b/cc/resource_provider.cc
|
| index dab281a92d37ec69c644b1cceea24fcf1deac758..2eb5fc40c89250b8e87f4bcad777c643534a2158 100644
|
| --- a/cc/resource_provider.cc
|
| +++ b/cc/resource_provider.cc
|
| @@ -329,6 +329,14 @@ double ResourceProvider::estimatedUploadsPerSecond()
|
| return m_textureUploader->estimatedTexturesPerSecond();
|
| }
|
|
|
| +void ResourceProvider::flushUploads()
|
| +{
|
| + if (!m_textureUploader)
|
| + return;
|
| +
|
| + m_textureUploader->flush();
|
| +}
|
| +
|
| void ResourceProvider::flush()
|
| {
|
| DCHECK(Proxy::isImplThread());
|
| @@ -515,7 +523,7 @@ bool ResourceProvider::initialize()
|
|
|
| m_textureCopier = AcceleratedTextureCopier::create(context3d, useBindUniform);
|
|
|
| - m_textureUploader = TextureUploader::create(context3d, useMapSub);
|
| + m_textureUploader = TextureUploader::create(context3d, useMapSub, m_useShallowFlush);
|
| GLC(context3d, context3d->getIntegerv(GL_MAX_TEXTURE_SIZE, &m_maxTextureSize));
|
| return true;
|
| }
|
|
|