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

Unified Diff: cc/CCLayerTreeHostTest.cpp

Issue 10944031: cc: Fix CCLayerTreeHostTestScrollMultipleRedraw.runMultiThread test. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/CCLayerTreeHostTest.cpp
diff --git a/cc/CCLayerTreeHostTest.cpp b/cc/CCLayerTreeHostTest.cpp
index 555eec7c5f5dc025a457a5f571511570dfd292a2..b750e1be8c051fdb7af2a811727faa5993269761 100644
--- a/cc/CCLayerTreeHostTest.cpp
+++ b/cc/CCLayerTreeHostTest.cpp
@@ -969,11 +969,11 @@ public:
virtual void beginCommitOnCCThread(CCLayerTreeHostImpl* impl) OVERRIDE
{
LayerChromium* root = m_layerTreeHost->rootLayer();
- if (!impl->sourceFrameNumber())
+ if (!m_layerTreeHost->commitNumber())
EXPECT_EQ(root->scrollPosition(), m_initialScroll);
- else if (impl->sourceFrameNumber() == 1)
+ else if (m_layerTreeHost->commitNumber() == 1)
EXPECT_EQ(root->scrollPosition(), m_initialScroll + m_scrollAmount + m_scrollAmount);
- else if (impl->sourceFrameNumber() == 2)
+ else if (m_layerTreeHost->commitNumber() == 2)
EXPECT_EQ(root->scrollPosition(), m_initialScroll + m_scrollAmount + m_scrollAmount);
}
@@ -1025,7 +1025,7 @@ private:
int m_scrolls;
};
-TEST_F(CCLayerTreeHostTestScrollMultipleRedraw, DISABLED_runMultiThread)
+TEST_F(CCLayerTreeHostTestScrollMultipleRedraw, runMultiThread)
{
runTest(true);
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698