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

Side by Side Diff: cc/trees/layer_tree_host.cc

Issue 513433002: Make DoDeferredClose a non-nestable task (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 3 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 unified diff | Download patch
« no previous file with comments | « no previous file | content/renderer/render_widget.cc » ('j') | content/renderer/render_widget.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2011 The Chromium Authors. All rights reserved. 1 // Copyright 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "cc/trees/layer_tree_host.h" 5 #include "cc/trees/layer_tree_host.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <stack> 8 #include <stack>
9 #include <string> 9 #include <string>
10 10
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 proxy_->Start(); 154 proxy_->Start();
155 if (settings_.accelerated_animation_enabled) { 155 if (settings_.accelerated_animation_enabled) {
156 animation_registrar_->set_supports_scroll_animations( 156 animation_registrar_->set_supports_scroll_animations(
157 proxy_->SupportsImplScrolling()); 157 proxy_->SupportsImplScrolling());
158 } 158 }
159 } 159 }
160 160
161 LayerTreeHost::~LayerTreeHost() { 161 LayerTreeHost::~LayerTreeHost() {
162 TRACE_EVENT0("cc", "LayerTreeHost::~LayerTreeHost"); 162 TRACE_EVENT0("cc", "LayerTreeHost::~LayerTreeHost");
163 163
164 CHECK(swap_promise_monitor_.empty()); 164 DCHECK(swap_promise_monitor_.empty());
165 165
166 BreakSwapPromises(SwapPromise::COMMIT_FAILS); 166 BreakSwapPromises(SwapPromise::COMMIT_FAILS);
167 167
168 overhang_ui_resource_.reset(); 168 overhang_ui_resource_.reset();
169 169
170 if (root_layer_.get()) 170 if (root_layer_.get())
171 root_layer_->SetLayerTreeHost(NULL); 171 root_layer_->SetLayerTreeHost(NULL);
172 172
173 if (proxy_) { 173 if (proxy_) {
174 DCHECK(proxy_->IsMainThread()); 174 DCHECK(proxy_->IsMainThread());
(...skipping 1126 matching lines...) Expand 10 before | Expand all | Expand 10 after
1301 swap_promise_list_.push_back(swap_promise.Pass()); 1301 swap_promise_list_.push_back(swap_promise.Pass());
1302 } 1302 }
1303 1303
1304 void LayerTreeHost::BreakSwapPromises(SwapPromise::DidNotSwapReason reason) { 1304 void LayerTreeHost::BreakSwapPromises(SwapPromise::DidNotSwapReason reason) {
1305 for (size_t i = 0; i < swap_promise_list_.size(); i++) 1305 for (size_t i = 0; i < swap_promise_list_.size(); i++)
1306 swap_promise_list_[i]->DidNotSwap(reason); 1306 swap_promise_list_[i]->DidNotSwap(reason);
1307 swap_promise_list_.clear(); 1307 swap_promise_list_.clear();
1308 } 1308 }
1309 1309
1310 } // namespace cc 1310 } // namespace cc
OLDNEW
« no previous file with comments | « no previous file | content/renderer/render_widget.cc » ('j') | content/renderer/render_widget.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698