diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2020-02-20 12:12:30 -0500 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2020-02-20 12:12:30 -0500 |
| commit | b36e6061584f8518078c13b672f9ef05157f2826 (patch) | |
| tree | 2dcbc437458dce9ccbcce31a29424f8f6a331900 /widget/GfxInfoBase.cpp | |
| parent | 18e74277b30891033c95cac58d8a9d53b1cdb646 (diff) | |
| download | UXP-b36e6061584f8518078c13b672f9ef05157f2826.tar UXP-b36e6061584f8518078c13b672f9ef05157f2826.tar.gz UXP-b36e6061584f8518078c13b672f9ef05157f2826.tar.lz UXP-b36e6061584f8518078c13b672f9ef05157f2826.tar.xz UXP-b36e6061584f8518078c13b672f9ef05157f2826.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; |