Skip to content

Commit 24c65ce

Browse files
marco-cmarco-c
committed
Bug 1570776 [wpt PR 17554] - Add ability for service worker to filter out frozen windows., a=testonly
Automatic update from web-platform-tests Add ability for service worker to filter out frozen windows. Add code to support handling of frozen clients. Frozen clients do not run their event loop, so postMessage to them just causes problems. To allow service workers to continue working with frozen windows we expose includeFrozen in the matchAll and the frozen attribute on the Client. If a service worker calls focus on a client it will unfreeze the window when it is moved to have focus. This feature is currently marked as experimental and an intent to ship will be sent. This is specified in https://wicg.github.io/page-lifecycle/ and w3c/ServiceWorker#1442 BUG=957597 Change-Id: I6abe1882e88c65dac99250db5bb7fa8d3a4b2b1d Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1677065 Commit-Queue: Ken Buchanan <kenrbchromium.org> Reviewed-by: Ken Buchanan <kenrbchromium.org> Reviewed-by: Matt Falkenhagen <falkenchromium.org> Cr-Commit-Position: refs/heads/master{#689558} -- wpt-commits: 3d052c54485970c1673500c1ba7d52182adf6f4f wpt-pr: 17554 UltraBlame original commit: d34dc9e00ee2c4ca00e2b78bdad1f7c51f68ba3e
1 parent b3d700a commit 24c65ce

File tree

3 files changed

+132
-5
lines changed

3 files changed

+132
-5
lines changed

‎testing/web-platform/tests/service-workers/service-worker/clients-matchall-frozen.https.html

+103
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,103 @@
1+
<!DOCTYPE html>
2+
<title>Service Worker: Clients.matchAll</title>
3+
<script src="/resources/testharness.js"></script>
4+
<script src="/resources/testharnessreport.js"></script>
5+
<script src="resources/test-helpers.sub.js"></script>
6+
<script>
7+
var scope = 'resources/clients-frame-freeze.html';
8+
var windows = [];
9+
var expected_window_1 =
10+
{visibilityState: 'visible', focused: false, lifecycleState: "frozen", url: new URL(scope + '#1', location).toString(), type: 'window', frameType: 'top-level'};
11+
var expected_window_2 =
12+
{visibilityState: 'visible', focused: false, lifecycleState: "active", url: new URL(scope + '#2', location).toString(), type: 'window', frameType: 'top-level'};
13+
function with_window(url, name) {
14+
return new Promise(function(resolve) {
15+
var child = window.open(url, name);
16+
window.onmessage = () => {resolve(child)};
17+
});
18+
}
19+
20+
promise_test(function(t) {
21+
return service_worker_unregister_and_register(
22+
t, 'resources/clients-matchall-worker.js', scope)
23+
.then(function(registration) {
24+
t.add_cleanup(function() {
25+
return service_worker_unregister(t, scope);
26+
});
27+
28+
return wait_for_state(t, registration.installing, 'activated');
29+
})
30+
.then(function() { return with_window(scope + '#1', 'Child 1'); })
31+
.then(function(window1) {
32+
windows.push(window1);
33+
return with_window(scope + '#2', 'Child 2');
34+
})
35+
.then(function(window2) {
36+
windows.push(window2);
37+
return new Promise(function(resolve) {
38+
window.onmessage = resolve;
39+
windows[0].postMessage('freeze');
40+
});
41+
})
42+
.then(function() {
43+
var channel = new MessageChannel();
44+
45+
return new Promise(function(resolve) {
46+
channel.port1.onmessage = resolve;
47+
windows[1].navigator.serviceWorker.controller.postMessage(
48+
{port:channel.port2, includeLifecycleState: true}, [channel.port2]);
49+
});
50+
})
51+
.then(function(e) {
52+
assert_equals(e.data.length, 1);
53+
assert_object_equals(e.data[0], expected_window_2);
54+
})
55+
.then(function() {
56+
var channel = new MessageChannel();
57+
58+
return new Promise(function(resolve) {
59+
channel.port1.onmessage = resolve;
60+
windows[1].navigator.serviceWorker.controller.postMessage(
61+
{port:channel.port2, options: {lifecycleState: "all"}, includeLifecycleState: true}, [channel.port2]);
62+
});
63+
})
64+
.then(function(e) {
65+
assert_equals(e.data.length, 2);
66+
// No specific order is required, so support inversion.
67+
if (e.data[0][3] == new URL(scope + '#2', location)) {
68+
assert_object_equals(e.data[0], expected_window_2);
69+
assert_object_equals(e.data[1], expected_window_1);
70+
} else {
71+
assert_object_equals(e.data[0], expected_window_1);
72+
assert_object_equals(e.data[1], expected_window_2);
73+
}
74+
})
75+
.then(function() {
76+
var channel = new MessageChannel();
77+
78+
return new Promise(function(resolve) {
79+
channel.port1.onmessage = resolve;
80+
windows[1].navigator.serviceWorker.controller.postMessage(
81+
{port:channel.port2, options: {lifecycleState: "frozen"}, includeLifecycleState: true}, [channel.port2]);
82+
});
83+
})
84+
.then(function(e) {
85+
assert_equals(e.data.length, 1);
86+
assert_object_equals(e.data[0], expected_window_1);
87+
})
88+
.then(function() {
89+
var channel = new MessageChannel();
90+
91+
return new Promise(function(resolve) {
92+
channel.port1.onmessage = resolve;
93+
windows[1].navigator.serviceWorker.controller.postMessage(
94+
{port:channel.port2, options: {lifecycleState: "active"}, includeLifecycleState: true}, [channel.port2]);
95+
});
96+
})
97+
.then(function(e) {
98+
assert_equals(e.data.length, 1);
99+
assert_object_equals(e.data[0], expected_window_2);
100+
});
101+
}, 'Test Clients.matchAll()');
102+
103+
</script>

‎testing/web-platform/tests/service-workers/service-worker/resources/clients-frame-freeze.html

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<!DOCTYPE html>
2+
<script src="/resources/testdriver.js"></script>
3+
<script src="/resources/testdriver-vendor.js"></script>
4+
<script>
5+
document.addEventListener('freeze', () => {
6+
opener.postMessage('frozen', "*");
7+
});
8+
9+
window.onmessage = (e) => {
10+
if (e.data == 'freeze') {
11+
test_driver.freeze();
12+
}
13+
};
14+
opener.postMessage('loaded', '*');
15+
</script>

‎testing/web-platform/tests/service-workers/service-worker/resources/clients-matchall-worker.js

+14-5
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,20 @@ self.onmessage = function(e) {
1313

1414
frame_type = 'top-level';
1515
}
16-
message.push([client.visibilityState,
17-
client.focused,
18-
client.url,
19-
client.type,
20-
frame_type]);
16+
if (e.data.includeLifecycleState) {
17+
message.push({visibilityState: client.visibilityState,
18+
focused: client.focused,
19+
url: client.url,
20+
lifecycleState: client.lifecycleState,
21+
type: client.type,
22+
frameType: frame_type});
23+
} else {
24+
message.push([client.visibilityState,
25+
client.focused,
26+
client.url,
27+
client.type,
28+
frame_type]);
29+
}
2130
});
2231

2332
if (!e.data.disableSort) {

0 commit comments

Comments
 (0)