wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1251875 - Part 1: Remove the dom.serviceWorkers.interception.enabled pref; r=bkelly

Browse Source
This commit is contained in:
Ehsan Akhgari 2016-02-27 14:36:43 -05:00
parent 17f7689c91
commit a67a5febad
88 changed files with 8 additions and 227 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
b2g/chrome/content/settings.js
View File

@ -650,7 +650,6 @@ var settingsToObserve = {
'dom.mozApps.signed_apps_installable_from': 'https://marketplace.firefox.com',
'dom.presentation.discovery.enabled': false,
'dom.presentation.discoverable': false,
'dom.serviceWorkers.interception.enabled': true,
'dom.serviceWorkers.testing.enabled': false,
'gfx.layerscope.enabled': false,
'layers.draw-borders': false,

1
b2g/components/test/mochitest/test_aboutserviceworkers.html
View File

@ -210,7 +210,6 @@ function setup() {
["dom.serviceWorkers.exemptFromPerDomainMax", true],
["dom.serviceWorkers.enabled", true],
["dom.serviceWorkers.testing.enabled", true],
["dom.serviceWorkers.interception.enabled", true]
]}, () => {
SpecialPowers.pushPermissions([
{ "type": "webapps-manage", "allow": 1, "context": document },

1
browser/app/profile/firefox.js
View File

@ -1646,7 +1646,6 @@ pref("reader.errors.includeURLs", true);
pref("view_source.tab", true);
pref("dom.serviceWorkers.enabled", true);
pref("dom.serviceWorkers.interception.enabled", true);
pref("dom.serviceWorkers.openWindow.enabled", true);
pref("dom.webnotifications.serviceworker.enabled", true);

5
docshell/base/nsDocShell.cpp
View File

@ -14157,11 +14157,6 @@ nsDocShell::ShouldPrepareForIntercept(nsIURI* aURI, bool aIsNonSubresourceReques
bool* aShouldIntercept)
{
*aShouldIntercept = false;
// Preffed off.
if (!nsContentUtils::ServiceWorkerInterceptionEnabled()) {
return NS_OK;
}
// No in private browsing
if (mInPrivateBrowsing) {
return NS_OK;

8
dom/base/nsContentUtils.cpp
View File

@ -274,7 +274,6 @@ bool nsContentUtils::sEncodeDecodeURLHash = false;
bool nsContentUtils::sGettersDecodeURLHash = false;
bool nsContentUtils::sPrivacyResistFingerprinting = false;
bool nsContentUtils::sSendPerformanceTimingNotifications = false;
bool nsContentUtils::sSWInterceptionEnabled = false;
uint32_t nsContentUtils::sHandlingInputTimeout = 1000;
@ -569,10 +568,6 @@ nsContentUtils::Init()
Preferences::AddBoolVarCache(&sPrivacyResistFingerprinting,
"privacy.resistFingerprinting", false);
Preferences::AddBoolVarCache(&sSWInterceptionEnabled,
"dom.serviceWorkers.interception.enabled",
false);
Preferences::AddUintVarCache(&sHandlingInputTimeout,
"dom.event.handling-user-input-time-limit",
1000);
@ -1754,8 +1749,7 @@ nsContentUtils::ParseLegacyFontSize(const nsAString& aValue)
bool
nsContentUtils::IsControlledByServiceWorker(nsIDocument* aDocument)
{
if (!ServiceWorkerInterceptionEnabled() ||
nsContentUtils::IsInPrivateBrowsing(aDocument)) {
if (nsContentUtils::IsInPrivateBrowsing(aDocument)) {
return false;
}

9
dom/base/nsContentUtils.h
View File

@ -1996,14 +1996,6 @@ public:
return sSendPerformanceTimingNotifications;
}
/*
* Returns true if ServiceWorker Interception is enabled by pref.
*/
static bool ServiceWorkerInterceptionEnabled()
{
return sSWInterceptionEnabled;
}
/*
* Returns true if the frame timing APIs are enabled.
*/
@ -2706,7 +2698,6 @@ private:
static bool sGettersDecodeURLHash;
static bool sPrivacyResistFingerprinting;
static bool sSendPerformanceTimingNotifications;
static bool sSWInterceptionEnabled;
static uint32_t sCookiesLifetimePolicy;
static uint32_t sCookiesBehavior;

1
dom/canvas/test/test_offscreencanvas_serviceworker.html
View File

@ -43,7 +43,6 @@ SpecialPowers.pushPrefEnv({'set': [
['gfx.offscreencanvas.enabled', true],
['webgl.force-enabled', true],
["dom.serviceWorkers.exemptFromPerDomainMax", true],
["dom.serviceWorkers.interception.enabled", true],
["dom.serviceWorkers.enabled", true],
["dom.serviceWorkers.testing.enabled", true]
]}, runTest);

1
dom/push/test/test_serviceworker_lifetime.html
View File

@ -326,7 +326,6 @@
["dom.serviceWorkers.exemptFromPerDomainMax", true],
["dom.serviceWorkers.enabled", true],
["dom.serviceWorkers.testing.enabled", true],
["dom.serviceWorkers.interception.enabled", true]
]}, runTest);
SpecialPowers.addPermission('desktop-notification', true, document);
SimpleTest.waitForExplicitFinish();

1
dom/security/test/csp/test_child-src_worker.html
View File

@ -135,7 +135,6 @@
onload = function() {
SpecialPowers.pushPrefEnv({"set": [
["dom.serviceWorkers.exemptFromPerDomainMax", true],
["dom.serviceWorkers.interception.enabled", true],
["dom.serviceWorkers.enabled", true],
["dom.serviceWorkers.testing.enabled", true],
["dom.caches.enabled", true]

1
dom/security/test/csp/test_service_worker.html
View File

@ -36,7 +36,6 @@ function receiveMessage(event) {
onload = function() {
SpecialPowers.pushPrefEnv({"set": [
["dom.serviceWorkers.exemptFromPerDomainMax", true],
["dom.serviceWorkers.interception.enabled", true],
["dom.serviceWorkers.enabled", true],
["dom.serviceWorkers.testing.enabled", true],
["dom.caches.enabled", true]

1
dom/webidl/ServiceWorkerGlobalScope.webidl
View File

@ -22,7 +22,6 @@ interface ServiceWorkerGlobalScope : WorkerGlobalScope {
attribute EventHandler oninstall;
attribute EventHandler onactivate;
[Func="mozilla::dom::workers::ServiceWorkerGlobalScope::InterceptionEnabled"]
attribute EventHandler onfetch;
// The event.source of these MessageEvents are instances of Client

1
dom/workers/WorkerPrefs.h
View File

@ -31,7 +31,6 @@ WORKER_SIMPLE_PREF("dom.webnotifications.enabled", DOMWorkerNotificationEnabled,
WORKER_SIMPLE_PREF("dom.webnotifications.serviceworker.enabled", DOMServiceWorkerNotificationEnabled, DOM_SERVICEWORKERNOTIFICATION)
WORKER_SIMPLE_PREF("dom.serviceWorkers.enabled", ServiceWorkersEnabled, SERVICEWORKERS_ENABLED)
WORKER_SIMPLE_PREF("dom.serviceWorkers.testing.enabled", ServiceWorkersTestingEnabled, SERVICEWORKERS_TESTING_ENABLED)
WORKER_SIMPLE_PREF("dom.serviceWorkers.interception.enabled", InterceptionEnabled, INTERCEPTION_ENABLED)
WORKER_SIMPLE_PREF("dom.serviceWorkers.interception.opaque.enabled", OpaqueInterceptionEnabled, INTERCEPTION_OPAQUE_ENABLED)
WORKER_SIMPLE_PREF("dom.serviceWorkers.openWindow.enabled", OpenWindowEnabled, OPEN_WINDOW_ENABLED)
WORKER_SIMPLE_PREF("dom.push.enabled", PushEnabled, PUSH_ENABLED)

10
dom/workers/WorkerScope.cpp
View File

@ -633,16 +633,6 @@ ServiceWorkerGlobalScope::SkipWaiting(ErrorResult& aRv)
return promise.forget();
}
// static
bool
ServiceWorkerGlobalScope::InterceptionEnabled(JSContext* aCx, JSObject* aObj)
{
WorkerPrivate* worker = GetCurrentThreadWorkerPrivate();
MOZ_ASSERT(worker);
worker->AssertIsOnWorkerThread();
return worker->InterceptionEnabled();
}
bool
ServiceWorkerGlobalScope::OpenWindowEnabled(JSContext* aCx, JSObject* aObj)
{

3
dom/workers/WorkerScope.h
View File

@ -239,9 +239,6 @@ public:
WrapGlobalObject(JSContext* aCx,
JS::MutableHandle<JSObject*> aReflector) override;
static bool
InterceptionEnabled(JSContext* aCx, JSObject* aObj);
static bool
OpenWindowEnabled(JSContext* aCx, JSObject* aObj);

3
dom/workers/test/serviceworkers/browser_download.js
View File

@ -45,8 +45,7 @@ function test() {
SpecialPowers.pushPrefEnv({'set': [['dom.serviceWorkers.enabled', true],
['dom.serviceWorkers.exemptFromPerDomainMax', true],
['dom.serviceWorkers.testing.enabled', true],
['dom.serviceWorkers.interception.enabled', true]]},
['dom.serviceWorkers.testing.enabled', true]]},
function() {
var url = gTestRoot + 'download/window.html';
var tab = gBrowser.addTab();

1
dom/workers/test/serviceworkers/browser_force_refresh.js
View File

@ -29,7 +29,6 @@ function test() {
SpecialPowers.pushPrefEnv({'set': [['dom.serviceWorkers.enabled', true],
['dom.serviceWorkers.exemptFromPerDomainMax', true],
['dom.serviceWorkers.testing.enabled', true],
['dom.serviceWorkers.interception.enabled', true],
['dom.caches.enabled', true],
['browser.cache.disk.enable', false],
['browser.cache.memory.enable', false]]},

4
dom/workers/test/serviceworkers/interception_featuredetect.js
View File

@ -1,4 +0,0 @@
// Only succeeds if onfetch is available.
if (!("onfetch" in self)) {
throw new Error("Not capable of interception");
}

3
dom/workers/test/serviceworkers/mochitest.ini
View File

@ -171,7 +171,6 @@ support-files =
strict_mode_warning.js
skip_waiting_installed_worker.js
skip_waiting_scope/index.html
interception_featuredetect.js
thirdparty/iframe1.html
thirdparty/iframe2.html
thirdparty/register.html
@ -239,8 +238,6 @@ skip-if = e10s && debug && os == 'win'
skip-if = e10s && debug && os == 'win'
[test_installation_simple.html]
skip-if = e10s && debug && os == 'win'
[test_interception_featuredetect.html]
skip-if = e10s && debug && os == 'win'
[test_match_all.html]
skip-if = e10s && debug && os == 'win'
[test_match_all_advanced.html]

1
dom/workers/test/serviceworkers/test_bug1151916.html
View File

@ -94,7 +94,6 @@
SimpleTest.waitForExplicitFinish();
SpecialPowers.pushPrefEnv({"set": [
["dom.serviceWorkers.exemptFromPerDomainMax", true],
["dom.serviceWorkers.interception.enabled", true],
["dom.serviceWorkers.enabled", true],
["dom.serviceWorkers.testing.enabled", true],
["dom.caches.enabled", true],

1
dom/workers/test/serviceworkers/test_claim.html
View File

@ -162,7 +162,6 @@
SimpleTest.waitForExplicitFinish();
SpecialPowers.pushPrefEnv({"set": [
["dom.serviceWorkers.exemptFromPerDomainMax", true],
["dom.serviceWorkers.interception.enabled", true],
["dom.serviceWorkers.enabled", true],
["dom.serviceWorkers.testing.enabled", true]
]}, runTest);

1
dom/workers/test/serviceworkers/test_claim_fetch.html
View File

@ -88,7 +88,6 @@
SimpleTest.waitForExplicitFinish();
SpecialPowers.pushPrefEnv({"set": [
["dom.serviceWorkers.exemptFromPerDomainMax", true],
["dom.serviceWorkers.interception.enabled", true],
["dom.serviceWorkers.enabled", true],
["dom.serviceWorkers.testing.enabled", true]
]}, runTest);

1
dom/workers/test/serviceworkers/test_claim_oninstall.html
View File

@ -68,7 +68,6 @@
SimpleTest.waitForExplicitFinish();
SpecialPowers.pushPrefEnv({"set": [
["dom.serviceWorkers.exemptFromPerDomainMax", true],
["dom.serviceWorkers.interception.enabled", true],
["dom.serviceWorkers.enabled", true],
["dom.serviceWorkers.testing.enabled", true]
]}, runTest);

1
dom/workers/test/serviceworkers/test_client_focus.html
View File

@ -86,7 +86,6 @@
SimpleTest.waitForExplicitFinish();
SpecialPowers.pushPrefEnv({"set": [
["dom.serviceWorkers.exemptFromPerDomainMax", true],
["dom.serviceWorkers.interception.enabled", true],
["dom.serviceWorkers.enabled", true],
["dom.serviceWorkers.testing.enabled", true],
]}, runTest);

1
dom/workers/test/serviceworkers/test_close.html
View File

@ -54,7 +54,6 @@
onload = function() {
SpecialPowers.pushPrefEnv({"set": [
["dom.serviceWorkers.exemptFromPerDomainMax", true],
["dom.serviceWorkers.interception.enabled", true],
["dom.serviceWorkers.enabled", true],
["dom.serviceWorkers.testing.enabled", true],
]}, runTest);

1
dom/workers/test/serviceworkers/test_controller.html
View File

@ -74,7 +74,6 @@
SimpleTest.waitForExplicitFinish();
SpecialPowers.pushPrefEnv({"set": [
["dom.serviceWorkers.exemptFromPerDomainMax", true],
["dom.serviceWorkers.interception.enabled", true],
["dom.serviceWorkers.enabled", true],
["dom.serviceWorkers.testing.enabled", true]
]}, runTest);

1
dom/workers/test/serviceworkers/test_cross_origin_url_after_redirect.html
View File

@ -40,7 +40,6 @@
onload = function() {
SpecialPowers.pushPrefEnv({"set": [
["dom.serviceWorkers.exemptFromPerDomainMax", true],
["dom.serviceWorkers.interception.enabled", true],
["dom.serviceWorkers.enabled", true],
["dom.serviceWorkers.testing.enabled", true],
]}, runTest);

1
dom/workers/test/serviceworkers/test_csp_upgrade-insecure_intercept.html
View File

@ -44,7 +44,6 @@
["dom.serviceWorkers.exemptFromPerDomainMax", true],
["dom.serviceWorkers.enabled", true],
["dom.serviceWorkers.testing.enabled", true],
["dom.serviceWorkers.interception.enabled", true],
// This is needed so that we can test upgrading a non-secure load inside an https iframe.
["security.mixed_content.block_active_content", false],
["security.mixed_content.block_display_content", false],

1
dom/workers/test/serviceworkers/test_empty_serviceworker.html
View File

@ -36,7 +36,6 @@
onload = function() {
SpecialPowers.pushPrefEnv({"set": [
["dom.serviceWorkers.exemptFromPerDomainMax", true],
["dom.serviceWorkers.interception.enabled", true],
["dom.serviceWorkers.enabled", true],
["dom.serviceWorkers.testing.enabled", true]
]}, runTest);

1
dom/workers/test/serviceworkers/test_eval_allowed.html
View File

@ -44,7 +44,6 @@
["dom.serviceWorkers.exemptFromPerDomainMax", true],
["dom.serviceWorkers.enabled", true],
["dom.serviceWorkers.testing.enabled", true],
['dom.serviceWorkers.interception.enabled', true],
]}, runTest);
</script>
</pre>

1
dom/workers/test/serviceworkers/test_eventsource_intercept.html
View File

@ -95,7 +95,6 @@
["dom.serviceWorkers.exemptFromPerDomainMax", true],
["dom.serviceWorkers.enabled", true],
["dom.serviceWorkers.testing.enabled", true],
["dom.serviceWorkers.interception.enabled", true],
["dom.serviceWorkers.interception.opaque.enabled", true],
["dom.caches.enabled", true],
]}, runTest);

1
dom/workers/test/serviceworkers/test_fetch_event.html
View File

@ -73,7 +73,6 @@
SimpleTest.waitForExplicitFinish();
SpecialPowers.pushPrefEnv({"set": [
["dom.serviceWorkers.exemptFromPerDomainMax", true],
["dom.serviceWorkers.interception.enabled", true],
["dom.serviceWorkers.interception.opaque.enabled", true],
["dom.serviceWorkers.enabled", true],
["dom.serviceWorkers.testing.enabled", true],

1
dom/workers/test/serviceworkers/test_file_blob_upload.html
View File

@ -135,7 +135,6 @@
SimpleTest.waitForExplicitFinish();
SpecialPowers.pushPrefEnv({"set": [
["dom.serviceWorkers.exemptFromPerDomainMax", true],
["dom.serviceWorkers.interception.enabled", true],
["dom.serviceWorkers.enabled", true],
["dom.serviceWorkers.testing.enabled", true]
]}, runTest);

1
dom/workers/test/serviceworkers/test_force_refresh.html
View File

@ -74,7 +74,6 @@
SimpleTest.waitForExplicitFinish();
SpecialPowers.pushPrefEnv({"set": [
["dom.serviceWorkers.exemptFromPerDomainMax", true],
["dom.serviceWorkers.interception.enabled", true],
["dom.serviceWorkers.enabled", true],
["dom.serviceWorkers.testing.enabled", true],
["dom.caches.enabled", true],

1
dom/workers/test/serviceworkers/test_gzip_redirect.html
View File

@ -77,7 +77,6 @@
["dom.serviceWorkers.exemptFromPerDomainMax", true],
["dom.serviceWorkers.enabled", true],
["dom.serviceWorkers.testing.enabled", true],
['dom.serviceWorkers.interception.enabled', true],
]}, runTest);
</script>
</pre>

1
dom/workers/test/serviceworkers/test_hsts_upgrade_intercept.html
View File

@ -54,7 +54,6 @@
["dom.serviceWorkers.exemptFromPerDomainMax", true],
["dom.serviceWorkers.enabled", true],
["dom.serviceWorkers.testing.enabled", true],
["dom.serviceWorkers.interception.enabled", true],
// This is needed so that we can test upgrading a non-secure load inside an https iframe.
["security.mixed_content.block_active_content", false],
["security.mixed_content.block_display_content", false],

1
dom/workers/test/serviceworkers/test_https_fetch.html
View File

@ -51,7 +51,6 @@
onload = function() {
SpecialPowers.pushPrefEnv({"set": [
["dom.serviceWorkers.exemptFromPerDomainMax", true],
["dom.serviceWorkers.interception.enabled", true],
["dom.serviceWorkers.enabled", true],
["dom.serviceWorkers.testing.enabled", true],
["dom.caches.enabled", true]

1
dom/workers/test/serviceworkers/test_https_fetch_cloned_response.html
View File

@ -45,7 +45,6 @@
onload = function() {
SpecialPowers.pushPrefEnv({"set": [
["dom.serviceWorkers.exemptFromPerDomainMax", true],
["dom.serviceWorkers.interception.enabled", true],
["dom.serviceWorkers.enabled", true],
["dom.serviceWorkers.testing.enabled", true],
["dom.caches.enabled", true]

1
dom/workers/test/serviceworkers/test_https_origin_after_redirect.html
View File

@ -48,7 +48,6 @@
["dom.serviceWorkers.exemptFromPerDomainMax", true],
["dom.serviceWorkers.enabled", true],
["dom.serviceWorkers.testing.enabled", true],
['dom.serviceWorkers.interception.enabled', true],
["dom.caches.enabled", true],
]}, runTest);
};

1
dom/workers/test/serviceworkers/test_https_origin_after_redirect_cached.html
View File

@ -48,7 +48,6 @@
["dom.serviceWorkers.exemptFromPerDomainMax", true],
["dom.serviceWorkers.enabled", true],
["dom.serviceWorkers.testing.enabled", true],
['dom.serviceWorkers.interception.enabled', true],
["dom.caches.enabled", true],
]}, runTest);
};

1
dom/workers/test/serviceworkers/test_https_synth_fetch_from_cached_sw.html
View File

@ -58,7 +58,6 @@
onload = function() {
SpecialPowers.pushPrefEnv({"set": [
["dom.serviceWorkers.exemptFromPerDomainMax", true],
["dom.serviceWorkers.interception.enabled", true],
["dom.serviceWorkers.enabled", true],
["dom.serviceWorkers.testing.enabled", true],
["dom.caches.enabled", true]

1
dom/workers/test/serviceworkers/test_imagecache.html
View File

@ -45,7 +45,6 @@
onload = function() {
SpecialPowers.pushPrefEnv({"set": [
["dom.serviceWorkers.exemptFromPerDomainMax", true],
["dom.serviceWorkers.interception.enabled", true],
["dom.serviceWorkers.enabled", true],
["dom.serviceWorkers.testing.enabled", true],
]}, runTest);

1
dom/workers/test/serviceworkers/test_imagecache_max_age.html
View File

@ -63,7 +63,6 @@
["dom.serviceWorkers.exemptFromPerDomainMax", true],
["dom.serviceWorkers.enabled", true],
["dom.serviceWorkers.testing.enabled", true],
["dom.serviceWorkers.interception.enabled", true],
]}, runTest);
};
</script>

1
dom/workers/test/serviceworkers/test_importscript.html
View File

@ -63,7 +63,6 @@
SimpleTest.waitForExplicitFinish();
SpecialPowers.pushPrefEnv({"set": [
["dom.serviceWorkers.exemptFromPerDomainMax", true],
["dom.serviceWorkers.interception.enabled", true],
["dom.serviceWorkers.enabled", true],
["dom.serviceWorkers.testing.enabled", true]
]}, runTest);

1
dom/workers/test/serviceworkers/test_importscript_mixedcontent.html
View File

@ -42,7 +42,6 @@
onload = function() {
SpecialPowers.pushPrefEnv({"set": [
["dom.serviceWorkers.exemptFromPerDomainMax", true],
["dom.serviceWorkers.interception.enabled", true],
["dom.serviceWorkers.enabled", true],
["dom.serviceWorkers.testing.enabled", true],
["security.mixed_content.block_active_content", false],

1
dom/workers/test/serviceworkers/test_install_event.html
View File

@ -134,7 +134,6 @@
SimpleTest.waitForExplicitFinish();
SpecialPowers.pushPrefEnv({"set": [
["dom.serviceWorkers.exemptFromPerDomainMax", true],
["dom.serviceWorkers.interception.enabled", true],
["dom.serviceWorkers.enabled", true],
["dom.serviceWorkers.testing.enabled", true]
]}, runTest);

1
dom/workers/test/serviceworkers/test_installation_simple.html
View File

@ -201,7 +201,6 @@
SimpleTest.waitForExplicitFinish();
SpecialPowers.pushPrefEnv({"set": [
["dom.serviceWorkers.exemptFromPerDomainMax", true],
["dom.serviceWorkers.interception.enabled", true],
["dom.serviceWorkers.enabled", true],
["dom.serviceWorkers.testing.enabled", true],
["dom.caches.testing.enabled", true],

96
dom/workers/test/serviceworkers/test_interception_featuredetect.html
View File

@ -1,96 +0,0 @@
<!--
Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/
-->
<!DOCTYPE HTML>
<html>
<head>
<title>Bug 1173389 - Test fetch interception feature detection.</title>
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
</head>
<body>
<p id="display"></p>
<div id="content" style="display: none"></div>
<pre id="test"></pre>
<script class="testbody" type="text/javascript">
function register() {
// Randomness required to prevent reusing existing registration.
return navigator.serviceWorker.register("interception_featuredetect.js",
{ scope: "featuredetect/" + Math.random() });
}
function registerWithPrefDisabled() {
return new Promise(function(resolve, reject) {
SpecialPowers.pushPrefEnv(
{"set": [["dom.serviceWorkers.interception.enabled", false]]},
function() {
register().then(function(v) {
ok(false, "Registration should fail when interception is disabled.");
reject();
}, function(e) {
ok(true, "Registration should fail when interception is disabled.");
resolve();
});
});
});
}
function registerWithPrefEnabled() {
return new Promise(function(resolve, reject) {
SpecialPowers.pushPrefEnv(
{"set": [["dom.serviceWorkers.interception.enabled", true]]},
function() {
register().then(function(v) {
ok(true, "Registration should succeed when interception is enabled.");
resolve();
}, function(e) {
ok(false, "Registration should succeed when interception is enabled.");
reject()
});
});
});
}
function unregister() {
return navigator.serviceWorker.getRegistrations().then(function(regs) {
var unregs = [];
regs.forEach(function(reg) {
if (reg.scope.indexOf("featuredetect") > -1) {
unregs.push(reg.unregister());
}
})
return Promise.all(unregs);
});
}
function runTest() {
Promise.resolve()
.then(registerWithPrefDisabled)
.then(registerWithPrefEnabled)
.then(registerWithPrefDisabled)
.then(unregister)
// put more tests here.
.then(function() {
SimpleTest.finish();
}).catch(function(e) {
ok(false, "Some test failed with error " + e);
SimpleTest.finish();
});
}
SimpleTest.waitForExplicitFinish();
SpecialPowers.pushPrefEnv({"set": [
["dom.serviceWorkers.exemptFromPerDomainMax", true],
["dom.serviceWorkers.interception.enabled", false],
["dom.serviceWorkers.enabled", true],
["dom.serviceWorkers.testing.enabled", true]
]}, runTest);
</script>
</pre>
</body>
</html>

1
dom/workers/test/serviceworkers/test_match_all.html
View File

@ -70,7 +70,6 @@
SimpleTest.waitForExplicitFinish();
SpecialPowers.pushPrefEnv({"set": [
["dom.serviceWorkers.exemptFromPerDomainMax", true],
["dom.serviceWorkers.interception.enabled", true],
["dom.serviceWorkers.enabled", true],
["dom.serviceWorkers.testing.enabled", true]
]}, runTest);

1
dom/workers/test/serviceworkers/test_match_all_advanced.html
View File

@ -90,7 +90,6 @@
SimpleTest.waitForExplicitFinish();
SpecialPowers.pushPrefEnv({"set": [
["dom.serviceWorkers.exemptFromPerDomainMax", true],
["dom.serviceWorkers.interception.enabled", true],
["dom.serviceWorkers.enabled", true],
["dom.serviceWorkers.testing.enabled", true]
]}, runTest);

1
dom/workers/test/serviceworkers/test_match_all_client_id.html
View File

@ -81,7 +81,6 @@
SimpleTest.waitForExplicitFinish();
SpecialPowers.pushPrefEnv({"set": [
["dom.serviceWorkers.exemptFromPerDomainMax", true],
["dom.serviceWorkers.interception.enabled", true],
["dom.serviceWorkers.enabled", true],
["dom.serviceWorkers.testing.enabled", true]
]}, runTest);

1
dom/workers/test/serviceworkers/test_match_all_client_properties.html
View File

@ -88,7 +88,6 @@
SimpleTest.waitForExplicitFinish();
SpecialPowers.pushPrefEnv({"set": [
["dom.serviceWorkers.exemptFromPerDomainMax", true],
["dom.serviceWorkers.interception.enabled", true],
["dom.serviceWorkers.enabled", true],
["dom.serviceWorkers.testing.enabled", true]
]}, runTest);

1
dom/workers/test/serviceworkers/test_navigator.html
View File

@ -28,7 +28,6 @@
SpecialPowers.pushPrefEnv({"set": [
["dom.serviceWorkers.exemptFromPerDomainMax", true],
["dom.serviceWorkers.interception.enabled", true],
["dom.serviceWorkers.enabled", true]
]}, function() {
checkEnabled();

1
dom/workers/test/serviceworkers/test_not_intercept_plugin.html
View File

@ -68,7 +68,6 @@
SpecialPowers.pushPrefEnv({"set": [
["dom.requestcontext.enabled", true],
["dom.serviceWorkers.exemptFromPerDomainMax", true],
["dom.serviceWorkers.interception.enabled", true],
["dom.serviceWorkers.interception.opaque.enabled", true],
["dom.serviceWorkers.enabled", true],
["dom.serviceWorkers.testing.enabled", true],

1
dom/workers/test/serviceworkers/test_notificationclick.html
View File

@ -55,7 +55,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=916893
["dom.serviceWorkers.testing.enabled", true],
["dom.webnotifications.workers.enabled", true],
["dom.webnotifications.serviceworker.enabled", true],
['dom.serviceWorkers.interception.enabled', true],
["notification.prompt.testing", true],
]}, runTest);
</script>

1
dom/workers/test/serviceworkers/test_opaque_intercept.html
View File

@ -77,7 +77,6 @@
["dom.serviceWorkers.exemptFromPerDomainMax", true],
["dom.serviceWorkers.enabled", true],
["dom.serviceWorkers.testing.enabled", true],
['dom.serviceWorkers.interception.enabled', true],
["dom.serviceWorkers.interception.opaque.enabled", true],
["dom.caches.enabled", true],
]}, runTest);

1
dom/workers/test/serviceworkers/test_origin_after_redirect.html
View File

@ -48,7 +48,6 @@
["dom.serviceWorkers.exemptFromPerDomainMax", true],
["dom.serviceWorkers.enabled", true],
["dom.serviceWorkers.testing.enabled", true],
['dom.serviceWorkers.interception.enabled', true],
["dom.caches.enabled", true],
]}, runTest);
};

1
dom/workers/test/serviceworkers/test_origin_after_redirect_cached.html
View File

@ -48,7 +48,6 @@
["dom.serviceWorkers.exemptFromPerDomainMax", true],
["dom.serviceWorkers.enabled", true],
["dom.serviceWorkers.testing.enabled", true],
['dom.serviceWorkers.interception.enabled', true],
["dom.caches.enabled", true],
]}, runTest);
};

1
dom/workers/test/serviceworkers/test_origin_after_redirect_to_https.html
View File

@ -48,7 +48,6 @@
["dom.serviceWorkers.exemptFromPerDomainMax", true],
["dom.serviceWorkers.enabled", true],
["dom.serviceWorkers.testing.enabled", true],
['dom.serviceWorkers.interception.enabled', true],
["dom.caches.enabled", true],
]}, runTest);
};

1
dom/workers/test/serviceworkers/test_origin_after_redirect_to_https_cached.html
View File

@ -48,7 +48,6 @@
["dom.serviceWorkers.exemptFromPerDomainMax", true],
["dom.serviceWorkers.enabled", true],
["dom.serviceWorkers.testing.enabled", true],
['dom.serviceWorkers.interception.enabled', true],
["dom.caches.enabled", true],
]}, runTest);
};

1
dom/workers/test/serviceworkers/test_post_message.html
View File

@ -69,7 +69,6 @@
SimpleTest.waitForExplicitFinish();
SpecialPowers.pushPrefEnv({"set": [
["dom.serviceWorkers.exemptFromPerDomainMax", true],
["dom.serviceWorkers.interception.enabled", true],
["dom.serviceWorkers.enabled", true],
["dom.serviceWorkers.testing.enabled", true]
]}, runTest);

1
dom/workers/test/serviceworkers/test_post_message_advanced.html
View File

@ -98,7 +98,6 @@
SimpleTest.waitForExplicitFinish();
SpecialPowers.pushPrefEnv({"set": [
["dom.serviceWorkers.exemptFromPerDomainMax", true],
["dom.serviceWorkers.interception.enabled", true],
["dom.serviceWorkers.enabled", true],
["dom.serviceWorkers.testing.enabled", true]
]}, runTest);

1
dom/workers/test/serviceworkers/test_post_message_source.html
View File

@ -57,7 +57,6 @@
SimpleTest.waitForExplicitFinish();
SpecialPowers.pushPrefEnv({"set": [
["dom.serviceWorkers.exemptFromPerDomainMax", true],
["dom.serviceWorkers.interception.enabled", true],
["dom.serviceWorkers.enabled", true],
["dom.serviceWorkers.testing.enabled", true]
]}, runTest);

1
dom/workers/test/serviceworkers/test_request_context.js
View File

@ -70,7 +70,6 @@ onload = function() {
["dom.image.srcset.enabled", true],
["dom.requestcontext.enabled", true],
["dom.serviceWorkers.exemptFromPerDomainMax", true],
["dom.serviceWorkers.interception.enabled", true],
["dom.serviceWorkers.enabled", true],
["dom.serviceWorkers.testing.enabled", true],
]}, runTest);

1
dom/workers/test/serviceworkers/test_sandbox_intercept.html
View File

@ -40,7 +40,6 @@
onload = function() {
SpecialPowers.pushPrefEnv({"set": [
["dom.serviceWorkers.exemptFromPerDomainMax", true],
["dom.serviceWorkers.interception.enabled", true],
["dom.serviceWorkers.enabled", true],
["dom.serviceWorkers.testing.enabled", true],
]}, runTest);

1
dom/workers/test/serviceworkers/test_sanitize.html
View File

@ -75,7 +75,6 @@
SpecialPowers.pushPrefEnv({"set": [
["dom.serviceWorkers.exemptFromPerDomainMax", true],
["dom.serviceWorkers.interception.enabled", true],
["dom.serviceWorkers.enabled", true],
["dom.serviceWorkers.testing.enabled", true],
]}, function() {

1
dom/workers/test/serviceworkers/test_sanitize_domain.html
View File

@ -78,7 +78,6 @@
SpecialPowers.pushPrefEnv({"set": [
["dom.serviceWorkers.exemptFromPerDomainMax", true],
["dom.serviceWorkers.interception.enabled", true],
["dom.serviceWorkers.enabled", true],
["dom.serviceWorkers.testing.enabled", true],
]}, function() {

1
dom/workers/test/serviceworkers/test_scopes.html
View File

@ -111,7 +111,6 @@
SimpleTest.waitForExplicitFinish();
SpecialPowers.pushPrefEnv({"set": [
["dom.serviceWorkers.exemptFromPerDomainMax", true],
["dom.serviceWorkers.interception.enabled", true],
["dom.serviceWorkers.enabled", true],
["dom.serviceWorkers.testing.enabled", true]
]}, runTest);

1
dom/workers/test/serviceworkers/test_service_worker_allowed.html
View File

@ -67,7 +67,6 @@
["dom.serviceWorkers.enabled", true],
["dom.serviceWorkers.testing.enabled", true],
["dom.serviceWorkers.exemptFromPerDomainMax", true],
["dom.serviceWorkers.interception.enabled", true],
]}, runTest);
</script>
</pre>

1
dom/workers/test/serviceworkers/test_serviceworker_interfaces.html
View File

@ -104,7 +104,6 @@
// force creation of our own Navigator object before our prefs are set.
var prefs = [
["dom.serviceWorkers.exemptFromPerDomainMax", true],
["dom.serviceWorkers.interception.enabled", true],
["dom.serviceWorkers.enabled", true],
["dom.serviceWorkers.testing.enabled", true],
];

1
dom/workers/test/serviceworkers/test_serviceworker_not_sharedworker.html
View File

@ -56,7 +56,6 @@
onload = function() {
SpecialPowers.pushPrefEnv({"set": [
["dom.serviceWorkers.exemptFromPerDomainMax", true],
["dom.serviceWorkers.interception.enabled", true],
["dom.serviceWorkers.enabled", true],
["dom.serviceWorkers.testing.enabled", true]
]}, runTest);

1
dom/workers/test/serviceworkers/test_skip_waiting.html
View File

@ -86,7 +86,6 @@
SimpleTest.waitForExplicitFinish();
SpecialPowers.pushPrefEnv({"set": [
["dom.serviceWorkers.exemptFromPerDomainMax", true],
["dom.serviceWorkers.interception.enabled", true],
["dom.serviceWorkers.enabled", true],
["dom.serviceWorkers.testing.enabled", true]
]}, runTest);

1
dom/workers/test/serviceworkers/test_strict_mode_warning.html
View File

@ -32,7 +32,6 @@
onload = function() {
SpecialPowers.pushPrefEnv({"set": [
["dom.serviceWorkers.exemptFromPerDomainMax", true],
["dom.serviceWorkers.interception.enabled", true],
["dom.serviceWorkers.enabled", true],
["dom.serviceWorkers.testing.enabled", true],
]}, runTest);

1
dom/workers/test/serviceworkers/test_third_party_iframes.html
View File

@ -144,7 +144,6 @@ let steps = [() => {
["dom.serviceWorkers.exemptFromPerDomainMax", true],
["dom.serviceWorkers.enabled", true],
["dom.serviceWorkers.testing.enabled", true],
["dom.serviceWorkers.interception.enabled", true],
["browser.dom.window.dump.enabled", true],
["network.cookie.cookieBehavior", COOKIE_BEHAVIOR_ACCEPT]
]}, next);

1
dom/workers/test/serviceworkers/test_unregister.html
View File

@ -128,7 +128,6 @@
SimpleTest.waitForExplicitFinish();
SpecialPowers.pushPrefEnv({"set": [
["dom.serviceWorkers.exemptFromPerDomainMax", true],
["dom.serviceWorkers.interception.enabled", true],
["dom.serviceWorkers.enabled", true],
["dom.serviceWorkers.testing.enabled", true]
]}, runTest);

1
dom/workers/test/serviceworkers/test_unresolved_fetch_interception.html
View File

@ -87,7 +87,6 @@
["dom.serviceWorkers.exemptFromPerDomainMax", true],
["dom.serviceWorkers.enabled", true],
["dom.serviceWorkers.testing.enabled", true],
["dom.serviceWorkers.interception.enabled", true]
]}, runTest);
SimpleTest.waitForExplicitFinish();
</script>

1
dom/workers/test/serviceworkers/test_workerUnregister.html
View File

@ -72,7 +72,6 @@
SimpleTest.waitForExplicitFinish();
SpecialPowers.pushPrefEnv({"set": [
["dom.serviceWorkers.exemptFromPerDomainMax", true],
["dom.serviceWorkers.interception.enabled", true],
["dom.serviceWorkers.enabled", true],
["dom.serviceWorkers.testing.enabled", true]
]}, runTest);

1
dom/workers/test/serviceworkers/test_workerUpdate.html
View File

@ -52,7 +52,6 @@
SimpleTest.waitForExplicitFinish();
SpecialPowers.pushPrefEnv({"set": [
["dom.serviceWorkers.exemptFromPerDomainMax", true],
["dom.serviceWorkers.interception.enabled", true],
["dom.serviceWorkers.enabled", true],
["dom.serviceWorkers.testing.enabled", true]
]}, runTest);

1
dom/workers/test/serviceworkers/test_workerupdatefoundevent.html
View File

@ -75,7 +75,6 @@
SimpleTest.waitForExplicitFinish();
SpecialPowers.pushPrefEnv({"set": [
["dom.serviceWorkers.exemptFromPerDomainMax", true],
["dom.serviceWorkers.interception.enabled", true],
["dom.serviceWorkers.enabled", true],
["dom.serviceWorkers.testing.enabled", true],
]}, runTest);

1
dom/workers/test/serviceworkers/test_xslt.html
View File

@ -118,7 +118,6 @@
SimpleTest.waitForExplicitFinish();
SpecialPowers.pushPrefEnv({"set": [
["dom.serviceWorkers.exemptFromPerDomainMax", true],
["dom.serviceWorkers.interception.enabled", true],
["dom.serviceWorkers.enabled", true],
["dom.serviceWorkers.testing.enabled", true],
]}, runTest);

1
mobile/android/app/mobile.js
View File

@ -980,7 +980,6 @@ pref("dom.vr.enabled", true);
pref("browser.tabs.showAudioPlayingIcon", true);
pref("dom.serviceWorkers.enabled", true);
pref("dom.serviceWorkers.interception.enabled", true);
// The remote content URL where FxAccountsWebChannel messages originate. Must use HTTPS.
pref("identity.fxaccounts.remote.webchannel.uri", "https://accounts.firefox.com");

3
modules/libpref/init/all.js
View File

@ -143,9 +143,6 @@ pref("dom.workers.maxPerDomain", 50);
pref("dom.serviceWorkers.enabled", false);
// Allow service workers to intercept network requests using the fetch event
pref("dom.serviceWorkers.interception.enabled", false);
// Allow service workers to intercept opaque (cross origin) responses
pref("dom.serviceWorkers.interception.opaque.enabled", true);

13
netwerk/protocol/http/nsHttpChannel.cpp
View File

@ -7218,14 +7218,11 @@ nsHttpChannel::MaybeWarnAboutAppCache()
Telemetry::Accumulate(Telemetry::HTTP_OFFLINE_CACHE_DOCUMENT_LOAD,
true);
// Then, issue a deprecation warning if service worker interception is
// enabled.
if (nsContentUtils::ServiceWorkerInterceptionEnabled()) {
nsCOMPtr<nsIDeprecationWarner> warner;
GetCallback(warner);
if (warner) {
warner->IssueWarning(nsIDocument::eAppCache, false);
}
// Then, issue a deprecation warning.
nsCOMPtr<nsIDeprecationWarner> warner;
GetCallback(warner);
if (warner) {
warner->IssueWarning(nsIDocument::eAppCache, false);
}
}

1
testing/mochitest/tests/Harness_sanity/test_sanityRegisteredServiceWorker.html
View File

@ -10,7 +10,6 @@ SimpleTest.waitForExplicitFinish();
SimpleTest.expectRegisteredServiceWorker();
SpecialPowers.pushPrefEnv({"set": [
["dom.serviceWorkers.exemptFromPerDomainMax", true],
["dom.serviceWorkers.interception.enabled", true],
["dom.serviceWorkers.enabled", true],
["dom.serviceWorkers.testing.enabled", true]
]}, function() {

1
testing/mochitest/tests/Harness_sanity/test_sanityRegisteredServiceWorker2.html
View File

@ -9,7 +9,6 @@
SimpleTest.waitForExplicitFinish();
SpecialPowers.pushPrefEnv({"set": [
["dom.serviceWorkers.exemptFromPerDomainMax", true],
["dom.serviceWorkers.interception.enabled", true],
["dom.serviceWorkers.enabled", true],
["dom.serviceWorkers.testing.enabled", true]
]}, function() {

1
testing/web-platform/README.md
View File

@ -166,7 +166,6 @@ comma-seperate list of `pref.name:value` items to set e.g.
[filename.html]
prefs: [dom.serviceWorkers.enabled:true,
dom.serviceWorkers.interception.enabled:true,
dom.serviceWorkers.exemptFromPerDomainMax:true,
dom.caches.enabled:true]

2
testing/web-platform/meta/service-workers/cache-storage/serviceworker/__dir__.ini
View File

@ -1 +1 @@
prefs: [dom.serviceWorkers.enabled: true, dom.serviceWorkers.interception.enabled: true, dom.serviceWorkers.exemptFromPerDomainMax:true, dom.caches.enabled:true]
prefs: [dom.serviceWorkers.enabled: true, dom.serviceWorkers.exemptFromPerDomainMax:true, dom.caches.enabled:true]

1
testing/web-platform/mozilla/meta/service-workers/service-worker/ServiceWorkerGlobalScope/__dir__.ini
View File

@ -1,3 +1,2 @@
prefs: [dom.serviceWorkers.enabled: true,
dom.serviceWorkers.interception.enabled: true,
dom.serviceWorkers.interception.opaque.enabled: true]

1
testing/web-platform/mozilla/meta/service-workers/service-worker/__dir__.ini
View File

@ -1,3 +1,2 @@
prefs: [dom.serviceWorkers.enabled: true,
dom.serviceWorkers.interception.enabled: true,
dom.serviceWorkers.interception.opaque.enabled: true]