Index: cc/trees/layer_tree_host.cc |
diff --git a/cc/trees/layer_tree_host.cc b/cc/trees/layer_tree_host.cc |
index 82a49b5c35a5cf8638ac6eb380b7834cafc31910..2083cefa87ae848a49d1ffc899c807f733f399bc 100644 |
--- a/cc/trees/layer_tree_host.cc |
+++ b/cc/trees/layer_tree_host.cc |
@@ -146,6 +146,8 @@ void LayerTreeHost::InitializeProxy(scoped_ptr<Proxy> proxy) { |
LayerTreeHost::~LayerTreeHost() { |
TRACE_EVENT0("cc", "LayerTreeHost::~LayerTreeHost"); |
+ BreakSwapPromises(SwapPromise::DID_NOT_SWAP_UNKNOWN); |
piman
2014/05/23 20:26:36
COMMIT_FAILED? Basically if we still have a SwapPr
mkosiba (inactive)
2014/06/18 14:58:02
COMMIT_FAILS makes more sense. If we wanted a spec
|
+ |
overhang_ui_resource_.reset(); |
if (root_layer_.get()) |
@@ -1241,8 +1243,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()); |
} |