Bug 1349363 - Track both .processCount and .web to get a complete view of the user's content processes. r=Felipe

MozReview-Commit-ID: B9tVLbxnKFd

--HG--
extra : rebase_source : 15202ad5ec2c85633690170e4a6eebb0315d2f50
This commit is contained in:
Blake Kaplan 2017-04-18 11:11:06 -07:00
Родитель 68bfe109db
Коммит bacf7c88e0
1 изменённых файлов: 2 добавлений и 1 удалений

Просмотреть файл

@ -186,7 +186,7 @@ const DEFAULT_ENVIRONMENT_PREFS = new Map([
["devtools.debugger.remote-enabled", {what: RECORD_PREF_VALUE}], ["devtools.debugger.remote-enabled", {what: RECORD_PREF_VALUE}],
["dom.ipc.plugins.asyncInit.enabled", {what: RECORD_PREF_VALUE}], ["dom.ipc.plugins.asyncInit.enabled", {what: RECORD_PREF_VALUE}],
["dom.ipc.plugins.enabled", {what: RECORD_PREF_VALUE}], ["dom.ipc.plugins.enabled", {what: RECORD_PREF_VALUE}],
["dom.ipc.processCount", {what: RECORD_PREF_VALUE, requiresRestart: true}], ["dom.ipc.processCount", {what: RECORD_PREF_VALUE}],
["dom.max_script_run_time", {what: RECORD_PREF_VALUE}], ["dom.max_script_run_time", {what: RECORD_PREF_VALUE}],
["experiments.manifest.uri", {what: RECORD_PREF_VALUE}], ["experiments.manifest.uri", {what: RECORD_PREF_VALUE}],
["extensions.autoDisableScopes", {what: RECORD_PREF_VALUE}], ["extensions.autoDisableScopes", {what: RECORD_PREF_VALUE}],
@ -1237,6 +1237,7 @@ EnvironmentCache.prototype = {
this._currentEnvironment.settings = { this._currentEnvironment.settings = {
blocklistEnabled: Preferences.get(PREF_BLOCKLIST_ENABLED, true), blocklistEnabled: Preferences.get(PREF_BLOCKLIST_ENABLED, true),
e10sEnabled: Services.appinfo.browserTabsRemoteAutostart, e10sEnabled: Services.appinfo.browserTabsRemoteAutostart,
e10sMultiProcesses: Services.appinfo.maxWebProcessCount,
e10sCohort: Preferences.get(PREF_E10S_COHORT, "unknown"), e10sCohort: Preferences.get(PREF_E10S_COHORT, "unknown"),
telemetryEnabled: Utils.isTelemetryEnabled, telemetryEnabled: Utils.isTelemetryEnabled,
locale: getBrowserLocale(), locale: getBrowserLocale(),