Skip to content

Commit 89fe8f2

Browse files
author
Butkovits Atila
committed
Backed out 8 changesets (bug 1679440, bug 1682069, bug 1667276) for causing failure on test_crash_backgroundtask_moz_crash.js. CLOSED TREE
Backed out changeset f06504e3219f (bug 1682069) Backed out changeset 4d325f68ea24 (bug 1679440) Backed out changeset 9ab334e527a5 (bug 1667276) Backed out changeset 1c8d51d2c90f (bug 1667276) Backed out changeset 8d6f10d83c6b (bug 1667276) Backed out changeset 62488ec634f9 (bug 1667276) Backed out changeset 1dcb2d1be264 (bug 1667276) Backed out changeset c673fff5bd85 (bug 1667276)
1 parent 897cbb0 commit 89fe8f2

40 files changed

+30
-1450
lines changed

.eslintignore

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,3 @@ tools/tryselect/selectors/chooser/templates/chooser.html
220220

221221
# Ignore preprocessed *(P)refs.js files in update-packaging.
222222
tools/update-packaging/**/*refs.js
223-
224-
# Ignore backgroundtasks preferences files.
225-
toolkit/components/backgroundtasks/defaults

.prettierignore

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,3 @@ devtools/client/debugger/src/test/mochitest/examples/ember/quickstart
5858

5959
# These are source mapped and the locations are asserted in the test case.
6060
devtools/client/webconsole/test/browser/test-mangled-function.*
61-
62-
# Ignore backgroundtasks preferences files.
63-
toolkit/components/backgroundtasks/defaults

browser/base/content/test/static/browser_all_files_referenced.js

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,6 @@ if (AppConstants.platform == "macosx") {
5555
gExceptionPaths.push("resource://gre/res/touchbar/");
5656
}
5757

58-
if (AppConstants.MOZ_BACKGROUNDTASKS) {
59-
// These preferences are active only when we're in background task mode.
60-
gExceptionPaths.push("resource://gre/defaults/backgroundtasks/");
61-
// `BackgroundTask_id.jsm` is loaded at runtime by `app --backgroundtask id ...`.
62-
gExceptionPaths.push("resource://gre/modules/backgroundtasks/");
63-
}
64-
6558
// Each whitelist entry should have a comment indicating which file is
6659
// referencing the whitelisted file in a way that the test can't detect, or a
6760
// bug number to remove or use the file if it is indeed currently unreferenced.

browser/installer/Makefile.in

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,6 @@ ifdef MOZ_DEFAULT_BROWSER_AGENT
9898
DEFINES += -DMOZ_DEFAULT_BROWSER_AGENT=1
9999
endif
100100

101-
ifdef MOZ_BACKGROUNDTASKS
102-
DEFINES += -DMOZ_BACKGROUNDTASKS=1
103-
endif
104-
105101
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
106102
MOZ_PKG_MAC_DSSTORE=$(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/dsstore
107103
MOZ_PKG_MAC_BACKGROUND=$(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/background.png

browser/installer/package-manifest.in

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -305,12 +305,6 @@
305305
; gre location for now.
306306
@RESPATH@/defaults/pref/channel-prefs.js
307307

308-
; Background tasks-specific preferences. These are in the GRE
309-
; location since they apply to all tasks at this time.
310-
#ifdef MOZ_BACKGROUNDTASKS
311-
@RESPATH@/defaults/backgroundtasks/backgroundtasks.js
312-
#endif
313-
314308
; [Layout Engine Resources]
315309
; Style Sheets, Graphics and other Resources used by the layout engine.
316310
@RESPATH@/res/EditorOverride.css

extensions/pref/autoconfig/src/components.conf

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,6 @@ Classes = [
1111
'type': 'nsReadConfig',
1212
'headers': ['/extensions/pref/autoconfig/src/nsReadConfig.h'],
1313
'init_method': 'Init',
14-
'categories': {
15-
'pref-config-startup': {
16-
'name': 'ReadConfig Module',
17-
'backgroundtasks': BackgroundTasksSelector.ALL_TASKS,
18-
},
19-
},
14+
'categories': {'pref-config-startup': 'ReadConfig Module'},
2015
},
2116
]

layout/build/components.conf

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -96,12 +96,7 @@ Classes = [
9696
'cid': '{fc886801-e768-11d4-9885-00c04fa0cf4b}',
9797
'contract_ids': ['@mozilla.org/content/document-loader-factory;1'],
9898
'type': 'nsIDocumentLoaderFactory',
99-
'categories': {
100-
'Gecko-Content-Viewers': {
101-
'name': content_types,
102-
'backgroundtasks': BackgroundTasksSelector.ALL_TASKS,
103-
}
104-
},
99+
'categories': {'Gecko-Content-Viewers': content_types},
105100
},
106101
{
107102
'cid': '{0ddf4df8-4dbb-4133-8b79-9afb966514f5}',
@@ -294,14 +289,8 @@ Classes = [
294289
'type': 'nsMixedContentBlocker',
295290
'headers': ['mozilla/dom/nsMixedContentBlocker.h'],
296291
'categories': {
297-
'content-policy': {
298-
'name': '@mozilla.org/mixedcontentblocker;1',
299-
'backgroundtasks': BackgroundTasksSelector.ALL_TASKS,
300-
},
301-
'net-channel-event-sinks': {
302-
'name': '@mozilla.org/mixedcontentblocker;1',
303-
'backgroundtasks': BackgroundTasksSelector.ALL_TASKS,
304-
},
292+
'content-policy': '@mozilla.org/mixedcontentblocker;1',
293+
'net-channel-event-sinks': '@mozilla.org/mixedcontentblocker;1',
305294
},
306295
},
307296
{

modules/libpref/Preferences.cpp

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,6 @@
8686
#include "plstr.h"
8787
#include "prlink.h"
8888
#include "xpcpublic.h"
89-
#ifdef MOZ_BACKGROUNDTASKS
90-
# include "mozilla/BackgroundTasks.h"
91-
#endif
9289

9390
#ifdef DEBUG
9491
# include <map>
@@ -4533,13 +4530,6 @@ nsresult Preferences::InitInitialObjects(bool aIsStartup) {
45334530
rv = pref_ReadDefaultPrefs(jarReader, "defaults/pref/*.js$");
45344531
NS_ENSURE_SUCCESS(rv, rv);
45354532

4536-
#ifdef MOZ_BACKGROUNDTASKS
4537-
if (BackgroundTasks::IsBackgroundTaskMode()) {
4538-
rv = pref_ReadDefaultPrefs(jarReader, "defaults/backgroundtasks/*.js$");
4539-
NS_ENSURE_SUCCESS(rv, rv);
4540-
}
4541-
#endif
4542-
45434533
#ifdef MOZ_WIDGET_ANDROID
45444534
// Load jar:$gre/omni.jar!/defaults/pref/$MOZ_ANDROID_CPU_ABI/*.js.
45454535
nsAutoCString path;
@@ -4619,25 +4609,6 @@ nsresult Preferences::InitInitialObjects(bool aIsStartup) {
46194609
NS_WARNING("Error parsing preferences.");
46204610
}
46214611
}
4622-
4623-
#ifdef MOZ_BACKGROUNDTASKS
4624-
if (BackgroundTasks::IsBackgroundTaskMode()) {
4625-
rv = appJarReader->FindInit("defaults/backgroundtasks/*.js$",
4626-
getter_Transfers(find));
4627-
NS_ENSURE_SUCCESS(rv, rv);
4628-
prefEntries.Clear();
4629-
while (NS_SUCCEEDED(find->FindNext(&entryName, &entryNameLen))) {
4630-
prefEntries.AppendElement(Substring(entryName, entryNameLen));
4631-
}
4632-
prefEntries.Sort();
4633-
for (uint32_t i = prefEntries.Length(); i--;) {
4634-
rv = pref_ReadPrefFromJar(appJarReader, prefEntries[i].get());
4635-
if (NS_FAILED(rv)) {
4636-
NS_WARNING("Error parsing preferences.");
4637-
}
4638-
}
4639-
}
4640-
#endif
46414612
}
46424613

46434614
nsCOMPtr<nsIProperties> dirSvc(

modules/libpref/moz.build

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,3 @@ else:
167167
FINAL_TARGET_PP_FILES += [
168168
"greprefs.js",
169169
]
170-
171-
if CONFIG["MOZ_BACKGROUNDTASKS"]:
172-
DEFINES["MOZ_BACKGROUNDTASKS"] = True

startupcache/StartupCache.cpp

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,6 @@
3535
#include "GeckoProfiler.h"
3636
#include "nsAppRunner.h"
3737
#include "xpcpublic.h"
38-
#ifdef MOZ_BACKGROUNDTASKS
39-
# include "mozilla/BackgroundTasks.h"
40-
#endif
4138

4239
#if defined(XP_WIN)
4340
# include <windows.h>
@@ -118,12 +115,6 @@ StartupCache* StartupCache::GetSingletonNoInit() {
118115
}
119116

120117
StartupCache* StartupCache::GetSingleton() {
121-
#ifdef MOZ_BACKGROUNDTASKS
122-
if (BackgroundTasks::IsBackgroundTaskMode()) {
123-
return nullptr;
124-
}
125-
#endif
126-
127118
if (!gStartupCache) {
128119
if (!XRE_IsParentProcess()) {
129120
return nullptr;

0 commit comments

Comments
 (0)