Bug 1371190 - (Rebase)
Bug 1366425 - Avoid losing context on out of memory error for ANGLE
MozReview-Commit-ID: 9bJJQ9BaYTS
--- a/gfx/angle/src/libANGLE/Context.cpp
+++ b/gfx/angle/src/libANGLE/Context.cpp
@@ -2817,17 +2817,17 @@ void Context::updateCaps()
void Context::initWorkarounds()
{
// Apply back-end workarounds.
mImplementation->applyNativeWorkarounds(&mWorkarounds);
// Lose the context upon out of memory error if the application is
// expecting to watch for those events.
- mWorkarounds.loseContextOnOutOfMemory = (mResetStrategy == GL_LOSE_CONTEXT_ON_RESET_EXT);
+ mWorkarounds.loseContextOnOutOfMemory = false;
}
void Context::syncRendererState()
{
mGLState.syncDirtyObjects(this);
const State::DirtyBits &dirtyBits = mGLState.getDirtyBits();
mImplementation->syncState(this, dirtyBits);
mGLState.clearDirtyBits();