diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2020-02-20 12:12:30 -0500 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-04-14 12:49:08 +0200 |
| commit | 496fbaf738fb00824d7e972e874bfdbe85caaee5 (patch) | |
| tree | d1ee93e14f49f8ff5e05cd1e0f52693df4721b93 /widget/GfxInfoBase.cpp | |
| parent | 85621ee9b30dd325b85eecb7137a0d3cb1d38c27 (diff) | |
| download | UXP-496fbaf738fb00824d7e972e874bfdbe85caaee5.tar UXP-496fbaf738fb00824d7e972e874bfdbe85caaee5.tar.gz UXP-496fbaf738fb00824d7e972e874bfdbe85caaee5.tar.lz UXP-496fbaf738fb00824d7e972e874bfdbe85caaee5.tar.xz UXP-496fbaf738fb00824d7e972e874bfdbe85caaee5.zip | |
Issue #1053 - Remove conditional android code from widget/
Diffstat (limited to 'widget/GfxInfoBase.cpp')
| -rw-r--r-- | widget/GfxInfoBase.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/widget/GfxInfoBase.cpp b/widget/GfxInfoBase.cpp index e20de8277..4c2d83018 100644 --- a/widget/GfxInfoBase.cpp +++ b/widget/GfxInfoBase.cpp @@ -274,8 +274,6 @@ BlacklistOSToOperatingSystem(const nsAString& os) return OperatingSystem::OSX10_11; else if (os.EqualsLiteral("Darwin 16")) return OperatingSystem::OSX10_12; - else if (os.EqualsLiteral("Android")) - return OperatingSystem::Android; // For historical reasons, "All" in blocklist means "All Windows" else if (os.EqualsLiteral("All")) return OperatingSystem::Windows; @@ -691,7 +689,7 @@ GfxInfoBase::FindBlocklistedDeviceInList(const nsTArray<GfxDriverInfo>& info, } } -#if defined(XP_WIN) || defined(ANDROID) +#ifdef XP_WIN uint64_t driverVersion; ParseDriverVersion(adapterDriverVersionString, &driverVersion); #endif @@ -730,7 +728,7 @@ GfxInfoBase::FindBlocklistedDeviceInList(const nsTArray<GfxDriverInfo>& info, continue; } -#if defined(XP_WIN) || defined(ANDROID) +#ifdef XP_WIN switch (info[i].mComparisonOp) { case DRIVER_LESS_THAN: match = driverVersion < info[i].mDriverVersion; |