Skip to content

Commit

Permalink
Reland "idle-detection: Implement requestPermission() method"
Browse files Browse the repository at this point in the history
This reverts commit b49f79c472eefc9c51973be205e07cb397f68589.

Reason for revert: https://crbug.com/1129639

Original change's description:
> Revert "idle-detection: Implement requestPermission() method"
>
> This reverts commit 67a8dbc31af629c51d6661c1b1d6da4218258ad8.
>
> Reason for revert: https://crbug.com/1129639
>
> Original change's description:
> > idle-detection: Implement requestPermission() method
> >
> > This change implements a static requestPermission() method on the
> > IdleDetector interface and switches the API from requiring the
> > "notifications" permission to the new "idle-detector" permission.
> >
> > Bug: 878979
> > Change-Id: If2162f6a1f770544aeb82f98fcc65a76059b7d13
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2359539
> > Auto-Submit: Reilly Grant <reillyg@chromium.org>
> > Reviewed-by: Arthur Sonzogni <arthursonzogni@chromium.org>
> > Reviewed-by: Ayu Ishii <ayui@chromium.org>
> > Commit-Queue: Reilly Grant <reillyg@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#808019}
>
> TBR=reillyg@chromium.org,arthursonzogni@chromium.org,ayui@chromium.org
>
> Change-Id: I41401a81e0e75613340ebe8aa5665c3d1a45414c
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: 878979
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2417473
> Reviewed-by: Shik Chen <shik@chromium.org>
> Commit-Queue: Shik Chen <shik@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#808208}

TBR=shik@chromium.org,reillyg@chromium.org,arthursonzogni@chromium.org,ayui@chromium.org

Bug: 878979
Change-Id: I4f409d8f37091f384883c22a39e08f7e45762aa9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2417779
Commit-Queue: Wei Lee <wtlee@chromium.org>
Reviewed-by: Wei Lee <wtlee@chromium.org>
Reviewed-by: Reilly Grant <reillyg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#808280}
  • Loading branch information
Wei Lee authored and chromium-wpt-export-bot committed Sep 18, 2020
1 parent bbe83f8 commit 47ef3f3
Show file tree
Hide file tree
Showing 10 changed files with 33 additions and 22 deletions.
2 changes: 1 addition & 1 deletion idle-detection/basics.tentative.https.window.js
Expand Up @@ -5,7 +5,7 @@
'use strict';

promise_setup(async t => {
await test_driver.set_permission({ name: 'notifications' }, 'granted', false);
await test_driver.set_permission({name: 'idle-detection'}, 'granted', false);
})

promise_test(async t => {
Expand Down
Expand Up @@ -21,7 +21,7 @@
relative_worker_frame_path;

promise_setup(async () => {
await test_driver.set_permission({ name: 'notifications' }, 'granted', false);
await test_driver.set_permission({ name: 'idle-detection' }, 'granted', false);
});

promise_test(async t => {
Expand Down
Expand Up @@ -17,7 +17,7 @@
const cross_origin_worker_frame_src = sub + same_origin_worker_frame_src;

promise_setup(async () => {
await test_driver.set_permission({ name: 'notifications' }, 'granted', false);
await test_driver.set_permission({ name: 'idle-detection' }, 'granted', false);
});

promise_test(async t => {
Expand Down
Expand Up @@ -17,7 +17,7 @@
const cross_origin_worker_frame_src = sub + same_origin_worker_frame_src;

promise_setup(async () => {
await test_driver.set_permission({ name: 'notifications' }, 'granted', false);
await test_driver.set_permission({ name: 'idle-detection' }, 'granted', false);
});

promise_test(async t => {
Expand Down
Expand Up @@ -14,7 +14,7 @@
same_origin_src;

promise_setup(async () => {
await test_driver.set_permission({ name: 'notifications' }, 'granted', false);
await test_driver.set_permission({ name: 'idle-detection' }, 'granted', false);
});

promise_test(async t => {
Expand Down
38 changes: 24 additions & 14 deletions idle-detection/idle-permission.tentative.https.window.js
Expand Up @@ -3,22 +3,32 @@
'use strict';

promise_test(async t => {
await test_driver.set_permission(
{ name: 'notifications' }, 'denied', false);
await test_driver.set_permission({name: 'idle-detection'}, 'denied', false);

let detector = new IdleDetector();
await promise_rejects_dom(t, 'NotAllowedError', detector.start());
}, "Deny notifications permission should work.");
let detector = new IdleDetector();
await promise_rejects_dom(t, 'NotAllowedError', detector.start());
}, 'Denying idle-detection permission should block access.');

promise_test(async t => {
await test_driver.set_permission(
{ name: 'notifications' }, 'granted', false);
await test_driver.set_permission({name: 'idle-detection'}, 'granted', false);

let detector = new IdleDetector();
await detector.start();
let detector = new IdleDetector();
await detector.start();

assert_true(['active', 'idle'].includes(detector.userState),
'has a valid user state');
assert_true(['locked', 'unlocked'].includes(detector.screenState),
'has a valid screen state');
}, "Grant notifications permission should work.");
assert_true(
['active', 'idle'].includes(detector.userState),
'has a valid user state');
assert_true(
['locked', 'unlocked'].includes(detector.screenState),
'has a valid screen state');
}, 'Granting idle-detection permission should allow access.');

promise_test(async t => {
await test_driver.set_permission({name: 'idle-detection'}, 'prompt', false);

await promise_rejects_dom(t, 'NotAllowedError', IdleDetector.requestPermission());

await test_driver.bless('request permission');
let state = await IdleDetector.requestPermission();
assert_equals(state, 'prompt');
}, 'The idle-detection permission cannot be requested without a user gesture');
2 changes: 1 addition & 1 deletion idle-detection/idlharness-worker.https.window.js
Expand Up @@ -4,7 +4,7 @@
'use strict';

promise_test(async t => {
await test_driver.set_permission({ name: 'notifications' }, 'granted', false);
await test_driver.set_permission({name: 'idle-detection'}, 'granted', false);

await fetch_tests_from_worker(new Worker('resources/idlharness-worker.js'));
}, 'Run idlharness tests in a worker.');
2 changes: 1 addition & 1 deletion idle-detection/idlharness.https.window.js
Expand Up @@ -11,7 +11,7 @@ idl_test(
['idle-detection.tentative'],
['dom', 'html'],
async (idl_array, t) => {
await test_driver.set_permission({ name: 'notifications' }, 'granted', false);
await test_driver.set_permission({ name: 'idle-detection' }, 'granted', false);

self.idle = new IdleDetector();
let watcher = new EventWatcher(t, self.idle, ["change"]);
Expand Down
2 changes: 1 addition & 1 deletion idle-detection/interceptor.https.html
Expand Up @@ -11,7 +11,7 @@
'use strict';

promise_setup(async t => {
await test_driver.set_permission({ name: 'notifications' }, 'granted', false);
await test_driver.set_permission({ name: 'idle-detection' }, 'granted', false);
if (isChromiumBased) {
await loadChromiumResources();
}
Expand Down
1 change: 1 addition & 0 deletions interfaces/idle-detection.tentative.idl
Expand Up @@ -21,5 +21,6 @@ enum ScreenIdleState {
readonly attribute UserIdleState? userState;
readonly attribute ScreenIdleState? screenState;
attribute EventHandler onchange;
[Exposed=Window] static Promise<PermissionState> requestPermission();
Promise<any> start(optional IdleOptions options = {});
};

0 comments on commit 47ef3f3

Please sign in to comment.