Cherry pick PR youtube#529: Fix CustomEvent use of EnvironmentSetting…

…s. (youtube#540) * Fix CustomEvent use of EnvironmentSettings. Don't store the EnvironmentSettings, but pass it only where needed to set_detail(), including from Document.createEvent(). b/236142860 b/274788091 * Address comments. (cherry picked from commit 1b3a19f) Co-authored-by: Jelle Foks <[email protected]>
kaidokert · Jun 6, 2023 · fe022af · fe022af
1 parent 97ae564
commit fe022af
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 14 deletions.
diff --git a/cobalt/web/custom_event.h b/cobalt/web/custom_event.h
@@ -33,11 +33,11 @@ class CustomEvent : public web::Event {
  public:
   explicit CustomEvent(script::EnvironmentSettings* environment_settings,
                        const std::string& type)
-      : Event(type), environment_settings_(environment_settings) {}
+      : Event(type) {}
   CustomEvent(script::EnvironmentSettings* environment_settings,
               const std::string& type, const CustomEventInit& init_dict)
-      : Event(type, init_dict), environment_settings_(environment_settings) {
-    set_detail(init_dict.detail());
+      : Event(type, init_dict) {
+    set_detail(environment_settings, init_dict.detail());
   }
 
   // Creates an event with its "initialized flag" unset.
@@ -46,17 +46,18 @@ class CustomEvent : public web::Event {
 
   // Web API: CustomEvent
   //
-  void InitCustomEvent(const std::string& type, bool bubbles, bool cancelable,
+  void InitCustomEvent(script::EnvironmentSettings* environment_settings,
+                       const std::string& type, bool bubbles, bool cancelable,
                        const script::ValueHandleHolder& detail) {
     InitEvent(type, bubbles, cancelable);
-    set_detail(&detail);
+    set_detail(environment_settings, &detail);
   }
 
-  void set_detail(const script::ValueHandleHolder* detail) {
+  void set_detail(script::EnvironmentSettings* environment_settings,
+                  const script::ValueHandleHolder* detail) {
     if (detail) {
-      auto* wrappable = environment_settings_
-                            ? get_global_wrappable(environment_settings_)
-                            : this;
+      DCHECK(environment_settings);
+      auto* wrappable = get_global_wrappable(environment_settings);
       detail_.reset(
           new script::ValueHandleHolder::Reference(wrappable, *detail));
     } else {
@@ -75,12 +76,9 @@ class CustomEvent : public web::Event {
   DEFINE_WRAPPABLE_TYPE(CustomEvent);
 
  protected:
-  ~CustomEvent() override { environment_settings_ = nullptr; }
+  ~CustomEvent() override {}
 
   std::unique_ptr<script::ValueHandleHolder::Reference> detail_;
-
- private:
-  script::EnvironmentSettings* environment_settings_ = nullptr;
 };
 
 }  // namespace web

diff --git a/cobalt/web/custom_event.idl b/cobalt/web/custom_event.idl
@@ -20,7 +20,7 @@
 ] interface CustomEvent : Event {
   readonly attribute any detail;
 
-  void initCustomEvent(DOMString type,
+  [CallWith=EnvironmentSettings] void initCustomEvent(DOMString type,
                        boolean bubbles,
                        boolean cancelable,
                        any detail);