summaryrefslogtreecommitdiffstats
path: root/cc/resources/resource_provider_unittest.cc
diff options
context:
space:
mode:
authorreveman <reveman@chromium.org>2014-10-27 13:33:36 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-27 20:33:50 +0000
commit2b6d4cba32db0500609b85ed8f9a3dc44fd8555f (patch)
treea0c1f76dfdedac572e645206b4fe363b9d28d5d2 /cc/resources/resource_provider_unittest.cc
parent7b08e2869cf7f6a93503ffe66998244ea66b55e7 (diff)
downloadchromium_src-2b6d4cba32db0500609b85ed8f9a3dc44fd8555f.zip
chromium_src-2b6d4cba32db0500609b85ed8f9a3dc44fd8555f.tar.gz
chromium_src-2b6d4cba32db0500609b85ed8f9a3dc44fd8555f.tar.bz2
cc: Move GpuMemoryBuffer allocation to worker threads.
Allocation of GpuMemoryBuffers requires a round-trip to the browser process and by moving this to worker threads it is no longer on the critical path on the compositor. The LockForWrite mechanism in the ResourceProvider has been adjusted to properly support worker thread allocation of resources. BUG=418553 Review URL: https://codereview.chromium.org/645943002 Cr-Commit-Position: refs/heads/master@{#301433}
Diffstat (limited to 'cc/resources/resource_provider_unittest.cc')
-rw-r--r--cc/resources/resource_provider_unittest.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/cc/resources/resource_provider_unittest.cc b/cc/resources/resource_provider_unittest.cc
index 4efe74d..e507ad6 100644
--- a/cc/resources/resource_provider_unittest.cc
+++ b/cc/resources/resource_provider_unittest.cc
@@ -637,7 +637,7 @@ TEST_P(ResourceProviderTest, TransferGLResources) {
{
ResourceProvider::ScopedWriteLockGpuMemoryBuffer lock(
child_resource_provider_.get(), id3);
- EXPECT_TRUE(!!lock.gpu_memory_buffer());
+ EXPECT_TRUE(!!lock.GetGpuMemoryBuffer());
}
GLuint external_texture_id = child_context_->createExternalTexture();
@@ -3318,7 +3318,7 @@ TEST_P(ResourceProviderTest, Image_GLTexture) {
{
ResourceProvider::ScopedWriteLockGpuMemoryBuffer lock(
resource_provider.get(), id);
- EXPECT_TRUE(!!lock.gpu_memory_buffer());
+ EXPECT_TRUE(!!lock.GetGpuMemoryBuffer());
}
EXPECT_CALL(*context, NextTextureId())
@@ -3339,7 +3339,7 @@ TEST_P(ResourceProviderTest, Image_GLTexture) {
{
ResourceProvider::ScopedWriteLockGpuMemoryBuffer lock(
resource_provider.get(), id);
- EXPECT_TRUE(!!lock.gpu_memory_buffer());
+ EXPECT_TRUE(!!lock.GetGpuMemoryBuffer());
}
EXPECT_CALL(*context, bindTexture(GL_TEXTURE_2D, kTextureId)).Times(1)
@@ -3405,7 +3405,7 @@ TEST_P(ResourceProviderTest, CopyResource_GLTexture) {
{
ResourceProvider::ScopedWriteLockGpuMemoryBuffer lock(
resource_provider.get(), source_id);
- EXPECT_TRUE(!!lock.gpu_memory_buffer());
+ EXPECT_TRUE(!!lock.GetGpuMemoryBuffer());
}
Mock::VerifyAndClearExpectations(context);