Title: [113357] trunk/Source/WebKit/chromium
- Revision
- 113357
- Author
- [email protected]
- Date
- 2012-04-05 12:32:29 -0700 (Thu, 05 Apr 2012)
Log Message
[chromium] Cleanup test, redundant code in CCSchedulerTest.NoBeginFrameWhenDrawFails
https://bugs.webkit.org/show_bug.cgi?id=83300
Patch by Dana Jansens <[email protected]> on 2012-04-05
Reviewed by Adrienne Walker.
* tests/CCSchedulerTest.cpp:
(WebKitTests::TEST):
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (113356 => 113357)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-04-05 19:32:27 UTC (rev 113356)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-04-05 19:32:29 UTC (rev 113357)
@@ -1,3 +1,13 @@
+2012-04-05 Dana Jansens <[email protected]>
+
+ [chromium] Cleanup test, redundant code in CCSchedulerTest.NoBeginFrameWhenDrawFails
+ https://bugs.webkit.org/show_bug.cgi?id=83300
+
+ Reviewed by Adrienne Walker.
+
+ * tests/CCSchedulerTest.cpp:
+ (WebKitTests::TEST):
+
2012-04-05 Sheriff Bot <[email protected]>
Unreviewed, rolling out r113241.
Modified: trunk/Source/WebKit/chromium/tests/CCSchedulerTest.cpp (113356 => 113357)
--- trunk/Source/WebKit/chromium/tests/CCSchedulerTest.cpp 2012-04-05 19:32:27 UTC (rev 113356)
+++ trunk/Source/WebKit/chromium/tests/CCSchedulerTest.cpp 2012-04-05 19:32:29 UTC (rev 113357)
@@ -389,21 +389,10 @@
EXPECT_TRUE(scheduler->redrawPending());
EXPECT_TRUE(timeSource->active());
- // Draw successfully, this starts another frame.
- timeSource->tick();
- EXPECT_EQ(2, client.numDraws());
- EXPECT_EQ(1, controllerPtr->numFramesPending());
- scheduler->didSwapBuffersComplete();
- EXPECT_EQ(0, controllerPtr->numFramesPending());
-
- scheduler->setNeedsRedraw();
- EXPECT_TRUE(scheduler->redrawPending());
- EXPECT_TRUE(timeSource->active());
-
// Fail to draw, this should not start a frame.
client.setDrawWillHappen(false);
timeSource->tick();
- EXPECT_EQ(3, client.numDraws());
+ EXPECT_EQ(2, client.numDraws());
EXPECT_EQ(0, controllerPtr->numFramesPending());
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
