Index: cc/trees/layer_tree_host.cc |
diff --git a/cc/trees/layer_tree_host.cc b/cc/trees/layer_tree_host.cc |
index f18e3b865409bd20d0c17468d03396cca14c09b0..27659e054bea869e8bcc1940036e2f5d82fead9b 100644 |
--- a/cc/trees/layer_tree_host.cc |
+++ b/cc/trees/layer_tree_host.cc |
@@ -518,6 +518,10 @@ bool LayerTreeHost::CommitRequested() const { |
return proxy_->CommitRequested(); |
} |
+void LayerTreeHost::SetNextCommitWaitsForActivation() { |
+ proxy_->SetNextCommitWaitsForActivation(); |
+} |
+ |
void LayerTreeHost::SetAnimationEvents(scoped_ptr<AnimationEventsVector> events, |
base::Time wall_clock_time) { |
DCHECK(proxy_->IsMainThread()); |
@@ -1089,12 +1093,6 @@ void LayerTreeHost::UpdateTopControlsState(TopControlsState constraints, |
animate)); |
} |
-bool LayerTreeHost::BlocksPendingCommit() const { |
- if (!root_layer_.get()) |
- return false; |
- return root_layer_->BlocksPendingCommitRecursive(); |
-} |
- |
scoped_ptr<base::Value> LayerTreeHost::AsValue() const { |
scoped_ptr<base::DictionaryValue> state(new base::DictionaryValue()); |
state->Set("proxy", proxy_->AsValue().release()); |