Modified: trunk/Source/WebKit/chromium/ChangeLog (98993 => 98994)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-11-01 19:52:29 UTC (rev 98993)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-11-01 20:13:09 UTC (rev 98994)
@@ -1,3 +1,13 @@
+2011-11-01 Nat Duca <[email protected]>
+
+ CCSchedulerTests fail on Chromium Windows (dbg) after r98915
+ https://bugs.webkit.org/show_bug.cgi?id=71294
+
+ Reviewed by James Robinson.
+
+ * tests/CCSchedulerTest.cpp:
+ (WebKitTests::TEST):
+
2011-11-01 Alok Priyadarshi <[email protected]>
Roll chromium DEPS.
Modified: trunk/Source/WebKit/chromium/tests/CCSchedulerTest.cpp (98993 => 98994)
--- trunk/Source/WebKit/chromium/tests/CCSchedulerTest.cpp 2011-11-01 19:52:29 UTC (rev 98993)
+++ trunk/Source/WebKit/chromium/tests/CCSchedulerTest.cpp 2011-11-01 20:13:09 UTC (rev 98994)
@@ -68,7 +68,7 @@
// SetNeedsCommit should begin the frame.
scheduler->setNeedsCommit();
EXPECT_EQ(1, client.numActions());
- EXPECT_EQ("scheduledActionBeginFrame", client.action(0));
+ EXPECT_STREQ("scheduledActionBeginFrame", client.action(0));
client.reset();
// Since, hasMoreResourceUpdates is set to false,
@@ -76,14 +76,14 @@
// commit
scheduler->beginFrameComplete();
EXPECT_EQ(2, client.numActions());
- EXPECT_EQ("scheduledActionUpdateMoreResources", client.action(0));
- EXPECT_EQ("scheduledActionCommit", client.action(1));
+ EXPECT_STREQ("scheduledActionUpdateMoreResources", client.action(0));
+ EXPECT_STREQ("scheduledActionCommit", client.action(1));
client.reset();
// Tick should draw.
timeSource->tick();
EXPECT_EQ(1, client.numActions());
- EXPECT_EQ("scheduledActionDrawAndSwap", client.action(0));
+ EXPECT_STREQ("scheduledActionDrawAndSwap", client.action(0));
client.reset();
// Tick should do nothing.
@@ -100,7 +100,7 @@
// SetNedsCommit should begin the frame.
scheduler->setNeedsCommit();
EXPECT_EQ(1, client.numActions());
- EXPECT_EQ("scheduledActionBeginFrame", client.action(0));
+ EXPECT_STREQ("scheduledActionBeginFrame", client.action(0));
client.reset();
// Now setNeedsCommit again. Calling here means we need a second frame.
@@ -111,15 +111,15 @@
// begin another frame.
scheduler->beginFrameComplete();
EXPECT_EQ(3, client.numActions());
- EXPECT_EQ("scheduledActionUpdateMoreResources", client.action(0));
- EXPECT_EQ("scheduledActionCommit", client.action(1));
- EXPECT_EQ("scheduledActionBeginFrame", client.action(2));
+ EXPECT_STREQ("scheduledActionUpdateMoreResources", client.action(0));
+ EXPECT_STREQ("scheduledActionCommit", client.action(1));
+ EXPECT_STREQ("scheduledActionBeginFrame", client.action(2));
client.reset();
// Tick should draw but then begin another frame.
timeSource->tick();
EXPECT_EQ(1, client.numActions());
- EXPECT_EQ("scheduledActionDrawAndSwap", client.action(0));
+ EXPECT_STREQ("scheduledActionDrawAndSwap", client.action(0));
client.reset();
}
