diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-04-14 21:49:04 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-04-14 21:49:04 +0200 |
| commit | 39dac57259cff8b61db0b22cb2ad0a8adb02692e (patch) | |
| tree | 52a026cc8c22793eb17fd0f5e22adce1ae08a1dd /widget/GfxDriverInfo.h | |
| parent | a1cce3b2b00bbd9f4983013ddd8934a7bccb9e99 (diff) | |
| parent | c2d9ab62f3d097c9e0e00184cab1f546554f5eaa (diff) | |
| download | UXP-39dac57259cff8b61db0b22cb2ad0a8adb02692e.tar UXP-39dac57259cff8b61db0b22cb2ad0a8adb02692e.tar.gz UXP-39dac57259cff8b61db0b22cb2ad0a8adb02692e.tar.lz UXP-39dac57259cff8b61db0b22cb2ad0a8adb02692e.tar.xz UXP-39dac57259cff8b61db0b22cb2ad0a8adb02692e.zip | |
Merge branch 'redwood' into 28.9-platform
Diffstat (limited to 'widget/GfxDriverInfo.h')
| -rw-r--r-- | widget/GfxDriverInfo.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/widget/GfxDriverInfo.h b/widget/GfxDriverInfo.h index 99d560b81..256142c87 100644 --- a/widget/GfxDriverInfo.h +++ b/widget/GfxDriverInfo.h @@ -58,7 +58,6 @@ enum class OperatingSystem { OSX10_10, OSX10_11, OSX10_12, - Android, Ios }; @@ -283,12 +282,6 @@ ParseDriverVersion(const nsAString& aVersion, uint64_t *aNumericVersion) *aNumericVersion = GFX_DRIVER_VERSION(a, b, c, d); MOZ_ASSERT(*aNumericVersion != GfxDriverInfo::allDriverVersions); return true; -#elif defined(ANDROID) - // Can't use aVersion.ToInteger() because that's not compiled into our code - // unless we have XPCOM_GLUE_AVOID_NSPR disabled. - *aNumericVersion = atoi(NS_LossyConvertUTF16toASCII(aVersion).get()); - MOZ_ASSERT(*aNumericVersion != GfxDriverInfo::allDriverVersions); - return true; #else return false; #endif |