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

Unified Diff: cc/CCSchedulerTest.cpp

Issue 10911262: cc: Scheduler will never process a commit until it receives a vsync tick. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 3 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
« no previous file with comments | « cc/CCScheduler.cpp ('k') | cc/CCTextureUpdateController.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/CCSchedulerTest.cpp
diff --git a/cc/CCSchedulerTest.cpp b/cc/CCSchedulerTest.cpp
index ebd86dd18d4ffafe1128a71417a42ad641c7d71f..f567e76d90b976e34a40247bd17dbcae2c0d0cf9 100644
--- a/cc/CCSchedulerTest.cpp
+++ b/cc/CCSchedulerTest.cpp
@@ -23,14 +23,11 @@ public:
void reset()
{
m_actions.clear();
- m_hasMoreResourceUpdates = false;
m_drawWillHappen = true;
m_swapWillHappenIfDrawHappens = true;
m_numDraws = 0;
}
- void setHasMoreResourceUpdates(bool b) { m_hasMoreResourceUpdates = b; }
-
int numDraws() const { return m_numDraws; }
int numActions() const { return static_cast<int>(m_actions.size()); }
const char* action(int i) const { return m_actions[i]; }
@@ -43,8 +40,6 @@ public:
return false;
}
- virtual bool hasMoreResourceUpdates() const OVERRIDE { return m_hasMoreResourceUpdates; }
-
virtual void scheduledActionBeginFrame() OVERRIDE { m_actions.push_back("scheduledActionBeginFrame"); }
virtual CCScheduledActionDrawAndSwapResult scheduledActionDrawAndSwapIfPossible() OVERRIDE
{
@@ -91,9 +86,9 @@ TEST(CCSchedulerTest, RequestCommit)
EXPECT_FALSE(timeSource->active());
client.reset();
- // Since, hasMoreResourceUpdates is set to false,
+ // Since, hasResourceUpdates is false,
// beginFrameComplete should commit
- scheduler->beginFrameComplete();
+ scheduler->beginFrameComplete(false);
EXPECT_EQ(1, client.numActions());
EXPECT_STREQ("scheduledActionCommit", client.action(0));
EXPECT_TRUE(timeSource->active());
@@ -128,9 +123,9 @@ TEST(CCSchedulerTest, RequestCommitAfterBeginFrame)
// Now setNeedsCommit again. Calling here means we need a second frame.
scheduler->setNeedsCommit();
- // Since, hasMoreResourceUpdates is set to false, and another commit is
+ // Since, hasResourceUpdates is false, and another commit is
// needed, beginFrameComplete should commit, then begin another frame.
- scheduler->beginFrameComplete();
+ scheduler->beginFrameComplete(false);
EXPECT_EQ(1, client.numActions());
EXPECT_STREQ("scheduledActionCommit", client.action(0));
client.reset();
@@ -164,7 +159,7 @@ TEST(CCSchedulerTest, TextureAcquisitionCollision)
EXPECT_FALSE(timeSource->active());
// Trigger the commit
- scheduler->beginFrameComplete();
+ scheduler->beginFrameComplete(false);
EXPECT_TRUE(timeSource->active());
client.reset();
@@ -193,7 +188,7 @@ TEST(CCSchedulerTest, VisibilitySwitchWithTextureAcquisition)
scheduler->setCanDraw(true);
scheduler->setNeedsCommit();
- scheduler->beginFrameComplete();
+ scheduler->beginFrameComplete(false);
scheduler->setMainThreadNeedsLayerTextures();
client.reset();
// Verify that pending texture acquisition fires when visibility
@@ -365,7 +360,7 @@ TEST(CCSchedulerTest, RequestCommitInsideDraw)
EXPECT_FALSE(timeSource->active());
EXPECT_EQ(1, client.numDraws());
EXPECT_TRUE(scheduler->commitPending());
- scheduler->beginFrameComplete();
+ scheduler->beginFrameComplete(false);
timeSource->tick();
EXPECT_EQ(2, client.numDraws());
« no previous file with comments | « cc/CCScheduler.cpp ('k') | cc/CCTextureUpdateController.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698