Title: [118276] trunk/Source/WebKit/chromium
- Revision
- 118276
- Author
- [email protected]
- Date
- 2012-05-23 17:15:14 -0700 (Wed, 23 May 2012)
Log Message
[chromium] Enable the CCLayerTreeHostTestCanDrawBlocksDrawing test in single-threaded mode
https://bugs.webkit.org/show_bug.cgi?id=87308
Reviewed by James Robinson.
Chromium bug: http://crbug.com/127481
Unit test: CCLayerTreeHostTestCanDrawBlocksDrawing.runSingleThread
* tests/CCLayerTreeHostTest.cpp:
(WTF::TestHooks::didCommit):
(WTF):
(WTF::CCLayerTreeHostTestCanDrawBlocksDrawing::didCommit):
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (118275 => 118276)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-05-24 00:13:07 UTC (rev 118275)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-05-24 00:15:14 UTC (rev 118276)
@@ -1,3 +1,19 @@
+2012-05-23 Dana Jansens <[email protected]>
+
+ [chromium] Enable the CCLayerTreeHostTestCanDrawBlocksDrawing test in single-threaded mode
+ https://bugs.webkit.org/show_bug.cgi?id=87308
+
+ Reviewed by James Robinson.
+
+ Chromium bug: http://crbug.com/127481
+
+ Unit test: CCLayerTreeHostTestCanDrawBlocksDrawing.runSingleThread
+
+ * tests/CCLayerTreeHostTest.cpp:
+ (WTF::TestHooks::didCommit):
+ (WTF):
+ (WTF::CCLayerTreeHostTestCanDrawBlocksDrawing::didCommit):
+
2012-05-23 James Robinson <[email protected]>
Add a Setting to make position:fixed form a new stacking context
Modified: trunk/Source/WebKit/chromium/tests/CCLayerTreeHostTest.cpp (118275 => 118276)
--- trunk/Source/WebKit/chromium/tests/CCLayerTreeHostTest.cpp 2012-05-24 00:13:07 UTC (rev 118275)
+++ trunk/Source/WebKit/chromium/tests/CCLayerTreeHostTest.cpp 2012-05-24 00:15:14 UTC (rev 118276)
@@ -82,6 +82,7 @@
virtual void updateAnimations(double monotonicTime) { }
virtual void layout() { }
virtual void didRecreateContext(bool succeded) { }
+ virtual void didCommit() { }
virtual void didCommitAndDrawFrame() { }
virtual void scheduleComposite() { }
@@ -275,6 +276,7 @@
virtual void didCommit() OVERRIDE
{
+ m_testHooks->didCommit();
}
virtual void didCommitAndDrawFrame() OVERRIDE
@@ -924,7 +926,6 @@
}
// If the layerTreeHost says it can't draw, then we should not try to draw.
-// FIXME: Make this run in single threaded mode too. http://crbug.com/127481
class CCLayerTreeHostTestCanDrawBlocksDrawing : public CCLayerTreeHostTestThreadOnly {
public:
CCLayerTreeHostTestCanDrawBlocksDrawing()
@@ -951,7 +952,7 @@
}
}
- virtual void didCommitAndDrawFrame()
+ virtual void didCommit()
{
m_numCommits++;
if (m_numCommits == 1) {
@@ -961,10 +962,10 @@
OwnArrayPtr<char> pixels(adoptArrayPtr(new char[4]));
m_layerTreeHost->compositeAndReadback(static_cast<void*>(pixels.get()), IntRect(0, 0, 1, 1));
} else if (m_numCommits == 2) {
+ m_layerTreeHost->setNeedsRedraw();
m_layerTreeHost->setNeedsCommit();
- m_layerTreeHost->finishAllRendering();
+ } else
endTest();
- }
}
virtual void afterTest()
@@ -975,10 +976,7 @@
int m_numCommits;
};
-TEST_F(CCLayerTreeHostTestCanDrawBlocksDrawing, runMultiThread)
-{
- runTestThreaded();
-}
+SINGLE_AND_MULTI_THREAD_TEST_F(CCLayerTreeHostTestCanDrawBlocksDrawing)
// beginLayerWrite should prevent draws from executing until a commit occurs
class CCLayerTreeHostTestWriteLayersRedraw : public CCLayerTreeHostTestThreadOnly {
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
