Index: cc/test/layer_tree_test.cc |
diff --git a/cc/test/layer_tree_test.cc b/cc/test/layer_tree_test.cc |
index 2681b434a8df9f4e7c3923a48dd3d7afb20f8c8d..eedbd3d2c90f05c17b6c34245853c369038d3de5 100644 |
--- a/cc/test/layer_tree_test.cc |
+++ b/cc/test/layer_tree_test.cc |
@@ -202,6 +202,9 @@ class LayerTreeHostImplForTesting : public LayerTreeHostImpl { |
} |
virtual void BlockNotifyReadyToActivateForTesting(bool block) OVERRIDE { |
+ CHECK(settings().impl_side_painting); |
danakj
2014/09/03 21:14:24
nit: DCHECKs would be sufficient (and be a good ex
enne (OOO)
2014/09/03 21:36:25
It's a CHECK so that it also fails in release. If
|
+ CHECK(proxy()->ImplThreadTaskRunner()) |
+ << "Not supported for single-threaded mode."; |
block_notify_ready_to_activate_for_testing_ = block; |
if (!block && notify_ready_to_activate_was_blocked_) { |
NotifyReadyToActivate(); |
@@ -627,11 +630,7 @@ void LayerTreeTest::RunTest(bool threaded, |
// Spend less time waiting for BeginFrame because the output is |
// mocked out. |
settings_.refresh_rate = 200.0; |
- if (impl_side_painting) { |
- DCHECK(threaded) |
- << "Don't run single thread + impl side painting, it doesn't exist."; |
- settings_.impl_side_painting = true; |
- } |
+ settings_.impl_side_painting = impl_side_painting; |
InitializeSettings(&settings_); |
main_task_runner_->PostTask( |