[selector] Check that focus selectors match inside focus and focusin events
diff --git a/css/selectors/focus-in-focus-event-001.html b/css/selectors/focus-in-focus-event-001.html
index 0639b77..2f9a3dd 100644
--- a/css/selectors/focus-in-focus-event-001.html
+++ b/css/selectors/focus-in-focus-event-001.html
@@ -1,20 +1,31 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>Selectors Level 4: :focus in focus event</title>
+<title>Selectors Level 4: :focus, :focus-visible and :focus-within in focus event</title>
 <link rel="help" href="https://drafts.csswg.org/selectors-4/#focus-pseudo">
+<link rel="help" href="https://drafts.csswg.org/selectors-4/#focus-visible-pseudo">
+<link rel="help" href="https://drafts.csswg.org/selectors-4/#focus-within-pseudo">
 <link rel="help" href="https://w3c.github.io/uievents/#event-type-focus">
 <link rel="help" href="https://crbug.com/523126">
 <meta name='author' title='Takayoshi Kochi' href='mailto:kochi@chromium.org'>
+<meta name='author' title='Manuel Rego Casasnovas' href='mailto:rego@igalia.com'>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <input type="text">
 <script>
 var input = document.querySelector('input');
 input.addEventListener('focus', function(e) {
-  var focused = document.querySelector(':focus');
+  var focusPseudo = document.querySelector(':focus');
+  var focusVisiblePseudo = document.querySelector(':focus-visible');
+  var focusWithinPseudo = document.querySelector(':focus-within');
   test(() => {
-    assert_equals(e.target, focused, "':focus' matches event.target");
+    assert_equals(e.target, focusPseudo, "':focus' matches event.target");
   }, "Checks that ':focus' pseudo-class matches inside 'focus' event handler");
+  test(() => {
+    assert_equals(e.target, focusVisiblePseudo, "':focus-visible' matches event.target");
+  }, "Checks that ':focus-visible' pseudo-class matches inside 'focus' event handler");
+  test(() => {
+    assert_equals(document.documentElement, focusWithinPseudo, "':focus-within' matches document.documentElement");
+  }, "Checks that ':focus-within' pseudo-class matches inside 'focus' event handler");
 }, false);
 input.focus();
 </script>
diff --git a/css/selectors/focus-in-focusin-event-001.html b/css/selectors/focus-in-focusin-event-001.html
new file mode 100644
index 0000000..e18401f
--- /dev/null
+++ b/css/selectors/focus-in-focusin-event-001.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Selectors Level 4: :focus, :focus-visible and :focus-within in focusin event</title>
+<link rel="help" href="https://drafts.csswg.org/selectors-4/#focus-pseudo">
+<link rel="help" href="https://drafts.csswg.org/selectors-4/#focus-visible-pseudo">
+<link rel="help" href="https://drafts.csswg.org/selectors-4/#focus-within-pseudo">
+<link rel="help" href="https://w3c.github.io/uievents/#event-type-focusin">
+<meta name='author' title='Manuel Rego Casasnovas' href='mailto:rego@igalia.com'>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<input type="text">
+<script>
+var input = document.querySelector('input');
+input.addEventListener('focusin', function(e) {
+  var focusPseudo = document.querySelector(':focus');
+  var focusVisiblePseudo = document.querySelector(':focus-visible');
+  var focusWithinPseudo = document.querySelector(':focus-within');
+  test(() => {
+    assert_equals(e.target, focusPseudo, "':focus' matches event.target");
+  }, "Checks that ':focus' pseudo-class matches inside 'focusin' event handler");
+  test(() => {
+    assert_equals(e.target, focusVisiblePseudo, "':focus-visible' matches event.target");
+  }, "Checks that ':focus-visible' pseudo-class matches inside 'focusin' event handler");
+  test(() => {
+    assert_equals(document.documentElement, focusWithinPseudo, "':focus-within' matches document.documentElement");
+  }, "Checks that ':focus-within' pseudo-class matches inside 'focusin' event handler");
+}, false);
+input.focus();
+</script>