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

Unified Diff: cc/trees/layer_tree_host_impl.cc

Issue 12545018: Move context-related callbacks into OutputSurface (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 7 years, 8 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
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 7b0a7e12cecbcf8304a840e1493d8237dc6c9aa7..33b5fd994836f7891c746b10d8178a8b1a7c2c53 100644
--- a/cc/trees/layer_tree_host_impl.cc
+++ b/cc/trees/layer_tree_host_impl.cc
@@ -1147,7 +1147,11 @@ const LayerTreeSettings& LayerTreeHostImpl::Settings() const {
}
void LayerTreeHostImpl::DidLoseOutputSurface() {
- client_->DidLoseOutputSurfaceOnImplThread();
+ // TODO(jamesr): The renderer_ check is needed to make some of the
+ // LayerTreeHostContextTest tests pass, but shouldn't be necessary (or
+ // important) in production. We should adjust the test to not need this.
+ if (renderer_)
+ client_->DidLoseOutputSurfaceOnImplThread();
}
void LayerTreeHostImpl::OnSwapBuffersComplete() {

Powered by Google App Engine
This is Rietveld 408576698