From 45d318052fa9b96cd860666cee3932adfa5b5004 Mon Sep 17 00:00:00 2001
From: "Queen Vinyl Da.i'gyu-Kazotetsu" <vinyldarkscratch@gmail.com>
Date: Fri, 3 Jun 2022 05:29:49 -0700
Subject: [PATCH 1/3] Demix blur/focus events from GlobalEventHandlers

---
 api/Document.json            | 100 +++++++++++++++++++++++++++++++++++
 api/GlobalEventHandlers.json |  98 ----------------------------------
 api/HTMLElement.json         | 100 +++++++++++++++++++++++++++++++++++
 api/SVGElement.json          | 100 +++++++++++++++++++++++++++++++++++
 4 files changed, 300 insertions(+), 98 deletions(-)

diff --git a/api/Document.json b/api/Document.json
index 125afe8a436fe8..49976735b4ba18 100644
--- a/api/Document.json
+++ b/api/Document.json
@@ -1001,6 +1001,56 @@
           }
         }
       },
+      "blur_event": {
+        "__compat": {
+          "description": "<code>blur</code> event",
+          "mdn_url": "https://developer.mozilla.org/docs/Web/API/Document/onblur",
+          "spec_url": "https://html.spec.whatwg.org/multipage/webappapis.html#handler-onblur",
+          "support": {
+            "chrome": {
+              "version_added": "1"
+            },
+            "chrome_android": {
+              "version_added": "18"
+            },
+            "edge": {
+              "version_added": "12"
+            },
+            "firefox": {
+              "version_added": "9"
+            },
+            "firefox_android": {
+              "version_added": "9"
+            },
+            "ie": {
+              "version_added": "9"
+            },
+            "opera": {
+              "version_added": "≤12.1"
+            },
+            "opera_android": {
+              "version_added": "≤12.1"
+            },
+            "safari": {
+              "version_added": "1"
+            },
+            "safari_ios": {
+              "version_added": "1"
+            },
+            "samsunginternet_android": {
+              "version_added": "1.0"
+            },
+            "webview_android": {
+              "version_added": "1"
+            }
+          },
+          "status": {
+            "experimental": false,
+            "standard_track": true,
+            "deprecated": false
+          }
+        }
+      },
       "body": {
         "__compat": {
           "mdn_url": "https://developer.mozilla.org/docs/Web/API/Document/body",
@@ -4991,6 +5041,56 @@
           }
         }
       },
+      "focus_event": {
+        "__compat": {
+          "description": "<code>focus</code> event",
+          "mdn_url": "https://developer.mozilla.org/docs/Web/API/Document/onfocus",
+          "spec_url": "https://html.spec.whatwg.org/multipage/webappapis.html#handler-onfocus",
+          "support": {
+            "chrome": {
+              "version_added": "1"
+            },
+            "chrome_android": {
+              "version_added": "18"
+            },
+            "edge": {
+              "version_added": "12"
+            },
+            "firefox": {
+              "version_added": "9"
+            },
+            "firefox_android": {
+              "version_added": "9"
+            },
+            "ie": {
+              "version_added": "9"
+            },
+            "opera": {
+              "version_added": "≤12.1"
+            },
+            "opera_android": {
+              "version_added": "≤12.1"
+            },
+            "safari": {
+              "version_added": "1"
+            },
+            "safari_ios": {
+              "version_added": "1"
+            },
+            "samsunginternet_android": {
+              "version_added": "1.0"
+            },
+            "webview_android": {
+              "version_added": "1"
+            }
+          },
+          "status": {
+            "experimental": false,
+            "standard_track": true,
+            "deprecated": false
+          }
+        }
+      },
       "fonts": {
         "__compat": {
           "mdn_url": "https://developer.mozilla.org/docs/Web/API/Document/fonts",
diff --git a/api/GlobalEventHandlers.json b/api/GlobalEventHandlers.json
index 768259f34272e1..68f9b5192920a7 100644
--- a/api/GlobalEventHandlers.json
+++ b/api/GlobalEventHandlers.json
@@ -597,55 +597,6 @@
           }
         }
       },
-      "onblur": {
-        "__compat": {
-          "mdn_url": "https://developer.mozilla.org/docs/Web/API/GlobalEventHandlers/onblur",
-          "spec_url": "https://html.spec.whatwg.org/multipage/webappapis.html#handler-onblur",
-          "support": {
-            "chrome": {
-              "version_added": "1"
-            },
-            "chrome_android": {
-              "version_added": "18"
-            },
-            "edge": {
-              "version_added": "12"
-            },
-            "firefox": {
-              "version_added": "9"
-            },
-            "firefox_android": {
-              "version_added": "9"
-            },
-            "ie": {
-              "version_added": "9"
-            },
-            "opera": {
-              "version_added": "≤12.1"
-            },
-            "opera_android": {
-              "version_added": "≤12.1"
-            },
-            "safari": {
-              "version_added": "1"
-            },
-            "safari_ios": {
-              "version_added": "1"
-            },
-            "samsunginternet_android": {
-              "version_added": "1.0"
-            },
-            "webview_android": {
-              "version_added": "1"
-            }
-          },
-          "status": {
-            "experimental": false,
-            "standard_track": true,
-            "deprecated": false
-          }
-        }
-      },
       "oncancel": {
         "__compat": {
           "mdn_url": "https://developer.mozilla.org/docs/Web/API/GlobalEventHandlers/oncancel",
@@ -1686,55 +1637,6 @@
           }
         }
       },
-      "onfocus": {
-        "__compat": {
-          "mdn_url": "https://developer.mozilla.org/docs/Web/API/GlobalEventHandlers/onfocus",
-          "spec_url": "https://html.spec.whatwg.org/multipage/webappapis.html#handler-onfocus",
-          "support": {
-            "chrome": {
-              "version_added": "1"
-            },
-            "chrome_android": {
-              "version_added": "18"
-            },
-            "edge": {
-              "version_added": "12"
-            },
-            "firefox": {
-              "version_added": "9"
-            },
-            "firefox_android": {
-              "version_added": "9"
-            },
-            "ie": {
-              "version_added": "9"
-            },
-            "opera": {
-              "version_added": "≤12.1"
-            },
-            "opera_android": {
-              "version_added": "≤12.1"
-            },
-            "safari": {
-              "version_added": "1"
-            },
-            "safari_ios": {
-              "version_added": "1"
-            },
-            "samsunginternet_android": {
-              "version_added": "1.0"
-            },
-            "webview_android": {
-              "version_added": "1"
-            }
-          },
-          "status": {
-            "experimental": false,
-            "standard_track": true,
-            "deprecated": false
-          }
-        }
-      },
       "onformdata": {
         "__compat": {
           "mdn_url": "https://developer.mozilla.org/docs/Web/API/GlobalEventHandlers/onformdata",
diff --git a/api/HTMLElement.json b/api/HTMLElement.json
index 519e3af927c044..45399c10c659cc 100644
--- a/api/HTMLElement.json
+++ b/api/HTMLElement.json
@@ -759,6 +759,56 @@
           }
         }
       },
+      "blur_event": {
+        "__compat": {
+          "description": "<code>blur</code> event",
+          "mdn_url": "https://developer.mozilla.org/docs/Web/API/HTMLElement/onblur",
+          "spec_url": "https://html.spec.whatwg.org/multipage/webappapis.html#handler-onblur",
+          "support": {
+            "chrome": {
+              "version_added": "1"
+            },
+            "chrome_android": {
+              "version_added": "18"
+            },
+            "edge": {
+              "version_added": "12"
+            },
+            "firefox": {
+              "version_added": "9"
+            },
+            "firefox_android": {
+              "version_added": "9"
+            },
+            "ie": {
+              "version_added": "9"
+            },
+            "opera": {
+              "version_added": "≤12.1"
+            },
+            "opera_android": {
+              "version_added": "≤12.1"
+            },
+            "safari": {
+              "version_added": "1.3"
+            },
+            "safari_ios": {
+              "version_added": "1"
+            },
+            "samsunginternet_android": {
+              "version_added": "1.0"
+            },
+            "webview_android": {
+              "version_added": "1"
+            }
+          },
+          "status": {
+            "experimental": false,
+            "standard_track": true,
+            "deprecated": false
+          }
+        }
+      },
       "click": {
         "__compat": {
           "mdn_url": "https://developer.mozilla.org/docs/Web/API/HTMLElement/click",
@@ -1353,6 +1403,56 @@
           }
         }
       },
+      "focus_event": {
+        "__compat": {
+          "description": "<code>focus</code> event",
+          "mdn_url": "https://developer.mozilla.org/docs/Web/API/HTMLElement/onfocus",
+          "spec_url": "https://html.spec.whatwg.org/multipage/webappapis.html#handler-onfocus",
+          "support": {
+            "chrome": {
+              "version_added": "1"
+            },
+            "chrome_android": {
+              "version_added": "18"
+            },
+            "edge": {
+              "version_added": "12"
+            },
+            "firefox": {
+              "version_added": "9"
+            },
+            "firefox_android": {
+              "version_added": "9"
+            },
+            "ie": {
+              "version_added": "9"
+            },
+            "opera": {
+              "version_added": "≤12.1"
+            },
+            "opera_android": {
+              "version_added": "≤12.1"
+            },
+            "safari": {
+              "version_added": "1.3"
+            },
+            "safari_ios": {
+              "version_added": "1"
+            },
+            "samsunginternet_android": {
+              "version_added": "1.0"
+            },
+            "webview_android": {
+              "version_added": "1"
+            }
+          },
+          "status": {
+            "experimental": false,
+            "standard_track": true,
+            "deprecated": false
+          }
+        }
+      },
       "gotpointercapture_event": {
         "__compat": {
           "description": "<code>gotpointercapture</code> event",
diff --git a/api/SVGElement.json b/api/SVGElement.json
index c5cd7ec24fcf43..9b144d73e6190b 100644
--- a/api/SVGElement.json
+++ b/api/SVGElement.json
@@ -144,6 +144,56 @@
           }
         }
       },
+      "blur_event": {
+        "__compat": {
+          "description": "<code>blur</code> event",
+          "mdn_url": "https://developer.mozilla.org/docs/Web/API/SVGElement/onblur",
+          "spec_url": "https://html.spec.whatwg.org/multipage/webappapis.html#handler-onblur",
+          "support": {
+            "chrome": {
+              "version_added": "1"
+            },
+            "chrome_android": {
+              "version_added": "18"
+            },
+            "edge": {
+              "version_added": "12"
+            },
+            "firefox": {
+              "version_added": "9"
+            },
+            "firefox_android": {
+              "version_added": "9"
+            },
+            "ie": {
+              "version_added": "9"
+            },
+            "opera": {
+              "version_added": "≤12.1"
+            },
+            "opera_android": {
+              "version_added": "≤12.1"
+            },
+            "safari": {
+              "version_added": "3"
+            },
+            "safari_ios": {
+              "version_added": "1"
+            },
+            "samsunginternet_android": {
+              "version_added": "1.0"
+            },
+            "webview_android": {
+              "version_added": "1"
+            }
+          },
+          "status": {
+            "experimental": false,
+            "standard_track": true,
+            "deprecated": false
+          }
+        }
+      },
       "className": {
         "__compat": {
           "spec_url": "https://svgwg.org/svg2-draft/types.html#__svg__SVGElement__className",
@@ -389,6 +439,56 @@
           }
         }
       },
+      "focus_event": {
+        "__compat": {
+          "description": "<code>focus</code> event",
+          "mdn_url": "https://developer.mozilla.org/docs/Web/API/SVGElement/onfocus",
+          "spec_url": "https://html.spec.whatwg.org/multipage/webappapis.html#handler-onfocus",
+          "support": {
+            "chrome": {
+              "version_added": "1"
+            },
+            "chrome_android": {
+              "version_added": "18"
+            },
+            "edge": {
+              "version_added": "12"
+            },
+            "firefox": {
+              "version_added": "9"
+            },
+            "firefox_android": {
+              "version_added": "9"
+            },
+            "ie": {
+              "version_added": "9"
+            },
+            "opera": {
+              "version_added": "≤12.1"
+            },
+            "opera_android": {
+              "version_added": "≤12.1"
+            },
+            "safari": {
+              "version_added": "3"
+            },
+            "safari_ios": {
+              "version_added": "1"
+            },
+            "samsunginternet_android": {
+              "version_added": "1.0"
+            },
+            "webview_android": {
+              "version_added": "1"
+            }
+          },
+          "status": {
+            "experimental": false,
+            "standard_track": true,
+            "deprecated": false
+          }
+        }
+      },
       "load_event": {
         "__compat": {
           "description": "<code>load</code> event",

From 52b96d1f19c10cb7c9e0faf920b775cf5b61444e Mon Sep 17 00:00:00 2001
From: "Queen Vinyl Da.i'gyu-Kazotetsu" <vinyldarkscratch@gmail.com>
Date: Sat, 11 Jun 2022 15:20:26 -0700
Subject: [PATCH 2/3] Revert changes to Document/HTMLElement/SVGElement

---
 api/Document.json    | 100 -------------------------------------------
 api/HTMLElement.json | 100 -------------------------------------------
 api/SVGElement.json  | 100 -------------------------------------------
 3 files changed, 300 deletions(-)

diff --git a/api/Document.json b/api/Document.json
index 49976735b4ba18..125afe8a436fe8 100644
--- a/api/Document.json
+++ b/api/Document.json
@@ -1001,56 +1001,6 @@
           }
         }
       },
-      "blur_event": {
-        "__compat": {
-          "description": "<code>blur</code> event",
-          "mdn_url": "https://developer.mozilla.org/docs/Web/API/Document/onblur",
-          "spec_url": "https://html.spec.whatwg.org/multipage/webappapis.html#handler-onblur",
-          "support": {
-            "chrome": {
-              "version_added": "1"
-            },
-            "chrome_android": {
-              "version_added": "18"
-            },
-            "edge": {
-              "version_added": "12"
-            },
-            "firefox": {
-              "version_added": "9"
-            },
-            "firefox_android": {
-              "version_added": "9"
-            },
-            "ie": {
-              "version_added": "9"
-            },
-            "opera": {
-              "version_added": "≤12.1"
-            },
-            "opera_android": {
-              "version_added": "≤12.1"
-            },
-            "safari": {
-              "version_added": "1"
-            },
-            "safari_ios": {
-              "version_added": "1"
-            },
-            "samsunginternet_android": {
-              "version_added": "1.0"
-            },
-            "webview_android": {
-              "version_added": "1"
-            }
-          },
-          "status": {
-            "experimental": false,
-            "standard_track": true,
-            "deprecated": false
-          }
-        }
-      },
       "body": {
         "__compat": {
           "mdn_url": "https://developer.mozilla.org/docs/Web/API/Document/body",
@@ -5041,56 +4991,6 @@
           }
         }
       },
-      "focus_event": {
-        "__compat": {
-          "description": "<code>focus</code> event",
-          "mdn_url": "https://developer.mozilla.org/docs/Web/API/Document/onfocus",
-          "spec_url": "https://html.spec.whatwg.org/multipage/webappapis.html#handler-onfocus",
-          "support": {
-            "chrome": {
-              "version_added": "1"
-            },
-            "chrome_android": {
-              "version_added": "18"
-            },
-            "edge": {
-              "version_added": "12"
-            },
-            "firefox": {
-              "version_added": "9"
-            },
-            "firefox_android": {
-              "version_added": "9"
-            },
-            "ie": {
-              "version_added": "9"
-            },
-            "opera": {
-              "version_added": "≤12.1"
-            },
-            "opera_android": {
-              "version_added": "≤12.1"
-            },
-            "safari": {
-              "version_added": "1"
-            },
-            "safari_ios": {
-              "version_added": "1"
-            },
-            "samsunginternet_android": {
-              "version_added": "1.0"
-            },
-            "webview_android": {
-              "version_added": "1"
-            }
-          },
-          "status": {
-            "experimental": false,
-            "standard_track": true,
-            "deprecated": false
-          }
-        }
-      },
       "fonts": {
         "__compat": {
           "mdn_url": "https://developer.mozilla.org/docs/Web/API/Document/fonts",
diff --git a/api/HTMLElement.json b/api/HTMLElement.json
index 45399c10c659cc..519e3af927c044 100644
--- a/api/HTMLElement.json
+++ b/api/HTMLElement.json
@@ -759,56 +759,6 @@
           }
         }
       },
-      "blur_event": {
-        "__compat": {
-          "description": "<code>blur</code> event",
-          "mdn_url": "https://developer.mozilla.org/docs/Web/API/HTMLElement/onblur",
-          "spec_url": "https://html.spec.whatwg.org/multipage/webappapis.html#handler-onblur",
-          "support": {
-            "chrome": {
-              "version_added": "1"
-            },
-            "chrome_android": {
-              "version_added": "18"
-            },
-            "edge": {
-              "version_added": "12"
-            },
-            "firefox": {
-              "version_added": "9"
-            },
-            "firefox_android": {
-              "version_added": "9"
-            },
-            "ie": {
-              "version_added": "9"
-            },
-            "opera": {
-              "version_added": "≤12.1"
-            },
-            "opera_android": {
-              "version_added": "≤12.1"
-            },
-            "safari": {
-              "version_added": "1.3"
-            },
-            "safari_ios": {
-              "version_added": "1"
-            },
-            "samsunginternet_android": {
-              "version_added": "1.0"
-            },
-            "webview_android": {
-              "version_added": "1"
-            }
-          },
-          "status": {
-            "experimental": false,
-            "standard_track": true,
-            "deprecated": false
-          }
-        }
-      },
       "click": {
         "__compat": {
           "mdn_url": "https://developer.mozilla.org/docs/Web/API/HTMLElement/click",
@@ -1403,56 +1353,6 @@
           }
         }
       },
-      "focus_event": {
-        "__compat": {
-          "description": "<code>focus</code> event",
-          "mdn_url": "https://developer.mozilla.org/docs/Web/API/HTMLElement/onfocus",
-          "spec_url": "https://html.spec.whatwg.org/multipage/webappapis.html#handler-onfocus",
-          "support": {
-            "chrome": {
-              "version_added": "1"
-            },
-            "chrome_android": {
-              "version_added": "18"
-            },
-            "edge": {
-              "version_added": "12"
-            },
-            "firefox": {
-              "version_added": "9"
-            },
-            "firefox_android": {
-              "version_added": "9"
-            },
-            "ie": {
-              "version_added": "9"
-            },
-            "opera": {
-              "version_added": "≤12.1"
-            },
-            "opera_android": {
-              "version_added": "≤12.1"
-            },
-            "safari": {
-              "version_added": "1.3"
-            },
-            "safari_ios": {
-              "version_added": "1"
-            },
-            "samsunginternet_android": {
-              "version_added": "1.0"
-            },
-            "webview_android": {
-              "version_added": "1"
-            }
-          },
-          "status": {
-            "experimental": false,
-            "standard_track": true,
-            "deprecated": false
-          }
-        }
-      },
       "gotpointercapture_event": {
         "__compat": {
           "description": "<code>gotpointercapture</code> event",
diff --git a/api/SVGElement.json b/api/SVGElement.json
index 9b144d73e6190b..c5cd7ec24fcf43 100644
--- a/api/SVGElement.json
+++ b/api/SVGElement.json
@@ -144,56 +144,6 @@
           }
         }
       },
-      "blur_event": {
-        "__compat": {
-          "description": "<code>blur</code> event",
-          "mdn_url": "https://developer.mozilla.org/docs/Web/API/SVGElement/onblur",
-          "spec_url": "https://html.spec.whatwg.org/multipage/webappapis.html#handler-onblur",
-          "support": {
-            "chrome": {
-              "version_added": "1"
-            },
-            "chrome_android": {
-              "version_added": "18"
-            },
-            "edge": {
-              "version_added": "12"
-            },
-            "firefox": {
-              "version_added": "9"
-            },
-            "firefox_android": {
-              "version_added": "9"
-            },
-            "ie": {
-              "version_added": "9"
-            },
-            "opera": {
-              "version_added": "≤12.1"
-            },
-            "opera_android": {
-              "version_added": "≤12.1"
-            },
-            "safari": {
-              "version_added": "3"
-            },
-            "safari_ios": {
-              "version_added": "1"
-            },
-            "samsunginternet_android": {
-              "version_added": "1.0"
-            },
-            "webview_android": {
-              "version_added": "1"
-            }
-          },
-          "status": {
-            "experimental": false,
-            "standard_track": true,
-            "deprecated": false
-          }
-        }
-      },
       "className": {
         "__compat": {
           "spec_url": "https://svgwg.org/svg2-draft/types.html#__svg__SVGElement__className",
@@ -439,56 +389,6 @@
           }
         }
       },
-      "focus_event": {
-        "__compat": {
-          "description": "<code>focus</code> event",
-          "mdn_url": "https://developer.mozilla.org/docs/Web/API/SVGElement/onfocus",
-          "spec_url": "https://html.spec.whatwg.org/multipage/webappapis.html#handler-onfocus",
-          "support": {
-            "chrome": {
-              "version_added": "1"
-            },
-            "chrome_android": {
-              "version_added": "18"
-            },
-            "edge": {
-              "version_added": "12"
-            },
-            "firefox": {
-              "version_added": "9"
-            },
-            "firefox_android": {
-              "version_added": "9"
-            },
-            "ie": {
-              "version_added": "9"
-            },
-            "opera": {
-              "version_added": "≤12.1"
-            },
-            "opera_android": {
-              "version_added": "≤12.1"
-            },
-            "safari": {
-              "version_added": "3"
-            },
-            "safari_ios": {
-              "version_added": "1"
-            },
-            "samsunginternet_android": {
-              "version_added": "1.0"
-            },
-            "webview_android": {
-              "version_added": "1"
-            }
-          },
-          "status": {
-            "experimental": false,
-            "standard_track": true,
-            "deprecated": false
-          }
-        }
-      },
       "load_event": {
         "__compat": {
           "description": "<code>load</code> event",

From 72875619e52cc4e8497c48ac2aaaa826c5a5f4a6 Mon Sep 17 00:00:00 2001
From: "Queen Vinyl Da.i'gyu-Kazotetsu" <vinyldarkscratch@gmail.com>
Date: Sat, 11 Jun 2022 15:21:47 -0700
Subject: [PATCH 3/3] Update spec URLs

---
 api/Element.json | 10 ++++++++--
 api/Window.json  | 10 ++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/api/Element.json b/api/Element.json
index 350b8f0b3d5268..6259dc71a57dc4 100644
--- a/api/Element.json
+++ b/api/Element.json
@@ -1378,7 +1378,10 @@
         "__compat": {
           "description": "<code>blur</code> event",
           "mdn_url": "https://developer.mozilla.org/docs/Web/API/Element/blur_event",
-          "spec_url": "https://w3c.github.io/uievents/#event-type-blur",
+          "spec_url": [
+            "https://w3c.github.io/uievents/#event-type-blur",
+            "https://html.spec.whatwg.org/multipage/webappapis.html#handler-onblur"
+          ],
           "support": {
             "chrome": {
               "version_added": "1"
@@ -2523,7 +2526,10 @@
         "__compat": {
           "description": "<code>focus</code> event",
           "mdn_url": "https://developer.mozilla.org/docs/Web/API/Element/focus_event",
-          "spec_url": "https://w3c.github.io/uievents/#event-type-focus",
+          "spec_url": [
+            "https://w3c.github.io/uievents/#event-type-focus",
+            "https://html.spec.whatwg.org/multipage/webappapis.html#handler-onfocus"
+          ],
           "support": {
             "chrome": {
               "version_added": "1"
diff --git a/api/Window.json b/api/Window.json
index 1fac661846b893..90d437a7d68105 100644
--- a/api/Window.json
+++ b/api/Window.json
@@ -1004,7 +1004,10 @@
         "__compat": {
           "description": "<code>blur</code> event",
           "mdn_url": "https://developer.mozilla.org/docs/Web/API/Window/blur_event",
-          "spec_url": "https://w3c.github.io/uievents/#event-type-blur",
+          "spec_url": [
+            "https://w3c.github.io/uievents/#event-type-blur",
+            "https://html.spec.whatwg.org/multipage/webappapis.html#handler-onblur"
+          ],
           "support": {
             "chrome": {
               "version_added": "5"
@@ -2391,7 +2394,10 @@
         "__compat": {
           "description": "<code>focus</code> event",
           "mdn_url": "https://developer.mozilla.org/docs/Web/API/Window/focus_event",
-          "spec_url": "https://w3c.github.io/uievents/#event-type-focus",
+          "spec_url": [
+            "https://w3c.github.io/uievents/#event-type-focus",
+            "https://html.spec.whatwg.org/multipage/webappapis.html#handler-onfocus"
+          ],
           "support": {
             "chrome": {
               "version_added": "5"