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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/trees/layer_tree_host_impl.cc

Issue 134623005: Make SingleThreadProxy a SchedulerClient (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Review cleanup Created 6 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
« cc/test/layer_tree_test.cc ('K') | « cc/trees/layer_tree_host.cc ('k') | cc/trees/layer_tree_host_unittest.cc » ('j') | cc/trees/single_thread_proxy.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/layer_tree_host_impl.cc
diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
index 309f87404944b3cd4349fef8b7c0495326795034..6704dce8f510353c6500084e09c31683d2dcdef3 100644
--- a/cc/trees/layer_tree_host_impl.cc
+++ b/cc/trees/layer_tree_host_impl.cc
@@ -1626,6 +1626,11 @@ float LayerTreeHostImpl::VerticalAdjust() const {
}
void LayerTreeHostImpl::DidLoseOutputSurface() {
+#ifndef NDEBUG
danakj 2014/06/13 18:34:10 why not #if DCHECK_IS_ON?
enne (OOO) 2014/06/13 20:10:41 Sorry, poor merge across three months.
+ // This must be set before calling the below functions as they may
+ // synchronously try to recreate the output surface.
+ did_lose_called_ = true;
+#endif
if (resource_provider_)
resource_provider_->DidLoseOutputSurface();
// TODO(jamesr): The renderer_ check is needed to make some of the
@@ -1633,9 +1638,6 @@ void LayerTreeHostImpl::DidLoseOutputSurface() {
// important) in production. We should adjust the test to not need this.
if (renderer_)
client_->DidLoseOutputSurfaceOnImplThread();
-#if DCHECK_IS_ON
- did_lose_called_ = true;
-#endif
}
bool LayerTreeHostImpl::HaveRootScrollLayer() const {
« cc/test/layer_tree_test.cc ('K') | « cc/trees/layer_tree_host.cc ('k') | cc/trees/layer_tree_host_unittest.cc » ('j') | cc/trees/single_thread_proxy.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698