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

Unified Diff: cc/test/layer_tree_test.cc

Issue 17351017: Re-land: cc: Add raster finished signals to RasterWorkerPool. (Closed) Base URL: http://git.chromium.org/chromium/src.git@new-graph-build
Patch Set: new approach Created 7 years, 6 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.cc
diff --git a/cc/test/layer_tree_test.cc b/cc/test/layer_tree_test.cc
index df47b3dca36a7580cf4c8466e5d4c0008cbd25be..1316836fbafa78a126a2705c2d1855a0c0470e0a 100644
--- a/cc/test/layer_tree_test.cc
+++ b/cc/test/layer_tree_test.cc
@@ -41,6 +41,10 @@ bool TestHooks::CanActivatePendingTree(LayerTreeHostImpl* host_impl) {
return true;
}
+bool TestHooks::CanActivatePendingTreeIfNeeded(LayerTreeHostImpl* host_impl) {
+ return true;
+}
+
// Adapts LayerTreeHostImpl for test. Runs real code, then invokes test hooks.
class LayerTreeHostImplForTesting : public LayerTreeHostImpl {
public:
@@ -114,7 +118,7 @@ class LayerTreeHostImplForTesting : public LayerTreeHostImpl {
if (!pending_tree())
return;
- if (!test_hooks_->CanActivatePendingTree(this))
+ if (!test_hooks_->CanActivatePendingTreeIfNeeded(this))
return;
LayerTreeHostImpl::ActivatePendingTreeIfNeeded();

Powered by Google App Engine
This is Rietveld 408576698