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

Unified Diff: content/common/android/surface_texture_peer.cc

Issue 1120873002: Re-land: content: Single process support for native GpuMemoryBuffers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@dm-browsertests-refactor
Patch Set: Make InProcessSurfaceTextureManager thread safe Created 5 years, 7 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: content/common/android/surface_texture_peer.cc
diff --git a/content/common/android/surface_texture_peer.cc b/content/common/android/surface_texture_peer.cc
index a6fade45e69b9af79f4d32e6c461bc9bae18a95b..b2eebcf1ba0a4179c0bfd32ed943c7b34bc17f2f 100644
--- a/content/common/android/surface_texture_peer.cc
+++ b/content/common/android/surface_texture_peer.cc
@@ -26,7 +26,7 @@ SurfaceTexturePeer* SurfaceTexturePeer::GetInstance() {
// static
void SurfaceTexturePeer::InitInstance(SurfaceTexturePeer* instance) {
- DCHECK(!g_instance_);
+ DCHECK(!g_instance_ || !instance);
g_instance_ = instance;
}

Powered by Google App Engine
This is Rietveld 408576698