Title: [99865] trunk/Source/WebKit/chromium
- Revision
- 99865
- Author
- [email protected]
- Date
- 2011-11-10 09:03:07 -0800 (Thu, 10 Nov 2011)
Log Message
[Chromium] Fix CCLayerTreeHostImplTest::scrollRootCallsCommitAndRedraw
https://bugs.webkit.org/show_bug.cgi?id=72027
We weren't calling setScrollable(true) when setting up the test, so
scroll events were being ignored. Test failed in debug builds, but passed
in release because we were using ASSERT instead of ASSERT_TRUE.
Patch by Iain Merrick <[email protected]> on 2011-11-10
Reviewed by Tony Gentilcore.
* tests/CCLayerTreeHostImplTest.cpp:
(WebKit::TEST_F):
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (99864 => 99865)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-11-10 16:49:32 UTC (rev 99864)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-11-10 17:03:07 UTC (rev 99865)
@@ -1,3 +1,17 @@
+2011-11-10 Iain Merrick <[email protected]>
+
+ [Chromium] Fix CCLayerTreeHostImplTest::scrollRootCallsCommitAndRedraw
+ https://bugs.webkit.org/show_bug.cgi?id=72027
+
+ We weren't calling setScrollable(true) when setting up the test, so
+ scroll events were being ignored. Test failed in debug builds, but passed
+ in release because we were using ASSERT instead of ASSERT_TRUE.
+
+ Reviewed by Tony Gentilcore.
+
+ * tests/CCLayerTreeHostImplTest.cpp:
+ (WebKit::TEST_F):
+
2011-11-10 Alpha Lam <[email protected]>
[chromium] Scroll deltas are cleared during commit to the main thread
Modified: trunk/Source/WebKit/chromium/tests/CCLayerTreeHostImplTest.cpp (99864 => 99865)
--- trunk/Source/WebKit/chromium/tests/CCLayerTreeHostImplTest.cpp 2011-11-10 16:49:32 UTC (rev 99864)
+++ trunk/Source/WebKit/chromium/tests/CCLayerTreeHostImplTest.cpp 2011-11-10 17:03:07 UTC (rev 99865)
@@ -149,12 +149,13 @@
TEST_F(CCLayerTreeHostImplTest, scrollRootCallsCommitAndRedraw)
{
RefPtr<CCLayerImpl> root = CCLayerImpl::create(0);
+ root->setScrollable(true);
root->setScrollPosition(IntPoint(0, 0));
root->setMaxScrollPosition(IntSize(100, 100));
m_hostImpl->setRootLayer(root);
m_hostImpl->scrollRootLayer(IntSize(0, 10));
- ASSERT(m_didRequestRedraw);
- ASSERT(m_didRequestCommit);
+ EXPECT_TRUE(m_didRequestRedraw);
+ EXPECT_TRUE(m_didRequestCommit);
}
class BlendStateTrackerContext: public MockWebGraphicsContext3D {
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
