summaryrefslogtreecommitdiffstats
path: root/cc/texture_uploader_unittest.cc
diff options
context:
space:
mode:
authorreveman@chromium.org <reveman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-03 20:52:32 +0000
committerreveman@chromium.org <reveman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-03 20:52:32 +0000
commit2b37dfda8941c7bd4fbf73ed2aa8b8045ed50342 (patch)
tree080b117e2d1d2e4a24d8d5ec4a0089bbe71a59ef /cc/texture_uploader_unittest.cc
parent0f97c466741d34cd77df68b3795ed72000c1f0ad (diff)
downloadchromium_src-2b37dfda8941c7bd4fbf73ed2aa8b8045ed50342.zip
chromium_src-2b37dfda8941c7bd4fbf73ed2aa8b8045ed50342.tar.gz
chromium_src-2b37dfda8941c7bd4fbf73ed2aa8b8045ed50342.tar.bz2
cc: Move textureUploadFlushPeriod to TextureUploader.
This moves texture upload related flushing to the TextureUploader class. This is a more appropriate place to handle this type of flushing and makes it possible to avoid some unnecessary flushes. BUG= TEST=cc_unittests Review URL: https://chromiumcodereview.appspot.com/11367054 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165860 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/texture_uploader_unittest.cc')
-rw-r--r--cc/texture_uploader_unittest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/cc/texture_uploader_unittest.cc b/cc/texture_uploader_unittest.cc
index 783ea86..c3c1a7e 100644
--- a/cc/texture_uploader_unittest.cc
+++ b/cc/texture_uploader_unittest.cc
@@ -56,7 +56,7 @@ void uploadTexture(TextureUploader* uploader)
TEST(TextureUploaderTest, NumBlockingUploads)
{
scoped_ptr<FakeWebGraphicsContext3DWithQueryTesting> fakeContext(new FakeWebGraphicsContext3DWithQueryTesting);
- scoped_ptr<TextureUploader> uploader = TextureUploader::create(fakeContext.get(), false);
+ scoped_ptr<TextureUploader> uploader = TextureUploader::create(fakeContext.get(), false, false);
fakeContext->setResultAvailable(0);
EXPECT_EQ(0, uploader->numBlockingUploads());
@@ -77,7 +77,7 @@ TEST(TextureUploaderTest, NumBlockingUploads)
TEST(TextureUploaderTest, MarkPendingUploadsAsNonBlocking)
{
scoped_ptr<FakeWebGraphicsContext3DWithQueryTesting> fakeContext(new FakeWebGraphicsContext3DWithQueryTesting);
- scoped_ptr<TextureUploader> uploader = TextureUploader::create(fakeContext.get(), false);
+ scoped_ptr<TextureUploader> uploader = TextureUploader::create(fakeContext.get(), false, false);
fakeContext->setResultAvailable(0);
EXPECT_EQ(0, uploader->numBlockingUploads());