summaryrefslogtreecommitdiffstats
path: root/widget/uikit
diff options
context:
space:
mode:
authorDavid Major <dmajor@mozilla.com>2018-05-23 11:54:21 -0700
committerwolfbeast <mcwerewolf@gmail.com>2018-06-07 06:08:05 +0200
commit6b36aa089d31573cf9a72da530dc423b3978fda3 (patch)
tree1e4c3891c5f61f6eed4425d110601a89f5c9a09f /widget/uikit
parent63d30436895af897f71c40669ca587b495d98649 (diff)
downloadUXP-6b36aa089d31573cf9a72da530dc423b3978fda3.tar
UXP-6b36aa089d31573cf9a72da530dc423b3978fda3.tar.gz
UXP-6b36aa089d31573cf9a72da530dc423b3978fda3.tar.lz
UXP-6b36aa089d31573cf9a72da530dc423b3978fda3.tar.xz
UXP-6b36aa089d31573cf9a72da530dc423b3978fda3.zip
Bug 1458270: Clean up in the shutdown observer. r=milan a=jcristau
--HG-- extra : amend_source : 7b1277a18a3ed4f441deef8b51cb4ec4dde614cc
Diffstat (limited to 'widget/uikit')
-rw-r--r--widget/uikit/GfxInfo.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/widget/uikit/GfxInfo.cpp b/widget/uikit/GfxInfo.cpp
index 2aea3b5ea..cabe993dd 100644
--- a/widget/uikit/GfxInfo.cpp
+++ b/widget/uikit/GfxInfo.cpp
@@ -175,6 +175,10 @@ GfxInfo::GetFeatureStatusImpl(int32_t aFeature,
if (aOS)
*aOS = OperatingSystem::Ios;
+ if (mShutdownOccurred) {
+ return NS_OK;
+ }
+
// OpenGL layers are never blacklisted on iOS.
// This early return is so we avoid potentially slow
// GLStrings initialization on startup when we initialize GL layers.