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

Unified Diff: cc/layers/texture_layer.cc

Issue 23055007: aura: Fix raciness in context loss and recreation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 4 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/layers/texture_layer.cc
diff --git a/cc/layers/texture_layer.cc b/cc/layers/texture_layer.cc
index 316042b861a969dabd71a3bda0bc3b926c3aac3a..27594734a4a36c8d8a3e4c46773fa7d02775221d 100644
--- a/cc/layers/texture_layer.cc
+++ b/cc/layers/texture_layer.cc
@@ -189,8 +189,8 @@ bool TextureLayer::Update(ResourceUpdateQueue* queue,
updated = true;
}
} else {
- DCHECK(client_->Context3d());
texture_id_ = client_->PrepareTexture();
+ DCHECK_EQ(!!texture_id_, !!client_->Context3d());
if (client_->Context3d() &&
client_->Context3d()->getGraphicsResetStatusARB() != GL_NO_ERROR)
texture_id_ = 0;

Powered by Google App Engine
This is Rietveld 408576698