Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(444)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/texture_update_controller_unittest.cc

Issue 11189043: cc: Rename cc classes and members to match filenames (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« cc/active_animation.h ('K') | « cc/texture_update_controller.cc ('k') | cc/texture_update_queue.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/texture_update_controller_unittest.cc
diff --git a/cc/texture_update_controller_unittest.cc b/cc/texture_update_controller_unittest.cc
index 48dc708527838cadeb98018129f087275f68c19c..e4d896fa9d2a196a3b9cf6cbfae53c2f63ee4f8a 100644
--- a/cc/texture_update_controller_unittest.cc
+++ b/cc/texture_update_controller_unittest.cc
@@ -26,11 +26,11 @@ namespace {
const int kFlushPeriodFull = 4;
const int kFlushPeriodPartial = kFlushPeriodFull;
-class CCTextureUpdateControllerTest;
+class TextureUpdateControllerTest;
class WebGraphicsContext3DForUploadTest : public FakeWebGraphicsContext3D {
public:
- WebGraphicsContext3DForUploadTest(CCTextureUpdateControllerTest *test)
+ WebGraphicsContext3DForUploadTest(TextureUpdateControllerTest *test)
: m_test(test)
, m_supportShallowFlush(true)
{ }
@@ -47,25 +47,25 @@ public:
}
private:
- CCTextureUpdateControllerTest* m_test;
+ TextureUpdateControllerTest* m_test;
bool m_supportShallowFlush;
};
class TextureUploaderForUploadTest : public FakeTextureUploader {
public:
- TextureUploaderForUploadTest(CCTextureUpdateControllerTest *test) : m_test(test) { }
+ TextureUploaderForUploadTest(TextureUpdateControllerTest *test) : m_test(test) { }
- virtual void uploadTexture(cc::CCResourceProvider*, Parameters) OVERRIDE;
+ virtual void uploadTexture(cc::ResourceProvider*, Parameters) OVERRIDE;
private:
- CCTextureUpdateControllerTest* m_test;
+ TextureUpdateControllerTest* m_test;
};
-class CCTextureUpdateControllerTest : public Test {
+class TextureUpdateControllerTest : public Test {
public:
- CCTextureUpdateControllerTest()
- : m_queue(make_scoped_ptr(new CCTextureUpdateQueue))
+ TextureUpdateControllerTest()
+ : m_queue(make_scoped_ptr(new TextureUpdateQueue))
, m_uploader(this)
, m_compositorInitializer(m_thread.get())
, m_fullUploadCountExpected(0)
@@ -108,9 +108,9 @@ protected:
{
m_context = FakeWebCompositorOutputSurface::create(scoped_ptr<WebKit::WebGraphicsContext3D>(new WebGraphicsContext3DForUploadTest(this)));
DebugScopedSetImplThread implThread;
- m_resourceProvider = CCResourceProvider::create(m_context.get());
+ m_resourceProvider = ResourceProvider::create(m_context.get());
for (int i = 0; i < 4; i++)
- m_textures[i] = CCPrioritizedTexture::create(
+ m_textures[i] = PrioritizedTexture::create(
NULL, IntSize(256, 256), GL_RGBA);
}
@@ -154,10 +154,10 @@ protected:
void updateTextures()
{
- scoped_ptr<CCTextureUpdateController> updateController =
- CCTextureUpdateController::create(
+ scoped_ptr<TextureUpdateController> updateController =
+ TextureUpdateController::create(
NULL,
- CCProxy::implThread(),
+ Proxy::implThread(),
m_queue.Pass(),
m_resourceProvider.get(),
&m_uploader);
@@ -165,11 +165,11 @@ protected:
}
protected:
- // Classes required to interact and test the CCTextureUpdateController
- scoped_ptr<CCGraphicsContext> m_context;
- scoped_ptr<CCResourceProvider> m_resourceProvider;
- scoped_ptr<CCTextureUpdateQueue> m_queue;
- scoped_ptr<CCPrioritizedTexture> m_textures[4];
+ // Classes required to interact and test the TextureUpdateController
+ scoped_ptr<GraphicsContext> m_context;
+ scoped_ptr<ResourceProvider> m_resourceProvider;
+ scoped_ptr<TextureUpdateQueue> m_queue;
+ scoped_ptr<PrioritizedTexture> m_textures[4];
TextureUploaderForUploadTest m_uploader;
scoped_ptr<WebThread> m_thread;
WebCompositorInitializer m_compositorInitializer;
@@ -198,13 +198,13 @@ void WebGraphicsContext3DForUploadTest::shallowFlushCHROMIUM(void)
m_test->onFlush();
}
-void TextureUploaderForUploadTest::uploadTexture(cc::CCResourceProvider*, Parameters)
+void TextureUploaderForUploadTest::uploadTexture(cc::ResourceProvider*, Parameters)
{
m_test->onUpload();
}
// ZERO UPLOADS TESTS
-TEST_F(CCTextureUpdateControllerTest, ZeroUploads)
+TEST_F(TextureUpdateControllerTest, ZeroUploads)
{
appendFullUploadsToUpdateQueue(0);
appendPartialUploadsToUpdateQueue(0);
@@ -217,7 +217,7 @@ TEST_F(CCTextureUpdateControllerTest, ZeroUploads)
// ONE UPLOAD TESTS
-TEST_F(CCTextureUpdateControllerTest, OneFullUpload)
+TEST_F(TextureUpdateControllerTest, OneFullUpload)
{
appendFullUploadsToUpdateQueue(1);
appendPartialUploadsToUpdateQueue(0);
@@ -229,7 +229,7 @@ TEST_F(CCTextureUpdateControllerTest, OneFullUpload)
EXPECT_EQ(0, m_numDanglingUploads) << "Last upload wasn't followed by a flush.";
}
-TEST_F(CCTextureUpdateControllerTest, OnePartialUpload)
+TEST_F(TextureUpdateControllerTest, OnePartialUpload)
{
appendFullUploadsToUpdateQueue(0);
appendPartialUploadsToUpdateQueue(1);
@@ -241,7 +241,7 @@ TEST_F(CCTextureUpdateControllerTest, OnePartialUpload)
EXPECT_EQ(0, m_numDanglingUploads) << "Last upload wasn't followed by a flush.";
}
-TEST_F(CCTextureUpdateControllerTest, OneFullOnePartialUpload)
+TEST_F(TextureUpdateControllerTest, OneFullOnePartialUpload)
{
appendFullUploadsToUpdateQueue(1);
appendPartialUploadsToUpdateQueue(1);
@@ -261,7 +261,7 @@ const int fullCount = fullUploadFlushMultipler * kFlushPeriodFull;
const int partialUploadFlushMultipler = 11;
const int partialCount = partialUploadFlushMultipler * kFlushPeriodPartial;
-TEST_F(CCTextureUpdateControllerTest, ManyFullUploads)
+TEST_F(TextureUpdateControllerTest, ManyFullUploads)
{
appendFullUploadsToUpdateQueue(fullCount);
appendPartialUploadsToUpdateQueue(0);
@@ -273,7 +273,7 @@ TEST_F(CCTextureUpdateControllerTest, ManyFullUploads)
EXPECT_EQ(0, m_numDanglingUploads) << "Last upload wasn't followed by a flush.";
}
-TEST_F(CCTextureUpdateControllerTest, ManyPartialUploads)
+TEST_F(TextureUpdateControllerTest, ManyPartialUploads)
{
appendFullUploadsToUpdateQueue(0);
appendPartialUploadsToUpdateQueue(partialCount);
@@ -285,7 +285,7 @@ TEST_F(CCTextureUpdateControllerTest, ManyPartialUploads)
EXPECT_EQ(0, m_numDanglingUploads) << "Last upload wasn't followed by a flush.";
}
-TEST_F(CCTextureUpdateControllerTest, ManyFullManyPartialUploads)
+TEST_F(TextureUpdateControllerTest, ManyFullManyPartialUploads)
{
appendFullUploadsToUpdateQueue(fullCount);
appendPartialUploadsToUpdateQueue(partialCount);
@@ -297,9 +297,9 @@ TEST_F(CCTextureUpdateControllerTest, ManyFullManyPartialUploads)
EXPECT_EQ(0, m_numDanglingUploads) << "Last upload wasn't followed by a flush.";
}
-class FakeCCTextureUpdateControllerClient : public cc::CCTextureUpdateControllerClient {
+class FakeTextureUpdateControllerClient : public cc::TextureUpdateControllerClient {
public:
- FakeCCTextureUpdateControllerClient() { reset(); }
+ FakeTextureUpdateControllerClient() { reset(); }
void reset() { m_readyToFinalizeCalled = false; }
bool readyToFinalizeCalled() const { return m_readyToFinalizeCalled; }
@@ -309,11 +309,11 @@ protected:
bool m_readyToFinalizeCalled;
};
-class FakeCCTextureUpdateController : public cc::CCTextureUpdateController {
+class FakeTextureUpdateController : public cc::TextureUpdateController {
public:
- static scoped_ptr<FakeCCTextureUpdateController> create(cc::CCTextureUpdateControllerClient* client, cc::CCThread* thread, scoped_ptr<CCTextureUpdateQueue> queue, CCResourceProvider* resourceProvider, TextureUploader* uploader)
+ static scoped_ptr<FakeTextureUpdateController> create(cc::TextureUpdateControllerClient* client, cc::Thread* thread, scoped_ptr<TextureUpdateQueue> queue, ResourceProvider* resourceProvider, TextureUploader* uploader)
{
- return make_scoped_ptr(new FakeCCTextureUpdateController(client, thread, queue.Pass(), resourceProvider, uploader));
+ return make_scoped_ptr(new FakeTextureUpdateController(client, thread, queue.Pass(), resourceProvider, uploader));
}
void setNow(base::TimeTicks time) { m_now = time; }
@@ -324,8 +324,8 @@ public:
virtual size_t updateMoreTexturesSize() const OVERRIDE { return m_updateMoreTexturesSize; }
protected:
- FakeCCTextureUpdateController(cc::CCTextureUpdateControllerClient* client, cc::CCThread* thread, scoped_ptr<CCTextureUpdateQueue> queue, CCResourceProvider* resourceProvider, TextureUploader* uploader)
- : cc::CCTextureUpdateController(client, thread, queue.Pass(), resourceProvider, uploader)
+ FakeTextureUpdateController(cc::TextureUpdateControllerClient* client, cc::Thread* thread, scoped_ptr<TextureUpdateQueue> queue, ResourceProvider* resourceProvider, TextureUploader* uploader)
+ : cc::TextureUpdateController(client, thread, queue.Pass(), resourceProvider, uploader)
, m_updateMoreTexturesSize(0) { }
base::TimeTicks m_now;
@@ -333,24 +333,24 @@ protected:
size_t m_updateMoreTexturesSize;
};
-static void runPendingTask(FakeCCThread* thread, FakeCCTextureUpdateController* controller)
+static void runPendingTask(FakeThread* thread, FakeTextureUpdateController* controller)
{
EXPECT_TRUE(thread->hasPendingTask());
controller->setNow(controller->now() + base::TimeDelta::FromMilliseconds(thread->pendingDelayMs()));
thread->runPendingTask();
}
-TEST_F(CCTextureUpdateControllerTest, UpdateMoreTextures)
+TEST_F(TextureUpdateControllerTest, UpdateMoreTextures)
{
- FakeCCTextureUpdateControllerClient client;
- FakeCCThread thread;
+ FakeTextureUpdateControllerClient client;
+ FakeThread thread;
setMaxUploadCountPerUpdate(1);
appendFullUploadsToUpdateQueue(3);
appendPartialUploadsToUpdateQueue(0);
DebugScopedSetImplThread implThread;
- scoped_ptr<FakeCCTextureUpdateController> controller(FakeCCTextureUpdateController::create(&client, &thread, m_queue.Pass(), m_resourceProvider.get(), &m_uploader));
+ scoped_ptr<FakeTextureUpdateController> controller(FakeTextureUpdateController::create(&client, &thread, m_queue.Pass(), m_resourceProvider.get(), &m_uploader));
controller->setNow(
controller->now() + base::TimeDelta::FromMilliseconds(1));
@@ -385,17 +385,17 @@ TEST_F(CCTextureUpdateControllerTest, UpdateMoreTextures)
EXPECT_EQ(3, m_numTotalUploads);
}
-TEST_F(CCTextureUpdateControllerTest, NoMoreUpdates)
+TEST_F(TextureUpdateControllerTest, NoMoreUpdates)
{
- FakeCCTextureUpdateControllerClient client;
- FakeCCThread thread;
+ FakeTextureUpdateControllerClient client;
+ FakeThread thread;
setMaxUploadCountPerUpdate(1);
appendFullUploadsToUpdateQueue(2);
appendPartialUploadsToUpdateQueue(0);
DebugScopedSetImplThread implThread;
- scoped_ptr<FakeCCTextureUpdateController> controller(FakeCCTextureUpdateController::create(&client, &thread, m_queue.Pass(), m_resourceProvider.get(), &m_uploader));
+ scoped_ptr<FakeTextureUpdateController> controller(FakeTextureUpdateController::create(&client, &thread, m_queue.Pass(), m_resourceProvider.get(), &m_uploader));
controller->setNow(
controller->now() + base::TimeDelta::FromMilliseconds(1));
@@ -424,17 +424,17 @@ TEST_F(CCTextureUpdateControllerTest, NoMoreUpdates)
EXPECT_EQ(2, m_numTotalUploads);
}
-TEST_F(CCTextureUpdateControllerTest, UpdatesCompleteInFiniteTime)
+TEST_F(TextureUpdateControllerTest, UpdatesCompleteInFiniteTime)
{
- FakeCCTextureUpdateControllerClient client;
- FakeCCThread thread;
+ FakeTextureUpdateControllerClient client;
+ FakeThread thread;
setMaxUploadCountPerUpdate(1);
appendFullUploadsToUpdateQueue(2);
appendPartialUploadsToUpdateQueue(0);
DebugScopedSetImplThread implThread;
- scoped_ptr<FakeCCTextureUpdateController> controller(FakeCCTextureUpdateController::create(&client, &thread, m_queue.Pass(), m_resourceProvider.get(), &m_uploader));
+ scoped_ptr<FakeTextureUpdateController> controller(FakeTextureUpdateController::create(&client, &thread, m_queue.Pass(), m_resourceProvider.get(), &m_uploader));
controller->setNow(
controller->now() + base::TimeDelta::FromMilliseconds(1));
« cc/active_animation.h ('K') | « cc/texture_update_controller.cc ('k') | cc/texture_update_queue.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698