Index: cc/trees/layer_tree_host.cc |
diff --git a/cc/trees/layer_tree_host.cc b/cc/trees/layer_tree_host.cc |
index 51b9b4f2e33d31a0663ff35821a4b8ac0f21f482..26e17fbe3d4bb7905cd99bf0a4a4cf1f013d591d 100644 |
--- a/cc/trees/layer_tree_host.cc |
+++ b/cc/trees/layer_tree_host.cc |
@@ -147,6 +147,8 @@ void LayerTreeHost::InitializeProxy(scoped_ptr<Proxy> proxy) { |
LayerTreeHost::~LayerTreeHost() { |
TRACE_EVENT0("cc", "LayerTreeHost::~LayerTreeHost"); |
+ BreakSwapPromises(SwapPromise::COMMIT_FAILS); |
+ |
overhang_ui_resource_.reset(); |
if (root_layer_.get()) |
@@ -1250,8 +1252,6 @@ void LayerTreeHost::NotifySwapPromiseMonitorsOfSetNeedsCommit() { |
void LayerTreeHost::QueueSwapPromise(scoped_ptr<SwapPromise> swap_promise) { |
DCHECK(swap_promise); |
- if (swap_promise_list_.size() > kMaxQueuedSwapPromiseNumber) |
- BreakSwapPromises(SwapPromise::SWAP_PROMISE_LIST_OVERFLOW); |
swap_promise_list_.push_back(swap_promise.Pass()); |
} |