Index: cc/CCSchedulerTest.cpp |
diff --git a/cc/CCSchedulerTest.cpp b/cc/CCSchedulerTest.cpp |
index 12702bd55d6b7b343dd10ec58b4120f57e971be8..ec68c7192f5c5640011965c5ebb04123992e3239 100644 |
--- a/cc/CCSchedulerTest.cpp |
+++ b/cc/CCSchedulerTest.cpp |
@@ -23,12 +23,14 @@ public: |
void reset() |
{ |
m_actions.clear(); |
+ m_hasMoreResourceUpdates = false; |
m_canDraw = true; |
m_drawWillHappen = true; |
m_swapWillHappenIfDrawHappens = true; |
m_numDraws = 0; |
} |
+ void setHasMoreResourceUpdates(bool b) { m_hasMoreResourceUpdates = b; } |
void setCanDraw(bool b) { m_canDraw = b; } |
int numDraws() const { return m_numDraws; } |
@@ -44,6 +46,7 @@ public: |
} |
virtual bool canDraw() OVERRIDE { return m_canDraw; } |
+ virtual bool hasMoreResourceUpdates() const OVERRIDE { return m_hasMoreResourceUpdates; } |
virtual void scheduledActionBeginFrame() OVERRIDE { m_actions.push_back("scheduledActionBeginFrame"); } |
virtual CCScheduledActionDrawAndSwapResult scheduledActionDrawAndSwapIfPossible() OVERRIDE |
{ |
@@ -90,9 +93,9 @@ TEST(CCSchedulerTest, RequestCommit) |
EXPECT_FALSE(timeSource->active()); |
client.reset(); |
- // Since, hasResourceUpdates is false, |
+ // Since, hasMoreResourceUpdates is set to false, |
// beginFrameComplete should commit |
- scheduler->beginFrameComplete(false); |
+ scheduler->beginFrameComplete(); |
EXPECT_EQ(1, client.numActions()); |
EXPECT_STREQ("scheduledActionCommit", client.action(0)); |
EXPECT_TRUE(timeSource->active()); |
@@ -126,9 +129,9 @@ TEST(CCSchedulerTest, RequestCommitAfterBeginFrame) |
// Now setNeedsCommit again. Calling here means we need a second frame. |
scheduler->setNeedsCommit(); |
- // Since, hasResourceUpdates is false, and another commit is |
+ // Since, hasMoreResourceUpdates is set to false, and another commit is |
// needed, beginFrameComplete should commit, then begin another frame. |
- scheduler->beginFrameComplete(false); |
+ scheduler->beginFrameComplete(); |
EXPECT_EQ(1, client.numActions()); |
EXPECT_STREQ("scheduledActionCommit", client.action(0)); |
client.reset(); |
@@ -161,7 +164,7 @@ TEST(CCSchedulerTest, TextureAcquisitionCollision) |
EXPECT_FALSE(timeSource->active()); |
// Trigger the commit |
- scheduler->beginFrameComplete(false); |
+ scheduler->beginFrameComplete(); |
EXPECT_TRUE(timeSource->active()); |
client.reset(); |
@@ -189,7 +192,7 @@ TEST(CCSchedulerTest, VisibilitySwitchWithTextureAcquisition) |
scheduler->setVisible(true); |
scheduler->setNeedsCommit(); |
- scheduler->beginFrameComplete(false); |
+ scheduler->beginFrameComplete(); |
scheduler->setMainThreadNeedsLayerTextures(); |
client.reset(); |
// Verify that pending texture acquisition fires when visibility |
@@ -358,7 +361,7 @@ TEST(CCSchedulerTest, RequestCommitInsideDraw) |
EXPECT_FALSE(timeSource->active()); |
EXPECT_EQ(1, client.numDraws()); |
EXPECT_TRUE(scheduler->commitPending()); |
- scheduler->beginFrameComplete(false); |
+ scheduler->beginFrameComplete(); |
timeSource->tick(); |
EXPECT_EQ(2, client.numDraws()); |