Bug 1525314 - Skip assertion intermittently failing on Android. r=aosmond
☠☠ backed out by 2e7a7f345b27 ☠ ☠
authorKartikaya Gupta <kgupta@mozilla.com>
Thu, 04 Jul 2019 18:39:08 +0000
changeset 540966 02399933ac4b1466f44099766aed5c3a76f69a2e
parent 540965 95790a07a93c5a9faf1ededcb0c4c05191e784b4
child 540967 ab21a3ff4ae4121a8d486c38544ac16c8225cef9
push id11533
push userarchaeopteryx@coole-files.de
push dateMon, 08 Jul 2019 18:18:03 +0000
treeherdermozilla-beta@f4452e031aed [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersaosmond
bugs1525314
milestone69.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1525314 - Skip assertion intermittently failing on Android. r=aosmond Depends on D36796 Differential Revision: https://phabricator.services.mozilla.com/D36797
gfx/webrender_bindings/RenderThread.cpp
--- a/gfx/webrender_bindings/RenderThread.cpp
+++ b/gfx/webrender_bindings/RenderThread.cpp
@@ -673,17 +673,20 @@ void RenderThread::NotifyNotUsed(uint64_
   }
 
   MutexAutoLock lock(mRenderTextureMapLock);
   if (mHasShutdown) {
     return;
   }
 
   auto it = mRenderTextures.find(aExternalImageId);
+#ifndef MOZ_WIDGET_ANDROID
+  // This assert fails on GeckoView intermittently. Bug 1559958 tracks it.
   MOZ_ASSERT(it != mRenderTextures.end());
+#endif
   if (it == mRenderTextures.end()) {
     return;
   }
 
   RefPtr<RenderTextureHost> texture = it->second;
   texture->NotifyNotUsed();
 }