Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-17 15:25:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset aca75dcd4379 (bug 1560335) for android bustages complaining about gfxPlatform.cpp CLOSED TREE

Browse Source
This commit is contained in:
Bogdan Tara 2019-09-10 00:45:08 +03:00
parent e1a687b64f
commit 18bc1e5f1c
4 changed files with 0 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gfx/src/gfxTelemetry.cpp
View File

@ -52,8 +52,6 @@ const char* FeatureStatusToString(FeatureStatus aStatus) {
return "blocked-release-channel-nvidia";
case FeatureStatus::BlockedReleaseChannelBattery:
return "blocked-release-channel-battery";
case FeatureStatus::BlockedReleaseChannelAndroid:
return "blocked-release-channel-android";
case FeatureStatus::Blacklisted:
return "blacklisted";
case FeatureStatus::OptIn:

1
gfx/src/gfxTelemetry.h
View File

@ -44,7 +44,6 @@ enum class FeatureStatus {
BlockedReleaseChannelAMD,
BlockedReleaseChannelNvidia,
BlockedReleaseChannelBattery,
BlockedReleaseChannelAndroid,
// This feature has been blocked by the graphics blacklist.
Blacklisted,

9
gfx/thebes/gfxPlatform.cpp
View File

@ -2875,7 +2875,6 @@ static FeatureState& WebRenderHardwareQualificationStatus(
return featureWebRenderQualified;
}
#ifndef MOZ_WIDGET_ANDROID
nsAutoString adapterVendorID;
gfxInfo->GetAdapterVendorID(adapterVendorID);
@ -2942,14 +2941,6 @@ static FeatureState& WebRenderHardwareQualificationStatus(
NS_LITERAL_CSTRING("FEATURE_FAILURE_WR_HAS_BATTERY"));
}
}
#else // !MOZ_WIDGET_ANDROID
#ifndef NIGHTLY_BUILD
featureWebRenderQualified.Disable(
FeatureStatus::BlockedReleaseChannelAndroid,
"Release channel and Android",
NS_LITERAL_CSTRING("FEATURE_FAILURE_RELEASE_CHANNEL_ANDROID"));
#endif
#endif
return featureWebRenderQualified;
}

13
widget/android/GfxInfo.cpp
View File

@ -527,19 +527,6 @@ nsresult GfxInfo::GetFeatureStatusImpl(
}
return NS_OK;
}
if (aFeature == FEATURE_WEBRENDER) {
NS_LossyConvertUTF16toASCII model(mModel);
bool isBlocked = !model.Equals("Pixel 2", nsCaseInsensitiveCStringComparator());
if (isBlocked) {
*aStatus = nsIGfxInfo::FEATURE_BLOCKED_DEVICE;
aFailureId = "FEATURE_FAILURE_WEBRENDER_BLOCKED_DEVICE";
} else {
*aStatus = nsIGfxInfo::FEATURE_STATUS_OK;
}
return NS_OK;
}
}
return GfxInfoBase::GetFeatureStatusImpl(