[idle] Merge IdleState attributes into IdleDetector

The IdleState interface adds unnecessary overhead (code size and memory usage). These attributes can be added directly to the IdleDetector interface. Explainer PR: WICG/idle-detection#22 Bug: 878979 Change-Id: Ic92f5fff0ee540d640dc009d391a60c372490bfc Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2186655 Commit-Queue: Reilly Grant <reillyg@chromium.org> Auto-Submit: Reilly Grant <reillyg@chromium.org> Reviewed-by: Kentaro Hara <haraken@chromium.org> Reviewed-by: Ayu Ishii <ayui@chromium.org> Cr-Commit-Position: refs/heads/master@{#767107}
web-platform-tests · May 9, 2020 · 3a7b40e · 3a7b40e
1 parent d23d904
commit 3a7b40e
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 48 deletions.
diff --git a/idle-detection/basics.tentative.https.window.js b/idle-detection/basics.tentative.https.window.js
@@ -9,17 +9,17 @@ promise_setup(async t => {
 })
 
 promise_test(async t => {
-  let status = new IdleDetector();
-  let watcher = new EventWatcher(t, status, ["change"]);
+  let detector = new IdleDetector();
+  let watcher = new EventWatcher(t, detector, ["change"]);
   let initial_state = watcher.wait_for("change");
 
-  await status.start();
+  await detector.start();
   await initial_state;
 
-  assert_true(['active', 'idle'].includes(status.state.user),
-                'status has a valid user state');
-  assert_true(['locked', 'unlocked'].includes(status.state.screen),
-                'status has a valid screen state');
+  assert_true(['active', 'idle'].includes(detector.userState),
+                'has a valid user state');
+  assert_true(['locked', 'unlocked'].includes(detector.screenState),
+                'has a valid screen state');
 }, 'start() basics');
 
 promise_test(async t => {

diff --git a/idle-detection/idle-detection.idl b/idle-detection/idle-detection.idl
@@ -3,24 +3,6 @@ dictionary IdleOptions {
   AbortSignal signal;
 };
 
-[
-  SecureContext,
-  Exposed=(Window,Worker)
-] interface IdleDetector : EventTarget {
-  constructor();
-  readonly attribute IdleState state;
-  attribute EventHandler onchange;
-  Promise<any> start(optional IdleOptions options = {});
-};
-
-[
-  SecureContext,
-  Exposed=(Window,Worker)
-] interface IdleState {
-  readonly attribute UserIdleState user;
-  readonly attribute ScreenIdleState screen;
-};
-
 enum UserIdleState {
     "active",
     "idle"
@@ -30,3 +12,14 @@ enum ScreenIdleState {
     "locked",
     "unlocked"
 };
+
+[
+  SecureContext,
+  Exposed=(Window,Worker)
+] interface IdleDetector : EventTarget {
+  constructor();
+  readonly attribute UserIdleState? userState;
+  readonly attribute ScreenIdleState? screenState;
+  attribute EventHandler onchange;
+  Promise<any> start(optional IdleOptions options = {});
+};
diff --git a/idle-detection/idle-permission.tentative.https.window.js b/idle-detection/idle-permission.tentative.https.window.js
@@ -6,19 +6,19 @@ promise_test(async t => {
     await test_driver.set_permission(
         { name: 'notifications' }, 'denied', false);
 
-    let status = new IdleDetector();
-    await promise_rejects_dom(t, 'NotAllowedError', status.start());
+    let detector = new IdleDetector();
+    await promise_rejects_dom(t, 'NotAllowedError', detector.start());
 }, "Deny notifications permission should work.");
 
 promise_test(async t => {
     await test_driver.set_permission(
         { name: 'notifications' }, 'granted', false);
 
-    let status = new IdleDetector();
-    await status.start();
+    let detector = new IdleDetector();
+    await detector.start();
 
-    assert_true(['active', 'idle'].includes(status.state.user),
-                  'status has a valid user state');
-    assert_true(['locked', 'unlocked'].includes(status.state.screen),
-                  'status has a valid screen state');
+    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.");
diff --git a/idle-detection/idlharness.https.window.js b/idle-detection/idlharness.https.window.js
@@ -31,7 +31,6 @@ promise_test(async (t) => {
 
   idl_array.add_objects({
     IdleDetector: ['idle'],
-    IdleState: ['idle.state']
   });
 
   idl_array.test();

diff --git a/idle-detection/interceptor.https.html b/idle-detection/interceptor.https.html
@@ -37,8 +37,8 @@
   await detector.start({ signal: controller.signal });
   await initial_state;
 
-  assert_equals(detector.state.user, "active");
-  assert_equals(detector.state.screen, "locked");
+  assert_equals(detector.userState, "active");
+  assert_equals(detector.screenState, "locked");
 
   controller.abort();
 }, 'start()');
@@ -75,8 +75,8 @@
   // Wait for the first change in state.
   await watcher.wait_for("change");
 
-  assert_equals(detector.state.user, "idle");
-  assert_equals(detector.state.screen, "unlocked");
+  assert_equals(detector.userState, "idle");
+  assert_equals(detector.screenState, "unlocked");
 
   controller.abort();
 }, 'updates once');
@@ -120,11 +120,11 @@
 
   // Waits for the first event.
   await watcher.wait_for("change");
-  assert_equals(detector.state.user, "idle");
+  assert_equals(detector.userState, "idle");
 
   // Waits for the second event.
   await watcher.wait_for("change");
-  assert_equals(detector.state.user, "active");
+  assert_equals(detector.userState, "active");
 
   controller.abort();
 }, 'updates twice');
@@ -148,7 +148,7 @@
   await detector.start({ signal: controller.signal });
   await initial_state;
 
-  assert_equals(detector.state.screen, "locked");
+  assert_equals(detector.screenState, "locked");
 
   controller.abort();
 }, 'locked screen');
@@ -175,8 +175,8 @@
   // Waits for the first event.
   await event;
 
-  assert_equals(detector.state.user, "active");
-  assert_equals(detector.state.screen, "locked");
+  assert_equals(detector.userState, "active");
+  assert_equals(detector.screenState, "locked");
 
   controller.abort();
 }, 'IdleDetector.onchange');
@@ -203,8 +203,8 @@
   await start_promise;
 
   await initial_state;
-  assert_equals(detector.state.user, "active");
-  assert_equals(detector.state.screen, "unlocked");
+  assert_equals(detector.userState, "active");
+  assert_equals(detector.screenState, "unlocked");
 
   // Calling abort() multiple times is safe.
   controller.abort();
@@ -268,8 +268,8 @@
   initial_state = watcher.wait_for("change");
   await detector.start({ signal: controller.signal });
   await initial_state;
-  assert_equals(detector.state.user, "idle");
-  assert_equals(detector.state.screen, "locked");
+  assert_equals(detector.userState, "idle");
+  assert_equals(detector.screenState, "locked");
 
   controller.abort();
 }, 'Calling start() after stop(): re-starting monitor.');

diff --git a/idle-detection/resources/idlharness-worker.js b/idle-detection/resources/idlharness-worker.js
@@ -15,7 +15,6 @@ idl_test(
 
       idl_array.add_objects({
         IdleDetector: ['idle'],
-        IdleState: ['idle.state']
       });
     }
 );