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

Unified Diff: cc/test/layer_tree_test_common.cc

Issue 12642010: Implement on demand quad rasterization for PicturePiles. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: build fix. Created 7 years, 9 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
Index: cc/test/layer_tree_test_common.cc
diff --git a/cc/test/layer_tree_test_common.cc b/cc/test/layer_tree_test_common.cc
index e9be315ff0d790709fe6ecfbe2af67aacb63e4c6..d73367007b494a11458e670888c8a98449370a55 100644
--- a/cc/test/layer_tree_test_common.cc
+++ b/cc/test/layer_tree_test_common.cc
@@ -316,10 +316,13 @@ void ThreadedTest::endTest()
{
// For the case where we endTest during beginTest(), set a flag to indicate that
// the test should end the second beginTest regains control.
- if (m_beginning)
+ if (m_beginning) {
m_endWhenBeginReturns = true;
- else
- proxy()->MainThread()->PostTask(base::Bind(&ThreadedTest::realEndTest, m_mainThreadWeakPtr));
+ } else {
danakj 2013/03/21 02:34:42 else if (proxy())
Leandro Graciá Gil 2013/03/21 16:42:48 Done in a separate CL.
+ // Racy timeouts and explicit endTest calls might have cleaned up the tree host.
nduca 2013/03/21 02:22:48 Erm,.... this is a separate patch. You should put
Leandro Graciá Gil 2013/03/21 03:35:50 Ok, but the problem was exposed by the newly intro
danakj 2013/03/21 04:33:39 I was wondering about this.. does this mean the pi
Leandro Graciá Gil 2013/03/21 16:42:48 The new pixel test had flaky crashes, apparently b
+ if (proxy())
+ proxy()->MainThread()->PostTask(base::Bind(&ThreadedTest::realEndTest, m_mainThreadWeakPtr));
+ }
}
void ThreadedTest::endTestAfterDelay(int delayMilliseconds)

Powered by Google App Engine
This is Rietveld 408576698