Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-27 23:02:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 189c8d74af36 (bug 1664916) for bc failure on browser_Troubleshoot.js. CLOSED TREE

Browse Source
This commit is contained in:
Narcis Beleuzu 2020-11-20 00:12:10 +02:00
parent 4e4ee9d822
commit d33e9a8fc8
5 changed files with 0 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
toolkit/content/aboutSupport.js
View File

@ -76,9 +76,6 @@ var snapshotFormatters = {
$("application-box").textContent = data.name; $("application-box").textContent = data.name;
$("useragent-box").textContent = data.userAgent; $("useragent-box").textContent = data.userAgent;
$("os-box").textContent = data.osVersion; $("os-box").textContent = data.osVersion;
if (AppConstants.platform == "macosx") {
$("rosetta-box").textContent = data.rosetta;
}
$("binary-box").textContent = Services.dirsvc.get( $("binary-box").textContent = Services.dirsvc.get(
"XREExeF", "XREExeF",
Ci.nsIFile Ci.nsIFile

9
toolkit/content/aboutSupport.xhtml
View File

@ -134,15 +134,6 @@
</td> </td>
</tr> </tr>
#ifdef XP_MACOSX
<tr>
<th class="column" data-l10n-id="app-basics-rosetta"/>
<td id="rosetta-box">
</td>
</tr>
#endif
<tr class="no-copy"> <tr class="no-copy">
<th class="column" data-l10n-id="app-basics-binary"/> <th class="column" data-l10n-id="app-basics-binary"/>

3
toolkit/locales/en-US/toolkit/about/aboutSupport.ftl
View File

@ -58,9 +58,6 @@ app-basics-enabled-plugins = Enabled Plugins
app-basics-build-config = Build Configuration app-basics-build-config = Build Configuration
app-basics-user-agent = User Agent app-basics-user-agent = User Agent
app-basics-os = OS app-basics-os = OS
# Rosetta is Apple's translation process to run apps containing x86_64
# instructions on Apple Silicon. This should remain in English.
app-basics-rosetta = Rosetta Translated
app-basics-memory-use = Memory Use app-basics-memory-use = Memory Use
app-basics-performance = Performance app-basics-performance = Performance
app-basics-service-workers = Registered Service Workers app-basics-service-workers = Registered Service Workers

5
toolkit/modules/Troubleshoot.jsm
View File

@ -230,11 +230,6 @@ var dataProviders = {
); );
} catch (e) {} } catch (e) {}
// MacOSX: Check for rosetta status, if it exists
try {
data.rosetta = Services.sysinfo.getProperty("rosettaStatus");
} catch (e) {}
data.numTotalWindows = 0; data.numTotalWindows = 0;
data.numFissionWindows = 0; data.numFissionWindows = 0;
data.numRemoteWindows = 0; data.numRemoteWindows = 0;

24
xpcom/base/nsSystemInfo.cpp
View File

@ -523,25 +523,6 @@ static nsresult GetAppleModelId(nsAutoCString& aModelId) {
aModelId.Truncate(numChars - 1); aModelId.Truncate(numChars - 1);
return NS_OK; return NS_OK;
} }
static nsresult ProcessIsRosettaTranslated(bool& isRosetta) {
# if defined(__aarch64__)
// There is no need to call sysctlbyname() if we are running as arm64.
isRosetta = false;
# else
int ret = 0;
size_t size = sizeof(ret);
if (sysctlbyname("sysctl.proc_translated", &ret, &size, NULL, 0) == -1) {
if (errno != ENOENT) {
fprintf(stderr, "Failed to check for translation environment\n");
}
isRosetta = false;
} else {
isRosetta = (ret == 1);
}
# endif
return NS_OK;
}
#endif #endif
using namespace mozilla; using namespace mozilla;
@ -958,11 +939,6 @@ nsresult nsSystemInfo::Init() {
rv = SetPropertyAsACString(u"appleModelId"_ns, modelId); rv = SetPropertyAsACString(u"appleModelId"_ns, modelId);
NS_ENSURE_SUCCESS(rv, rv); NS_ENSURE_SUCCESS(rv, rv);
} }
bool isRosetta;
if (NS_SUCCEEDED(ProcessIsRosettaTranslated(isRosetta))) {
rv = SetPropertyAsBool(u"rosettaStatus"_ns, isRosetta);
NS_ENSURE_SUCCESS(rv, rv);
}
#endif #endif
#if defined(MOZ_WIDGET_GTK) #if defined(MOZ_WIDGET_GTK)